Changeset 105920 in webkit

Timestamp:

Jan 25, 2012 1:06:51 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Unreviewed, rolling out r105906.
​http://trac.webkit.org/changeset/105906
​https://bugs.webkit.org/show_bug.cgi?id=77038

Breaks compositing/visibility/layer-visible-content.html and
compositing/visibility/visibility-image-layers-dynamic.html
(Requested by leviw|gardening on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-01-25

Source/WebCore:

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):

LayoutTests:

• compositing/visibility/layer-visible-content-expected.txt:
• compositing/visibility/visibility-image-layers-dynamic-expected.txt:
• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/visibility/layer-visible-content-expected.txt (modified) (2 diffs)
• LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt (modified) (5 diffs)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r105906.
+        http://trac.webkit.org/changeset/105906
+        https://bugs.webkit.org/show_bug.cgi?id=77038
+
+        Breaks compositing/visibility/layer-visible-content.html and
+        compositing/visibility/visibility-image-layers-dynamic.html
+        (Requested by leviw|gardening on #webkit).
+
+        * compositing/visibility/layer-visible-content-expected.txt:
+        * compositing/visibility/visibility-image-layers-dynamic-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2012-01-25  Hajime Morita  <morrita@google.com>
 

trunk/LayoutTests/compositing/visibility/layer-visible-content-expected.txt

@@ -4 +4 @@
     (GraphicsLayer
       (bounds 800.00 600.00)
-      (children 2
+      (children 1
         (GraphicsLayer
           (bounds 200.00 200.00)
           (drawsContent 1)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer
@@ -19 +20 @@
           )
         )
-        (GraphicsLayer
-          (bounds 800.00 15.00)
-          (opacity 0.00)
-          (drawsContent 1)
-        )
       )
     )

trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt

@@ -36 +36 @@
           (position 14.00 314.00)
           (bounds 757.00 152.00)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer
@@ -50 +51 @@
 
 (GraphicsLayer
-  (bounds 785.00 1286.00)
+  (bounds 785.00 1301.00)
   (children 1
     (GraphicsLayer
-      (bounds 785.00 1286.00)
+      (bounds 785.00 1301.00)
       (children 3
         (GraphicsLayer
@@ -80 +81 @@
           (position 14.00 314.00)
           (bounds 757.00 152.00)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer
@@ -94 +96 @@
 
 (GraphicsLayer
-  (bounds 785.00 1935.00)
+  (bounds 785.00 1965.00)
   (children 1
     (GraphicsLayer
-      (bounds 785.00 1935.00)
+      (bounds 785.00 1965.00)
       (children 3
         (GraphicsLayer
@@ -123 +125 @@
           (position 14.00 314.00)
           (bounds 757.00 152.00)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -4005 +4005 @@
 BUGWK76572 : http/tests/download = FAIL
 
+BUGWK76716 : compositing/visibility/layer-visible-content.html = IMAGE+TEXT
+
 BUGWK76967 : media/media-fragments/TC0030-TC0039.html = PASS TIMEOUT
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r105906.
+        http://trac.webkit.org/changeset/105906
+        https://bugs.webkit.org/show_bug.cgi?id=77038
+
+        Breaks compositing/visibility/layer-visible-content.html and
+        compositing/visibility/visibility-image-layers-dynamic.html
+        (Requested by leviw|gardening on #webkit).
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+
 2012-01-25  Mike Fenton  <mifenton@rim.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -404 +404 @@
     
     m_owningLayer->updateVisibilityStatus();
-
-    // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer and its non-compositing
-    // descendants. So, the visibility flag for m_graphicsLayer should be true if there are any
-    // non-compositing visible layers.
-    m_graphicsLayer->setContentsVisible(m_owningLayer->hasVisibleContent() || m_owningLayer->hasVisibleDescendant());
+    m_graphicsLayer->setContentsVisible(m_owningLayer->hasVisibleContent());
     
     RenderStyle* style = renderer()->style();