Changeset 106459 in webkit

Timestamp:

Feb 1, 2012 2:31:15 AM (12 years ago)

Author:

shawnsingh@chromium.org

Message:

Fix the semantics of passing contentsVisible flag to GraphicsLayers
​https://bugs.webkit.org/show_bug.cgi?id=76975

Reviewed by Simon Fraser.

Source/WebCore:

This patch is covered by existing tests, in particular
compositing/visibility/layer-visible-content.html; its
expectations are rebaselined.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):

LayoutTests:

• compositing/visibility/layer-visible-content-expected.txt: rebaselined expected result
• compositing/visibility/layer-visible-content.html: fixed height so that result is platform-independent
• platform/chromium/test_expectations.txt: removed fail expectation, it should pass now.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/visibility/layer-visible-content-expected.txt (modified) (2 diffs)
• LayoutTests/compositing/visibility/layer-visible-content.html (modified) (1 diff)
• 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-02-01  Shawn Singh  <shawnsingh@chromium.org>
+
+        Fix the semantics of passing contentsVisible flag to GraphicsLayers
+        https://bugs.webkit.org/show_bug.cgi?id=76975
+
+        Reviewed by Simon Fraser.
+
+        * compositing/visibility/layer-visible-content-expected.txt: rebaselined expected result
+        * compositing/visibility/layer-visible-content.html: fixed height so that result is platform-independent
+        * platform/chromium/test_expectations.txt: removed fail expectation, it should pass now.
+
 2012-02-01  Philippe Normand  <pnormand@igalia.com>
 

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

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

trunk/LayoutTests/compositing/visibility/layer-visible-content.html

@@ -38 +38 @@
     pre {
         opacity: 0; /* hide in pixel result */
+        height: 16px; /* avoid platform-dependent height difference of hidden text layer-tree */
     }
   </style>

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -4015 +4015 @@
 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-02-01  Shawn Singh  <shawnsingh@chromium.org>
+
+        Fix the semantics of passing contentsVisible flag to GraphicsLayers
+        https://bugs.webkit.org/show_bug.cgi?id=76975
+
+        Reviewed by Simon Fraser.
+
+        This patch is covered by existing tests, in particular
+        compositing/visibility/layer-visible-content.html; its
+        expectations are rebaselined.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+
 2012-02-01  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -404 +404 @@
     
     m_owningLayer->updateVisibilityStatus();
-    m_graphicsLayer->setContentsVisible(m_owningLayer->hasVisibleContent());
-    
+
+    // 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() || hasVisibleNonCompositingDescendantLayers());
+
     RenderStyle* style = renderer()->style();
     m_graphicsLayer->setPreserves3D(style->transformStyle3D() == TransformStyle3DPreserve3D && !renderer()->hasReflection());