Changeset 259751 in webkit

Timestamp:

Apr 8, 2020, 1:06:53 PM (6 years ago)

Author:

Doug Kelly

Message:

Additional cleanup from "Hit test with clipPath referencing parent element causes infinite recursion"
​https://bugs.webkit.org/show_bug.cgi?id=210203
<rdar://problem/60002347>

Reviewed by Geoffrey Garen.

As suggested from the review in bug #209773, this incorporates some additional cleanup, including making the
SVGHitTestCycleDetectionScope constructor explicit, and clarifying the add/remove with the WeakHashSet, since
WeakPtr's operator* returns a reference to the template type (which is what we need).

No new tests as this is covered by existing tests and there are no functional changes.

• rendering/svg/SVGRenderSupport.cpp:

(WebCore::SVGHitTestCycleDetectionScope::SVGHitTestCycleDetectionScope):
(WebCore::SVGHitTestCycleDetectionScope::~SVGHitTestCycleDetectionScope):

• rendering/svg/SVGRenderSupport.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-08  Doug Kelly  <dougk@apple.com>
+
+        Additional cleanup from "Hit test with clipPath referencing parent element causes infinite recursion"
+        https://bugs.webkit.org/show_bug.cgi?id=210203
+        <rdar://problem/60002347>
+
+        Reviewed by Geoffrey Garen.
+
+        As suggested from the review in bug #209773, this incorporates some additional cleanup, including making the
+        SVGHitTestCycleDetectionScope constructor explicit, and clarifying the add/remove with the WeakHashSet, since
+        WeakPtr's operator* returns a reference to the template type (which is what we need).
+
+        No new tests as this is covered by existing tests and there are no functional changes.
+
+        * rendering/svg/SVGRenderSupport.cpp:
+        (WebCore::SVGHitTestCycleDetectionScope::SVGHitTestCycleDetectionScope):
+        (WebCore::SVGHitTestCycleDetectionScope::~SVGHitTestCycleDetectionScope):
+        * rendering/svg/SVGRenderSupport.h:
+
 2020-04-08  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp

@@ -513 +513 @@
 {
     m_element = makeWeakPtr(&element);
-    auto result = visitedElements().add(m_element.get());
+    auto result = visitedElements().add(*m_element);
     ASSERT_UNUSED(result, result.isNewEntry);
 }
@@ -519 +519 @@
 SVGHitTestCycleDetectionScope::~SVGHitTestCycleDetectionScope()
 {
-    bool result = visitedElements().remove(*m_element.get());
+    bool result = visitedElements().remove(*m_element);
     ASSERT_UNUSED(result, result);
 }

trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h

@@ -99 +99 @@
     WTF_MAKE_NONCOPYABLE(SVGHitTestCycleDetectionScope);
 public:
-    SVGHitTestCycleDetectionScope(const RenderElement&);
+    explicit SVGHitTestCycleDetectionScope(const RenderElement&);
     ~SVGHitTestCycleDetectionScope();
     static bool isEmpty();