Changeset 220380 in webkit

Timestamp:

Aug 7, 2017, 7:52:05 PM (8 years ago)

Author:

Simon Fraser

Message:

Avoid a hash lookup in FilterInfo::remove()
​https://bugs.webkit.org/show_bug.cgi?id=175301

Reviewed by Sam Weinig.

FilterInfo::remove() always called map().remove(&layer)), even when layer.m_hasFilterInfo
was false (and even asserted that layer.m_hasFilterInfo == map().contains(&layer)).

So we can early return if layer.m_hasFilterInfo is false.

• rendering/RenderLayerFilterInfo.cpp:

(WebCore::RenderLayer::FilterInfo::getIfExists):
(WebCore::RenderLayer::FilterInfo::remove):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Avoid a hash lookup in FilterInfo::remove()
+        https://bugs.webkit.org/show_bug.cgi?id=175301
+
+        Reviewed by Sam Weinig.
+
+        FilterInfo::remove() always called map().remove(&layer)), even when layer.m_hasFilterInfo
+        was false (and even asserted that layer.m_hasFilterInfo == map().contains(&layer)).
+
+        So we can early return if layer.m_hasFilterInfo is false.
+
+        * rendering/RenderLayerFilterInfo.cpp:
+        (WebCore::RenderLayer::FilterInfo::getIfExists):
+        (WebCore::RenderLayer::FilterInfo::remove):
+
 2017-08-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp

@@ -50 +50 @@
     ASSERT(layer.m_hasFilterInfo == map().contains(&layer));
 
-    return layer.m_hasFilterInfo ? map().get(&layer) : 0;
+    return layer.m_hasFilterInfo ? map().get(&layer) : nullptr;
 }
 
@@ -68 +68 @@
 {
     ASSERT(layer.m_hasFilterInfo == map().contains(&layer));
+    if (!layer.m_hasFilterInfo)
+        return;
 
-    if (map().remove(&layer))
-        layer.m_hasFilterInfo = false;
+    map().remove(&layer);
+    layer.m_hasFilterInfo = false;
 }