Changeset 249267 in webkit

Timestamp:

Aug 29, 2019, 6:11:11 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r249236 - Make FillLayer::hasImage() inline
​https://bugs.webkit.org/show_bug.cgi?id=201265

Reviewed by Zalan Bujtas.

FillLayer::hasImage() shows up on profiles because it's called from hot functions like
isTransparent() and hasMask(), so make a basic inline version that doens't have
to walk the list.

• rendering/style/FillLayer.cpp:

(WebCore::FillLayer::hasImageInAnyLayer const):
(WebCore::FillLayer::hasImage const): Deleted.

• rendering/style/FillLayer.h:

(WebCore::FillLayer::hasImage const):

Location:

releases/WebKitGTK/webkit-2.26/Source/WebCore

Files:

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

releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Make FillLayer::hasImage() inline
+        https://bugs.webkit.org/show_bug.cgi?id=201265
+
+        Reviewed by Zalan Bujtas.
+
+        FillLayer::hasImage() shows up on profiles because it's called from hot functions like
+        isTransparent() and hasMask(), so make a basic inline version that doens't have
+        to walk the list.
+
+        * rendering/style/FillLayer.cpp:
+        (WebCore::FillLayer::hasImageInAnyLayer const):
+        (WebCore::FillLayer::hasImage const): Deleted.
+        * rendering/style/FillLayer.h:
+        (WebCore::FillLayer::hasImage const):
+
 2019-08-28  Simon Fraser  <simon.fraser@apple.com>
 

releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/style/FillLayer.cpp

@@ -366 +366 @@
 }
 
-bool FillLayer::hasImage() const
+bool FillLayer::hasImageInAnyLayer() const
 {
     for (auto* layer = this; layer; layer = layer->m_next.get()) {

releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/style/FillLayer.h

@@ -146 +146 @@
     bool containsImage(StyleImage&) const;
     bool imagesAreLoaded() const;
-    bool hasImage() const;
+    bool hasImage() const { return m_next ? hasImageInAnyLayer() : m_image; }
     bool hasFixedImage() const;
     bool hasOpaqueImage(const RenderElement&) const;
@@ -176 +176 @@
 
     void computeClipMax() const;
+
+    bool hasImageInAnyLayer() const;
 
     std::unique_ptr<FillLayer> m_next;