Changeset 107276 in webkit

Timestamp:

Feb 9, 2012, 12:43:02 PM (15 years ago)

Author:

enne@google.com

Message:

Merge 107024 - Properly detect top level frames when propogating compositing
​https://bugs.webkit.org/show_bug.cgi?id=78033

Reviewed by James Robinson.

There's no need to enumerate all tag names when searching for a
top-level frame. If a render view's document has a frame, then that
frame is not the top-level one.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame):

• rendering/RenderLayerCompositor.h:

(RenderLayerCompositor):

TBR=​enne@google.com
Review URL: ​https://chromiumcodereview.appspot.com/9369039

Location:

branches/chromium/1025/Source/WebCore/rendering

Files:

• RenderLayerCompositor.cpp (modified) (2 diffs)
• RenderLayerCompositor.h (modified) (1 diff)

branches/chromium/1025/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1266 +1266 @@
     // is to have the parent document become composited too. However, this can cause problems on platforms that
     // use native views for frames (like Mac), so disable that behavior on those platforms for now.
-    HTMLFrameOwnerElement* ownerElement = enclosingFrameElement();
+    HTMLFrameOwnerElement* ownerElement = m_renderView->document()->ownerElement();
     RenderObject* renderer = ownerElement ? ownerElement->renderer() : 0;
 
@@ -1295 +1295 @@
 
     return false;
-}
-
-HTMLFrameOwnerElement* RenderLayerCompositor::enclosingFrameElement() const
-{
-    if (HTMLFrameOwnerElement* ownerElement = m_renderView->document()->ownerElement())
-        return (ownerElement->hasTagName(iframeTag) || ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(objectTag)) ? ownerElement : 0;
-
-    return 0;
 }
 

branches/chromium/1025/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -179 +179 @@
     bool shouldPropagateCompositingToEnclosingFrame() const;
 
-    HTMLFrameOwnerElement* enclosingFrameElement() const;
-
     static RenderLayerCompositor* frameContentsCompositor(RenderPart*);
     // Return true if the layers changed.