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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1c90295..32bc9e3 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+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>
 
         <content> should create HTMLContentElement object

diff --git a/LayoutTests/compositing/visibility/layer-visible-content-expected.txt b/LayoutTests/compositing/visibility/layer-visible-content-expected.txt
index b7e3fbd..a5c18c4 100644 (file)
--- a/LayoutTests/compositing/visibility/layer-visible-content-expected.txt
+++ b/LayoutTests/compositing/visibility/layer-visible-content-expected.txt
@@ -3,10 +3,11 @@
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
-      (children 2
+      (children 1
         (GraphicsLayer
           (bounds 200.00 200.00)
           (drawsContent 1)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer
               (bounds 200.00 200.00)
@@ -18,11 +19,6 @@
             )
           )
         )
-        (GraphicsLayer
-          (bounds 800.00 15.00)
-          (opacity 0.00)
-          (drawsContent 1)
-        )
       )
     )
   )

diff --git a/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt
index e7be785..a10ebd4 100644 (file)
--- a/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt
+++ b/LayoutTests/compositing/visibility/visibility-image-layers-dynamic-expected.txt
@@ -35,6 +35,7 @@ Initial
         (GraphicsLayer
           (position 14.00 314.00)
           (bounds 757.00 152.00)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer
               (position 20.00 20.00)
@@ -49,10 +50,10 @@ Initial
 After step 1
 
 (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
           (position 14.00 6.00)
@@ -79,6 +80,7 @@ After step 1
         (GraphicsLayer
           (position 14.00 314.00)
           (bounds 757.00 152.00)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer
               (position 20.00 20.00)
@@ -93,10 +95,10 @@ After step 1
 After step 2
 
 (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
           (position 14.00 6.00)
@@ -122,6 +124,7 @@ After step 2
         (GraphicsLayer
           (position 14.00 314.00)
           (bounds 757.00 152.00)
+          (contentsVisible 0)
           (children 1
             (GraphicsLayer
               (position 20.00 20.00)

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index a7e5e45..2b4fa42 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -4004,6 +4004,8 @@ BUG_CARYCLARK MAC : fast/dom/blur-contenteditable.html = IMAGE
 // Need to implement file name logging.
 BUGWK76572 : http/tests/download = FAIL
 
+BUGWK76716 : compositing/visibility/layer-visible-content.html = IMAGE+TEXT
+
 BUGWK76967 : media/media-fragments/TC0030-TC0039.html = PASS TIMEOUT
 
 BUGABARTH : media/audio-garbage-collect.html = PASS TIMEOUT

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 40b8d29..aa6abb2 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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>
 
         Page Up and Page Down mappings are backwards on BlackBerry port.

diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index 7e9ed4a..628185c 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -403,11 +403,7 @@ void RenderLayerBacking::updateGraphicsLayerGeometry()
 #endif
     
     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();
     m_graphicsLayer->setPreserves3D(style->transformStyle3D() == TransformStyle3DPreserve3D && !renderer()->hasReflection());