Diff
Modified: trunk/LayoutTests/ChangeLog (91678 => 91679)
--- trunk/LayoutTests/ChangeLog 2011-07-25 17:59:08 UTC (rev 91678)
+++ trunk/LayoutTests/ChangeLog 2011-07-25 18:02:01 UTC (rev 91679)
@@ -1,3 +1,16 @@
+2011-07-25 Alexandru Chiculita <[email protected]>
+
+ [CSS Exclusions] Use HANDLE_INHERIT_AND_INITIAL when parsing -webkit-wrap-shape
+ https://bugs.webkit.org/show_bug.cgi?id=65096
+
+ Fixed 'inherit' test to copy the value from the parent. Also, added new tests
+ for 'inerhit' with no value in the parent.
+
+ Reviewed by Tony Chang.
+
+ * fast/exclusions/parsing-wrap-shape-expected.txt:
+ * fast/exclusions/script-tests/parsing-wrap-shape.js:
+
2011-07-25 Mike Reed <[email protected]>
disable tests pending rebaseline with rotated text fix
Modified: trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-expected.txt (91678 => 91679)
--- trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-expected.txt 2011-07-25 17:59:08 UTC (rev 91678)
+++ trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-expected.txt 2011-07-25 18:02:01 UTC (rev 91679)
@@ -23,7 +23,10 @@
PASS testComputedStyle("polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)") is "polygon(nonzero, 10px, 20px 30px, 40px 40px, 50px)"
PASS testNotInherited("auto", "rect(10px, 20px, 30px, 40px)") is "parent: auto, child: rect(10px, 20px, 30px, 40px)"
PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "initial") is "parent: rect(10px, 20px, 30px, 40px), child: auto"
-PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit") is "parent: rect(10px, 20px, 30px, 40px), child: auto"
+PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "") is "parent: rect(10px, 20px, 30px, 40px), child: auto"
+PASS testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit") is "parent: rect(10px, 20px, 30px, 40px), child: rect(10px, 20px, 30px, 40px)"
+PASS testNotInherited("", "inherit") is "parent: auto, child: auto"
+PASS testNotInherited("auto", "inherit") is "parent: auto, child: auto"
PASS testCSSText("calc()") is ""
PASS testComputedStyle("calc()") is "auto"
PASS testCSSText("none") is ""
Modified: trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape.js (91678 => 91679)
--- trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape.js 2011-07-25 17:59:08 UTC (rev 91678)
+++ trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape.js 2011-07-25 18:02:01 UTC (rev 91679)
@@ -69,7 +69,10 @@
shouldBeEqualToString('testNotInherited("auto", "rect(10px, 20px, 30px, 40px)")', "parent: auto, child: rect(10px, 20px, 30px, 40px)");
shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "initial")', "parent: rect(10px, 20px, 30px, 40px), child: auto");
-shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit")', "parent: rect(10px, 20px, 30px, 40px), child: auto");
+shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "")', "parent: rect(10px, 20px, 30px, 40px), child: auto");
+shouldBeEqualToString('testNotInherited("rect(10px, 20px, 30px, 40px)", "inherit")', "parent: rect(10px, 20px, 30px, 40px), child: rect(10px, 20px, 30px, 40px)");
+shouldBeEqualToString('testNotInherited("", "inherit")', "parent: auto, child: auto");
+shouldBeEqualToString('testNotInherited("auto", "inherit")', "parent: auto, child: auto");
// negative tests
Modified: trunk/Source/WebCore/ChangeLog (91678 => 91679)
--- trunk/Source/WebCore/ChangeLog 2011-07-25 17:59:08 UTC (rev 91678)
+++ trunk/Source/WebCore/ChangeLog 2011-07-25 18:02:01 UTC (rev 91679)
@@ -1,3 +1,16 @@
+2011-07-25 Alexandru Chiculita <[email protected]>
+
+ [CSS Exclusions] Use HANDLE_INHERIT_AND_INITIAL when parsing -webkit-wrap-shape
+ https://bugs.webkit.org/show_bug.cgi?id=65096
+
+ Also the 'inherit' keyword is now treated correctly. It will
+ copy the value from the parent style.
+
+ Reviewed by Tony Chang.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+
2011-07-25 Andrew Wason <[email protected]>
glActiveTexture(0) is invalid
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (91678 => 91679)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-07-25 17:59:08 UTC (rev 91678)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-07-25 18:02:01 UTC (rev 91679)
@@ -5189,15 +5189,13 @@
#if ENABLE(CSS_EXCLUSIONS)
case CSSPropertyWebkitWrapShape:
- if (isInitial) {
- HANDLE_INITIAL_COND(CSSPropertyWebkitWrapShape, WrapShape)
+ HANDLE_INHERIT_AND_INITIAL(wrapShape, WrapShape);
+ if (!primitiveValue)
return;
- }
- if (primitiveValue && primitiveValue->getIdent() == CSSValueAuto)
+ if (primitiveValue->getIdent() == CSSValueAuto)
m_style->setWrapShape(0);
-
- if (primitiveValue && primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_SHAPE)
+ else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_SHAPE)
m_style->setWrapShape(primitiveValue->getShapeValue());
return;
