Diff
Modified: trunk/LayoutTests/ChangeLog (112754 => 112755)
--- trunk/LayoutTests/ChangeLog 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/ChangeLog 2012-03-31 00:46:04 UTC (rev 112755)
@@ -1,3 +1,28 @@
+2012-03-30 Bear Travis <[email protected]>
+
+ shape-inside and shape-outside are not in the list of computed style properties
+ https://bugs.webkit.org/show_bug.cgi?id=82667
+
+ Reviewed by Ryosuke Niwa.
+
+ Adding prefixed shape-inside and shape-outside to the list of computed style properties.
+ Updating tests that look at all properties on a computed style declaration.
+
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
+ * platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
+ * platform/efl/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/gtk/svg/css/getComputedStyle-basic-expected.txt:
+ * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/qt/svg/css/getComputedStyle-basic-expected.txt:
+ * svg/css/getComputedStyle-basic-expected.txt:
+
2012-03-30 Dirk Pranke <[email protected]>
Unreviewed, expectations update.
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (112754 => 112755)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -191,6 +191,8 @@
-webkit-perspective-origin: 392px 288px;
-webkit-print-color-adjust: economy;
-webkit-rtl-ordering: logical;
+-webkit-shape-inside: auto;
+-webkit-shape-outside: auto;
-webkit-text-combine: none;
-webkit-text-decorations-in-effect: none;
-webkit-text-emphasis-color: rgb(0, 0, 0);
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (112754 => 112755)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -190,6 +190,8 @@
-webkit-perspective-origin: 50% 50%
-webkit-print-color-adjust: economy
-webkit-rtl-ordering: logical
+ -webkit-shape-inside: auto
+ -webkit-shape-outside: auto
-webkit-text-combine: none
-webkit-text-decorations-in-effect: none
-webkit-text-emphasis-color: rgb(0, 0, 0)
Modified: trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -192,6 +192,8 @@
-webkit-perspective-origin: 392px 288px;
-webkit-print-color-adjust: economy;
-webkit-rtl-ordering: logical;
+-webkit-shape-inside: auto;
+-webkit-shape-outside: auto;
-webkit-text-combine: none;
-webkit-text-decorations-in-effect: none;
-webkit-text-emphasis-color: rgb(0, 0, 0);
Modified: trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -191,6 +191,8 @@
-webkit-perspective-origin: 50% 50%
-webkit-print-color-adjust: economy
-webkit-rtl-ordering: logical
+ -webkit-shape-inside: auto
+ -webkit-shape-outside: auto
-webkit-text-combine: none
-webkit-text-decorations-in-effect: none
-webkit-text-emphasis-color: rgb(0, 0, 0)
Modified: trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -382,6 +382,10 @@
rect: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-inside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-outside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-combine) : none
rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
Modified: trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -192,6 +192,8 @@
-webkit-perspective-origin: 392px 288px;
-webkit-print-color-adjust: economy;
-webkit-rtl-ordering: logical;
+-webkit-shape-inside: auto;
+-webkit-shape-outside: auto;
-webkit-text-combine: none;
-webkit-text-decorations-in-effect: none;
-webkit-text-emphasis-color: rgb(0, 0, 0);
Modified: trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -191,6 +191,8 @@
-webkit-perspective-origin: 50% 50%
-webkit-print-color-adjust: economy
-webkit-rtl-ordering: logical
+ -webkit-shape-inside: auto
+ -webkit-shape-outside: auto
-webkit-text-combine: none
-webkit-text-decorations-in-effect: none
-webkit-text-emphasis-color: rgb(0, 0, 0)
Modified: trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -382,6 +382,10 @@
rect: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-inside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-outside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-combine) : none
rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
@@ -902,6 +906,10 @@
g: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-rtl-ordering) : logical
g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-inside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-outside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-combine) : none
g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
Modified: trunk/LayoutTests/platform/efl/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/efl/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/efl/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -190,6 +190,8 @@
-webkit-perspective-origin: 50% 50%
-webkit-print-color-adjust: economy
-webkit-rtl-ordering: logical
+ -webkit-shape-inside: auto
+ -webkit-shape-outside: auto
-webkit-text-combine: none
-webkit-text-decorations-in-effect: none
-webkit-text-emphasis-color: rgb(0, 0, 0)
Modified: trunk/LayoutTests/platform/gtk/svg/css/getComputedStyle-basic-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/gtk/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/gtk/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -380,6 +380,10 @@
rect: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-inside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-outside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-combine) : none
rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
@@ -898,6 +902,10 @@
g: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-rtl-ordering) : logical
g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-inside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-outside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-combine) : none
g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -193,6 +193,8 @@
-webkit-perspective-origin: 392px 288px;
-webkit-print-color-adjust: economy;
-webkit-rtl-ordering: logical;
+-webkit-shape-inside: auto;
+-webkit-shape-outside: auto;
-webkit-text-combine: none;
-webkit-text-decorations-in-effect: none;
-webkit-text-emphasis-color: rgb(0, 0, 0);
Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -192,6 +192,8 @@
-webkit-perspective-origin: 50% 50%
-webkit-print-color-adjust: economy
-webkit-rtl-ordering: logical
+ -webkit-shape-inside: auto
+ -webkit-shape-outside: auto
-webkit-text-combine: none
-webkit-text-decorations-in-effect: none
-webkit-text-emphasis-color: rgb(0, 0, 0)
Modified: trunk/LayoutTests/platform/qt/svg/css/getComputedStyle-basic-expected.txt (112754 => 112755)
--- trunk/LayoutTests/platform/qt/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/platform/qt/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -380,6 +380,10 @@
rect: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-inside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-outside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-combine) : none
rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
@@ -898,6 +902,10 @@
g: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-rtl-ordering) : logical
g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-inside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-outside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-combine) : none
g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (112754 => 112755)
--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2012-03-31 00:46:04 UTC (rev 112755)
@@ -384,6 +384,10 @@
rect: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-rtl-ordering) : logical
rect: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-inside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(-webkit-shape-outside) : auto
+rect: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-combine) : none
rect: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
@@ -906,6 +910,10 @@
g: style.getPropertyCSSValue(-webkit-print-color-adjust) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-rtl-ordering) : logical
g: style.getPropertyCSSValue(-webkit-rtl-ordering) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-inside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-inside) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(-webkit-shape-outside) : auto
+g: style.getPropertyCSSValue(-webkit-shape-outside) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-combine) : none
g: style.getPropertyCSSValue(-webkit-text-combine) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-text-decorations-in-effect) : none
Modified: trunk/Source/WebCore/ChangeLog (112754 => 112755)
--- trunk/Source/WebCore/ChangeLog 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/Source/WebCore/ChangeLog 2012-03-31 00:46:04 UTC (rev 112755)
@@ -1,3 +1,16 @@
+2012-03-30 Bear Travis <[email protected]>
+
+ shape-inside and shape-outside are not in the list of computed style properties
+ https://bugs.webkit.org/show_bug.cgi?id=82667
+
+ Reviewed by Ryosuke Niwa.
+
+ Adding prefixed shape-inside and shape-outside to the list of computed style properties.
+ Added properties to existing tests for computed style results
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore): added -webkit-shape-inside and -webkit-shape-outside to computedProperties
+
2012-03-30 Adam Barth <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=82582
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (112754 => 112755)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-03-31 00:31:48 UTC (rev 112754)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-03-31 00:46:04 UTC (rev 112755)
@@ -280,6 +280,8 @@
CSSPropertyWebkitPerspectiveOrigin,
CSSPropertyWebkitPrintColorAdjust,
CSSPropertyWebkitRtlOrdering,
+ CSSPropertyWebkitShapeInside,
+ CSSPropertyWebkitShapeOutside,
#if ENABLE(TOUCH_EVENTS)
CSSPropertyWebkitTapHighlightColor,
#endif