Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1216747 followup - Use the correct value when calling SetWritingModeDependency.

Browse Source 
--HG--
extra : transplant_source : %05/L%E1%86%EA%B9%E8%D4%9EF%A7%C12%F5.%FC%85%C0Y
This commit is contained in:
L. David Baron 2015-10-21 00:12:07 -07:00
parent 21b38ce0cc
commit 8d8c6fab6e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/style/nsRuleNode.cpp
View File

@ -7706,8 +7706,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
// that case.
bool vertical;
uint8_t writingMode = aContext->StyleVisibility()->mWritingMode;
switch (writingMode) {
switch (aContext->StyleVisibility()->mWritingMode) {
default:
MOZ_ASSERT(false, "unexpected writing-mode value");
// fall through
@ -7721,10 +7720,11 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
vertical = true;
break;
}
uint8_t wm = WritingMode(aContext).GetBits();
const nsCSSValue* width = aRuleData->ValueForWidth();
if (width->GetUnit() == eCSSUnit_Enumerated) {
conditions.SetWritingModeDependency(writingMode);
conditions.SetWritingModeDependency(wm);
}
SetCoord(width->GetUnit() == eCSSUnit_Enumerated && vertical ?
nsCSSValue(eCSSUnit_Unset) : *width,
@ -7735,7 +7735,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
const nsCSSValue* minWidth = aRuleData->ValueForMinWidth();
if (minWidth->GetUnit() == eCSSUnit_Enumerated) {
conditions.SetWritingModeDependency(writingMode);
conditions.SetWritingModeDependency(wm);
}
SetCoord(minWidth->GetUnit() == eCSSUnit_Enumerated && vertical ?
nsCSSValue(eCSSUnit_Unset) : *minWidth,
@ -7746,7 +7746,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
const nsCSSValue* maxWidth = aRuleData->ValueForMaxWidth();
if (maxWidth->GetUnit() == eCSSUnit_Enumerated) {
conditions.SetWritingModeDependency(writingMode);
conditions.SetWritingModeDependency(wm);
}
SetCoord(maxWidth->GetUnit() == eCSSUnit_Enumerated && vertical ?
nsCSSValue(eCSSUnit_Unset) : *maxWidth,
@ -7757,7 +7757,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
const nsCSSValue* height = aRuleData->ValueForHeight();
if (height->GetUnit() == eCSSUnit_Enumerated) {
conditions.SetWritingModeDependency(writingMode);
conditions.SetWritingModeDependency(wm);
}
SetCoord(height->GetUnit() == eCSSUnit_Enumerated && !vertical ?
nsCSSValue(eCSSUnit_Unset) : *height,
@ -7768,7 +7768,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
const nsCSSValue* minHeight = aRuleData->ValueForMinHeight();
if (minHeight->GetUnit() == eCSSUnit_Enumerated) {
conditions.SetWritingModeDependency(writingMode);
conditions.SetWritingModeDependency(wm);
}
SetCoord(minHeight->GetUnit() == eCSSUnit_Enumerated && !vertical ?
nsCSSValue(eCSSUnit_Unset) : *minHeight,
@ -7779,7 +7779,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
const nsCSSValue* maxHeight = aRuleData->ValueForMaxHeight();
if (maxHeight->GetUnit() == eCSSUnit_Enumerated) {
conditions.SetWritingModeDependency(writingMode);
conditions.SetWritingModeDependency(wm);
}
SetCoord(maxHeight->GetUnit() == eCSSUnit_Enumerated && !vertical ?
nsCSSValue(eCSSUnit_Unset) : *maxHeight,