diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 3b4eeac49f..0eb51f9508 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -1871,6 +1871,7 @@ const KTableEntry nsCSSProps::kOverflowKTable[] = { { eCSSKeyword_visible, NS_STYLE_OVERFLOW_VISIBLE }, { eCSSKeyword_hidden, NS_STYLE_OVERFLOW_HIDDEN }, { eCSSKeyword_scroll, NS_STYLE_OVERFLOW_SCROLL }, + { eCSSKeyword_clip, NS_STYLE_OVERFLOW_CLIP }, // Deprecated: { eCSSKeyword__moz_scrollbars_none, NS_STYLE_OVERFLOW_HIDDEN }, { eCSSKeyword__moz_scrollbars_horizontal, NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL }, @@ -1890,6 +1891,7 @@ const KTableEntry nsCSSProps::kOverflowSubKTable[] = { { eCSSKeyword_visible, NS_STYLE_OVERFLOW_VISIBLE }, { eCSSKeyword_hidden, NS_STYLE_OVERFLOW_HIDDEN }, { eCSSKeyword_scroll, NS_STYLE_OVERFLOW_SCROLL }, + { eCSSKeyword_clip, NS_STYLE_OVERFLOW_CLIP }, // Deprecated: { eCSSKeyword__moz_hidden_unscrollable, NS_STYLE_OVERFLOW_CLIP }, { eCSSKeyword_UNKNOWN, -1 } diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index 368b476e64..e649bf7ade 100644 --- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -2055,7 +2055,7 @@ var gCSSProperties = { "-moz-tab-size": { domProp: "MozTabSize", inherited: true, - type: CSS_TYPE_SHORTHAND_AND_LONGHAND + type: CSS_TYPE_SHORTHAND_AND_LONGHAND, alias_for: "tab-size", subproperties: [ "tab-size" ] }, @@ -3575,7 +3575,7 @@ var gCSSProperties = { inherited: false, type: CSS_TYPE_LONGHAND, initial_values: [ "1", "17", "397.376", "3e1", "3e+1", "3e0", "3e+0", "3e-0" ], - other_values: [ "0", "0.4", "0.0000", "-3", "3e-1" "-100%", "50%" ], + other_values: [ "0", "0.4", "0.0000", "-3", "3e-1", "-100%", "50%" ], invalid_values: [ "0px", "1px" ] }, "-moz-orient": { @@ -3651,7 +3651,7 @@ var gCSSProperties = { prerequisites: { "display": "block", "contain": "none" }, subproperties: [ "overflow-x", "overflow-y" ], initial_values: [ "visible" ], - other_values: [ "auto", "scroll", "hidden", "-moz-hidden-unscrollable", "-moz-scrollbars-none" ], + other_values: [ "auto", "scroll", "hidden", "clip", "-moz-hidden-unscrollable", "-moz-scrollbars-none" ], invalid_values: [] }, "overflow-x": { @@ -3660,7 +3660,7 @@ var gCSSProperties = { type: CSS_TYPE_LONGHAND, prerequisites: { "display": "block", "overflow-y": "visible", "contain": "none" }, initial_values: [ "visible" ], - other_values: [ "auto", "scroll", "hidden", "-moz-hidden-unscrollable" ], + other_values: [ "auto", "scroll", "hidden", "clip", "-moz-hidden-unscrollable" ], invalid_values: [] }, "overflow-y": { @@ -3669,7 +3669,7 @@ var gCSSProperties = { type: CSS_TYPE_LONGHAND, prerequisites: { "display": "block", "overflow-x": "visible", "contain": "none" }, initial_values: [ "visible" ], - other_values: [ "auto", "scroll", "hidden", "-moz-hidden-unscrollable" ], + other_values: [ "auto", "scroll", "hidden", "clip", "-moz-hidden-unscrollable" ], invalid_values: [] }, "padding": { @@ -4474,7 +4474,7 @@ var gCSSProperties = { inherited: true, type: CSS_TYPE_LONGHAND, initial_values: [ "1", "2.8", "1.000", "300%", "context-fill-opacity", "context-stroke-opacity" ], - other_values: [ "0", "0.3", "-7.3", "-100%", "50% ], + other_values: [ "0", "0.3", "-7.3", "-100%", "50%" ], invalid_values: [] }, "stroke-width": { diff --git a/layout/style/test/test_overflow_clip_parsing.html b/layout/style/test/test_overflow_clip_parsing.html new file mode 100644 index 0000000000..edbc9273f9 --- /dev/null +++ b/layout/style/test/test_overflow_clip_parsing.html @@ -0,0 +1,346 @@ + + +
+ +