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

Fix keyword table entries in nsCSSPropList and code in nsRuleNode to match those used in the parser. (Bug 636029) r=bzbarsky

Browse Source
This commit is contained in:
L. David Baron 2011-03-05 09:58:33 -08:00
parent 08ab704b49
commit 2f73995ced
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/style/nsCSSPropList.h
View File

@ -1319,7 +1319,7 @@ CSS_PROP_COLUMN(
Column,
mColumnRuleColor,
0,
nsnull,
kBorderColorKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Custom)
CSS_PROP_COLUMN(
@ -1996,7 +1996,7 @@ CSS_PROP_OUTLINE(
Margin,
mOutlineStyle,
0,
kBorderStyleKTable,
kOutlineStyleKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_OUTLINE(

3
layout/style/nsRuleNode.cpp
View File

@ -6064,7 +6064,8 @@ nsRuleNode::ComputeColumnData(void* aStartStruct,
column->mColumnRuleColor = parent->mColumnRuleColor;
}
}
else if (eCSSUnit_Initial == colorValue.GetUnit()) {
else if (eCSSUnit_Initial == colorValue.GetUnit() ||
eCSSUnit_Enumerated == colorValue.GetUnit()) {
column->mColumnRuleColorIsForeground = PR_TRUE;
}
else if (SetColor(colorValue, 0, mPresContext, aContext,

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

@ -605,7 +605,7 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "green" },
initial_values: [ "currentColor" ],
initial_values: [ "currentColor", "-moz-use-text-color" ],
other_values: [ "red", "blue", "#ffff00" ],
invalid_values: [ ]
},
@ -1361,7 +1361,7 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
initial_values: [ "currentColor" ],
initial_values: [ "currentColor", "-moz-use-text-color" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000" ]
},
@ -1423,7 +1423,7 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
prerequisites: { "color": "black" },
initial_values: [ "currentColor" ],
initial_values: [ "currentColor", "-moz-use-text-color" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000" ]
},
@ -1468,7 +1468,7 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
prerequisites: { "color": "black" },
initial_values: [ "currentColor" ],
initial_values: [ "currentColor", "-moz-use-text-color" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000" ]
},
@ -1531,7 +1531,7 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
initial_values: [ "currentColor" ],
initial_values: [ "currentColor", "-moz-use-text-color" ],
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000" ]
},
@ -2161,7 +2161,7 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_LONGHAND,
prerequisites: { "color": "black" },
initial_values: [ "currentColor" ], // XXX should be invert
initial_values: [ "currentColor", "-moz-use-text-color" ], // XXX should be invert
other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000" ]
},