Changeset 84307 in webkit

Timestamp:

Apr 19, 2011 4:23:49 PM (13 years ago)

Author:

jamesr@google.com

Message:

2011-04-19 Antoine Labour <​piman@chromium.org>

Reviewed by James Robinson.

For invisible iframes, propagate compositing to parent instead of setting self
as root.
​https://bugs.webkit.org/show_bug.cgi?id=58414

• compositing/iframes/invisible-iframe-expected.checksum: Added.
• compositing/iframes/invisible-iframe-expected.png: Added.
• compositing/iframes/invisible-iframe-expected.txt: Added.
• compositing/iframes/invisible-iframe.html: Added.
• compositing/iframes/invisible-nested-iframe-expected.checksum: Added.
• compositing/iframes/invisible-nested-iframe-expected.png: Added.
• compositing/iframes/invisible-nested-iframe-expected.txt: Added.
• compositing/iframes/invisible-nested-iframe-hide-expected.txt: Added.
• compositing/iframes/invisible-nested-iframe-hide.html: Added.
• compositing/iframes/invisible-nested-iframe-show-expected.txt: Added.
• compositing/iframes/invisible-nested-iframe-show.html: Added.
• compositing/iframes/invisible-nested-iframe.html: Added.
• platform/chromium-gpu/compositing/iframes/invisible-nested-iframe-show-expected.txt: Added.

2011-04-19 Antoine Labour <​piman@chromium.org>

Reviewed by James Robinson.

For invisible iframes, propagate compositing to parent instead of setting self
as root.
​https://bugs.webkit.org/show_bug.cgi?id=58414

Tests: compositing/iframes/invisible-iframe.html

compositing/iframes/invisible-nested-iframe-hide.html
compositing/iframes/invisible-nested-iframe-show.html
compositing/iframes/invisible-nested-iframe.html

• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame): Propagate compositing to parent even if frame owner has no renderer.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/iframes/invisible-iframe-expected.checksum (added)
• LayoutTests/compositing/iframes/invisible-iframe-expected.png (added)
• LayoutTests/compositing/iframes/invisible-iframe-expected.txt (added)
• LayoutTests/compositing/iframes/invisible-iframe.html (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe-expected.checksum (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe-expected.png (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe-expected.txt (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe-hide-expected.txt (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe-hide.html (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe-show-expected.txt (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe-show.html (added)
• LayoutTests/compositing/iframes/invisible-nested-iframe.html (added)
• LayoutTests/platform/chromium-gpu/compositing/iframes/invisible-nested-iframe-show-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-19  Antoine Labour  <piman@chromium.org>
+
+        Reviewed by James Robinson.
+
+        For invisible iframes, propagate compositing to parent instead of setting self
+        as root.
+        https://bugs.webkit.org/show_bug.cgi?id=58414
+
+        * compositing/iframes/invisible-iframe-expected.checksum: Added.
+        * compositing/iframes/invisible-iframe-expected.png: Added.
+        * compositing/iframes/invisible-iframe-expected.txt: Added.
+        * compositing/iframes/invisible-iframe.html: Added.
+        * compositing/iframes/invisible-nested-iframe-expected.checksum: Added.
+        * compositing/iframes/invisible-nested-iframe-expected.png: Added.
+        * compositing/iframes/invisible-nested-iframe-expected.txt: Added.
+        * compositing/iframes/invisible-nested-iframe-hide-expected.txt: Added.
+        * compositing/iframes/invisible-nested-iframe-hide.html: Added.
+        * compositing/iframes/invisible-nested-iframe-show-expected.txt: Added.
+        * compositing/iframes/invisible-nested-iframe-show.html: Added.
+        * compositing/iframes/invisible-nested-iframe.html: Added.
+        * platform/chromium-gpu/compositing/iframes/invisible-nested-iframe-show-expected.txt: Added.
+
 2011-04-19  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Antoine Labour  <piman@chromium.org>
+
+        Reviewed by James Robinson.
+
+        For invisible iframes, propagate compositing to parent instead of setting self
+        as root.
+        https://bugs.webkit.org/show_bug.cgi?id=58414
+
+        Tests: compositing/iframes/invisible-iframe.html
+               compositing/iframes/invisible-nested-iframe-hide.html
+               compositing/iframes/invisible-nested-iframe-show.html
+               compositing/iframes/invisible-nested-iframe.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame):
+        Propagate compositing to parent even if frame owner has no renderer.
+
 2011-04-19  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1180 +1180 @@
     HTMLFrameOwnerElement* ownerElement = enclosingFrameElement();
     RenderObject* renderer = ownerElement ? ownerElement->renderer() : 0;
-    if (!renderer || !renderer->isRenderPart())
+
+    // If we are the top-level frame, don't propagate.
+    if (!ownerElement)
         return false;
 
     if (!allowsIndependentlyCompositedFrames(m_renderView->frameView()))
         return true;
+
+    if (!renderer || !renderer->isRenderPart())
+        return false;
 
     // On Mac, only propagate compositing if the frame is overlapped in the parent