Title: [92870] trunk
Revision
92870
Author
[email protected]
Date
2011-08-11 11:08:08 -0700 (Thu, 11 Aug 2011)

Log Message

https://bugs.webkit.org/show_bug.cgi?id=66075

Source/WebCore: 

Turn on regions and exclusions by default. Fix one stray ifdef that I missed.

Reviewed by James Robinson.

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::contentToCSSValue):

LayoutTests: 

Fix the broken test result for layer dumping, since at the moment flow threads don't collect
layers (this will be fixed eventually).

Unskip the regions and exclusions tests now that they are turned on by default.

Reviewed by James Robinson.

* fast/regions/webkit-flow-renderer-layer-expected.txt:
* platform/mac/Skipped:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (92869 => 92870)


--- trunk/LayoutTests/ChangeLog	2011-08-11 17:57:05 UTC (rev 92869)
+++ trunk/LayoutTests/ChangeLog	2011-08-11 18:08:08 UTC (rev 92870)
@@ -1,3 +1,17 @@
+2011-08-11  David Hyatt  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66075
+
+        Fix the broken test result for layer dumping, since at the moment flow threads don't collect
+        layers (this will be fixed eventually).
+
+        Unskip the regions and exclusions tests now that they are turned on by default.
+
+        Reviewed by James Robinson.
+
+        * fast/regions/webkit-flow-renderer-layer-expected.txt:
+        * platform/mac/Skipped:
+
 2011-08-11  Balazs Kelemen  <[email protected]>
 
         [Qt] fast/dom/HTMLDocument/hasFocus.html fails

Modified: trunk/LayoutTests/fast/regions/webkit-flow-renderer-layer-expected.txt (92869 => 92870)


--- trunk/LayoutTests/fast/regions/webkit-flow-renderer-layer-expected.txt	2011-08-11 17:57:05 UTC (rev 92869)
+++ trunk/LayoutTests/fast/regions/webkit-flow-renderer-layer-expected.txt	2011-08-11 18:08:08 UTC (rev 92870)
@@ -7,24 +7,11 @@
   Thread with flow-name 'flowA'
     layer at (0,0) size 800x600
       RenderFlowThread at (0,0) size 800x600
-    layer at (0,0) size 91x18
-      RenderBlock (positioned) {DIV} at (0,0) size 91x18
-        RenderText {#text} at (0,0) size 91x18
-          text run at (0,0) width 91: "DIV1 - flowA"
   Thread with flow-name 'flowB'
     layer at (0,0) size 800x600
       RenderFlowThread at (0,0) size 800x600
-    layer at (0,0) size 800x18
-      RenderBlock {DIV} at (0,0) size 800x18
-        RenderText {#text} at (0,0) size 90x18
-          text run at (0,0) width 90: "DIV2 - flowB"
   Thread with flow-name 'flowC'
-    layer at (0,0) size 800x600 layerType: background only
-    layer at (0,36) size 90x18
-      RenderBlock (positioned) zI: -1 {DIV} at (0,36) size 90x18
-        RenderText zI: -1 {#text} at (0,0) size 90x18
-          text run at (0,0) width 90: "DIV4 - flowC"
-    layer at (0,0) size 800x600 layerType: foreground only
+    layer at (0,0) size 800x600
       RenderFlowThread at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 800x36
           RenderBlock (anonymous) at (0,0) size 800x18

Modified: trunk/LayoutTests/platform/mac/Skipped (92869 => 92870)


--- trunk/LayoutTests/platform/mac/Skipped	2011-08-11 17:57:05 UTC (rev 92869)
+++ trunk/LayoutTests/platform/mac/Skipped	2011-08-11 18:08:08 UTC (rev 92870)
@@ -383,12 +383,6 @@
 # New flexbox is not yet enabled. http://webkit.org/b/62048
 css3/flexbox
 
-# CSS Regions support not yet enabled. http://webkit.org/b/57312
-fast/regions
-
-# CSS Exclusions support not yet enabled. http://webkit.org/b/57311
-fast/exclusions
-
 # JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540)
 http/tests/security/isolatedWorld/cross-origin-xhr.html
 

Modified: trunk/Source/WebCore/ChangeLog (92869 => 92870)


--- trunk/Source/WebCore/ChangeLog	2011-08-11 17:57:05 UTC (rev 92869)
+++ trunk/Source/WebCore/ChangeLog	2011-08-11 18:08:08 UTC (rev 92870)
@@ -1,3 +1,14 @@
+2011-08-11  David Hyatt  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66075
+
+        Turn on regions and exclusions by default. Fix one stray ifdef that I missed.
+
+        Reviewed by James Robinson.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::contentToCSSValue):
+
 2011-08-11  David Reveman  <[email protected]>
 
         [Chromium] Temporarily disable layer anti-aliasing on ChromeOS.

Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (92869 => 92870)


--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2011-08-11 17:57:05 UTC (rev 92869)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2011-08-11 18:08:08 UTC (rev 92870)
@@ -772,10 +772,8 @@
         } else if (contentData->isText())
             list->append(primitiveValueCache->createValue(static_cast<const TextContentData*>(contentData)->text(), CSSPrimitiveValue::CSS_STRING));
     }
-#if ENABLE(CSS_REGIONS)
     if (!style->regionThread().isNull())
         list->append(primitiveValueCache->createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING));
-#endif
     return list.release();
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to