Changeset 280594 in webkit

Timestamp:

Aug 3, 2021, 9:42:24 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Use WeakPtr instead of manual raw pointer management in URLSearchParams
​https://bugs.webkit.org/show_bug.cgi?id=228723

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-08-03
Reviewed by Chris Dumez.

This is less error prone.

• html/DOMURL.cpp:

(WebCore::DOMURL::~DOMURL): Deleted.

• html/DOMURL.h:
• html/URLSearchParams.cpp:

(WebCore::URLSearchParams::URLSearchParams):

• html/URLSearchParams.h:

(WebCore::URLSearchParams::associatedURLDestroyed): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/DOMURL.cpp (modified) (1 diff)
• html/DOMURL.h (modified) (2 diffs)
• html/URLSearchParams.cpp (modified) (1 diff)
• html/URLSearchParams.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-03  Alex Christensen  <achristensen@webkit.org>
+
+        Use WeakPtr instead of manual raw pointer management in URLSearchParams
+        https://bugs.webkit.org/show_bug.cgi?id=228723
+
+        Reviewed by Chris Dumez.
+
+        This is less error prone.
+
+        * html/DOMURL.cpp:
+        (WebCore::DOMURL::~DOMURL): Deleted.
+        * html/DOMURL.h:
+        * html/URLSearchParams.cpp:
+        (WebCore::URLSearchParams::URLSearchParams):
+        * html/URLSearchParams.h:
+        (WebCore::URLSearchParams::associatedURLDestroyed): Deleted.
+
 2021-08-03  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/html/DOMURL.cpp

@@ -68 +68 @@
 }
 
-DOMURL::~DOMURL()
-{
-    if (m_searchParams)
-        m_searchParams->associatedURLDestroyed();
-}
+DOMURL::~DOMURL() = default;
 
 ExceptionOr<void> DOMURL::setHref(const String& url)

trunk/Source/WebCore/html/DOMURL.h

@@ -30 +30 @@
 #include "URLDecomposition.h"
 #include <wtf/URL.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -38 +39 @@
 class URLSearchParams;
 
-class DOMURL final : public RefCounted<DOMURL>, public URLDecomposition {
+class DOMURL final : public RefCounted<DOMURL>, public CanMakeWeakPtr<DOMURL>, public URLDecomposition {
 public:
     static ExceptionOr<Ref<DOMURL>> create(const String& url, const String& base);

trunk/Source/WebCore/html/URLSearchParams.cpp

@@ -32 +32 @@
 
 URLSearchParams::URLSearchParams(const String& init, DOMURL* associatedURL)
-    : m_associatedURL(associatedURL)
+    : m_associatedURL(makeWeakPtr(associatedURL))
     , m_pairs(init.startsWith('?') ? WTF::URLParser::parseURLEncodedForm(StringView(init).substring(1)) : WTF::URLParser::parseURLEncodedForm(init))
 {

trunk/Source/WebCore/html/URLSearchParams.h

@@ -28 +28 @@
 #include <wtf/Variant.h>
 #include <wtf/Vector.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
@@ -42 +43 @@
     }
 
-    void associatedURLDestroyed() { m_associatedURL = nullptr; }
     void append(const String& name, const String& value);
     void remove(const String& name);
@@ -70 +70 @@
     void updateURL();
 
-    DOMURL* m_associatedURL { nullptr };
+    WeakPtr<DOMURL> m_associatedURL;
     Vector<WTF::KeyValuePair<String, String>> m_pairs;
 };