Changeset 152213 in webkit

Timestamp:

Jun 29, 2013 1:22:19 PM (11 years ago)

Author:

Simon Fraser

Message:

Avoid calling isSimpleContainerCompositingLayer() an extra time
​https://bugs.webkit.org/show_bug.cgi?id=118218

Reviewed by Tim Horton.

containsPaintedContent() called isSimpleContainerCompositingLayer(), which
is not particularly cheap. But the caller already has this information,
so pass it in.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateDrawsContent):
(WebCore::RenderLayerBacking::containsPaintedContent):

• rendering/RenderLayerBacking.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)
• rendering/RenderLayerBacking.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Avoid calling isSimpleContainerCompositingLayer() an extra time
+        https://bugs.webkit.org/show_bug.cgi?id=118218
+
+        Reviewed by Tim Horton.
+
+        containsPaintedContent() called isSimpleContainerCompositingLayer(), which
+        is not particularly cheap. But the caller already has this information,
+        so pass it in.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateDrawsContent):
+        (WebCore::RenderLayerBacking::containsPaintedContent):
+        * rendering/RenderLayerBacking.h:
+
 2013-06-29  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -980 +980 @@
     }
 
-    bool hasPaintedContent = !isSimpleContainer && containsPaintedContent();
+    bool hasPaintedContent = containsPaintedContent(isSimpleContainer);
 
     // FIXME: we could refine this to only allocate backing for one of these layers if possible.
@@ -1653 +1653 @@
 }
 
-bool RenderLayerBacking::containsPaintedContent() const
-{
-    if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
+bool RenderLayerBacking::containsPaintedContent(bool isSimpleContainer) const
+{
+    if (isSimpleContainer || paintsIntoWindow() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
         return false;
 

trunk/Source/WebCore/rendering/RenderLayerBacking.h

@@ -255 +255 @@
     bool isSimpleContainerCompositingLayer() const;
     // Returns true if this layer has content that needs to be rendered by painting into the backing store.
-    bool containsPaintedContent() const;
+    bool containsPaintedContent(bool isSimpleContainer) const;
     // Returns true if the RenderLayer just contains an image that we can composite directly.
     bool isDirectlyCompositedImage() const;