wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 848539 part 6: Back out ff0658329dbd, bug 763689 part 1 (CSS parser support for min-width:auto & min-height:auto). r=dbaron

Browse Source
This commit is contained in:
Daniel Holbert 2013-03-27 23:33:19 -07:00
parent ad0dde7ba7
commit 2004ef3547
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/style/nsCSSPropList.h
View File

@ -2150,7 +2150,7 @@ CSS_PROP_POSITION(
CSS_PROPERTY_VALUE_NONNEGATIVE | CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC, CSS_PROPERTY_STORES_CALC,
"", "",
VARIANT_AHLP | VARIANT_CALC, VARIANT_HLP | VARIANT_CALC,
nullptr, nullptr,
offsetof(nsStylePosition, mMinHeight), offsetof(nsStylePosition, mMinHeight),
eStyleAnimType_Coord) eStyleAnimType_Coord)
@ -2162,7 +2162,7 @@ CSS_PROP_POSITION(
CSS_PROPERTY_VALUE_NONNEGATIVE | CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC, CSS_PROPERTY_STORES_CALC,
"", "",
VARIANT_AHKLP | VARIANT_CALC, VARIANT_HKLP | VARIANT_CALC,
kWidthKTable, kWidthKTable,
offsetof(nsStylePosition, mMinWidth), offsetof(nsStylePosition, mMinWidth),
eStyleAnimType_Coord) eStyleAnimType_Coord)

13
layout/style/nsRuleNode.cpp
View File

@ -6477,7 +6477,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
SETCOORD_LPAEH | SETCOORD_INITIAL_AUTO | SETCOORD_STORE_CALC, SETCOORD_LPAEH | SETCOORD_INITIAL_AUTO | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree); aContext, mPresContext, canStoreInRuleTree);
SetCoord(*aRuleData->ValueForMinWidth(), pos->mMinWidth, parentPos->mMinWidth, SetCoord(*aRuleData->ValueForMinWidth(), pos->mMinWidth, parentPos->mMinWidth,
SETCOORD_LPAEH | SETCOORD_INITIAL_AUTO | SETCOORD_STORE_CALC, SETCOORD_LPEH | SETCOORD_INITIAL_ZERO | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree); aContext, mPresContext, canStoreInRuleTree);
SetCoord(*aRuleData->ValueForMaxWidth(), pos->mMaxWidth, parentPos->mMaxWidth, SetCoord(*aRuleData->ValueForMaxWidth(), pos->mMaxWidth, parentPos->mMaxWidth,
SETCOORD_LPOEH | SETCOORD_INITIAL_NONE | SETCOORD_STORE_CALC, SETCOORD_LPOEH | SETCOORD_INITIAL_NONE | SETCOORD_STORE_CALC,
@ -6487,21 +6487,12 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
SETCOORD_LPAH | SETCOORD_INITIAL_AUTO | SETCOORD_STORE_CALC, SETCOORD_LPAH | SETCOORD_INITIAL_AUTO | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree); aContext, mPresContext, canStoreInRuleTree);
SetCoord(*aRuleData->ValueForMinHeight(), pos->mMinHeight, parentPos->mMinHeight, SetCoord(*aRuleData->ValueForMinHeight(), pos->mMinHeight, parentPos->mMinHeight,
SETCOORD_LPAH | SETCOORD_INITIAL_AUTO | SETCOORD_STORE_CALC, SETCOORD_LPH | SETCOORD_INITIAL_ZERO | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree); aContext, mPresContext, canStoreInRuleTree);
SetCoord(*aRuleData->ValueForMaxHeight(), pos->mMaxHeight, parentPos->mMaxHeight, SetCoord(*aRuleData->ValueForMaxHeight(), pos->mMaxHeight, parentPos->mMaxHeight,
SETCOORD_LPOH | SETCOORD_INITIAL_NONE | SETCOORD_STORE_CALC, SETCOORD_LPOH | SETCOORD_INITIAL_NONE | SETCOORD_STORE_CALC,
aContext, mPresContext, canStoreInRuleTree); aContext, mPresContext, canStoreInRuleTree);
// Handle 'auto' values for min-width / min-height
if (pos->mMinWidth.GetUnit() == eStyleUnit_Auto) {
pos->mMinWidth.SetCoordValue(0);
}
if (pos->mMinHeight.GetUnit() == eStyleUnit_Auto) {
pos->mMinHeight.SetCoordValue(0);
}
// box-sizing: enum, inherit, initial // box-sizing: enum, inherit, initial
SetDiscrete(*aRuleData->ValueForBoxSizing(), SetDiscrete(*aRuleData->ValueForBoxSizing(),
pos->mBoxSizing, canStoreInRuleTree, pos->mBoxSizing, canStoreInRuleTree,

8
layout/style/test/property_database.js
View File

@ -2766,7 +2766,7 @@ var gCSSProperties = {
inherited: false, inherited: false,
type: CSS_TYPE_LONGHAND, type: CSS_TYPE_LONGHAND,
prerequisites: { "display": "block" }, prerequisites: { "display": "block" },
initial_values: [ "auto", "0", "calc(0em)", "calc(-2px)", "calc(-1%)" ], initial_values: [ "0", "calc(0em)", "calc(-2px)", "calc(-1%)" ],
other_values: [ "30px", "50%", other_values: [ "30px", "50%",
"calc(2px)", "calc(2px)",
"calc(50%)", "calc(50%)",
@ -2774,14 +2774,14 @@ var gCSSProperties = {
"calc(25px*3)", "calc(25px*3)",
"calc(3*25px + 50%)", "calc(3*25px + 50%)",
], ],
invalid_values: [ "none", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available", "5" ] invalid_values: [ "auto", "none", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available", "5" ]
}, },
"min-width": { "min-width": {
domProp: "minWidth", domProp: "minWidth",
inherited: false, inherited: false,
type: CSS_TYPE_LONGHAND, type: CSS_TYPE_LONGHAND,
prerequisites: { "display": "block" }, prerequisites: { "display": "block" },
initial_values: [ "auto", "0", "calc(0em)", "calc(-2px)", "calc(-1%)" ], initial_values: [ "0", "calc(0em)", "calc(-2px)", "calc(-1%)" ],
other_values: [ "30px", "50%", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available", other_values: [ "30px", "50%", "-moz-max-content", "-moz-min-content", "-moz-fit-content", "-moz-available",
"calc(2px)", "calc(2px)",
"calc(50%)", "calc(50%)",
@ -2789,7 +2789,7 @@ var gCSSProperties = {
"calc(25px*3)", "calc(25px*3)",
"calc(3*25px + 50%)", "calc(3*25px + 50%)",
], ],
invalid_values: [ "none", "5" ] invalid_values: [ "auto", "none", "5" ]
}, },
"opacity": { "opacity": {
domProp: "opacity", domProp: "opacity",