Changeset 241906 in webkit

Timestamp:

Feb 21, 2019 2:51:13 PM (5 years ago)

Author:

aestes@apple.com

Message:

contentfiltering tests leak documents
​https://bugs.webkit.org/show_bug.cgi?id=189434
<rdar://44239943>

Reviewed by Simon Fraser.

Changed ContentFilter to capture the blocked Frame as a WeakPtr to break a reference cycle.

This fixes world leaks in several tests in LayoutTests/contentfiltering/.

• bindings/js/ScriptController.h:
• loader/ContentFilter.cpp:

(WebCore::ContentFilter::didDecide):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptController.h (modified) (2 diffs)
• loader/ContentFilter.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-21  Andy Estes  <aestes@apple.com>
+
+        contentfiltering tests leak documents
+        https://bugs.webkit.org/show_bug.cgi?id=189434
+        <rdar://44239943>
+
+        Reviewed by Simon Fraser.
+
+        Changed ContentFilter to capture the blocked Frame as a WeakPtr to break a reference cycle.
+
+        This fixes world leaks in several tests in LayoutTests/contentfiltering/.
+
+        * bindings/js/ScriptController.h:
+        * loader/ContentFilter.cpp:
+        (WebCore::ContentFilter::didDecide):
+
 2019-02-21  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/bindings/js/ScriptController.h

@@ -29 +29 @@
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/TextPosition.h>
 
@@ -70 +71 @@
 };
 
-class ScriptController {
+class ScriptController : public CanMakeWeakPtr<ScriptController> {
     WTF_MAKE_FAST_ALLOCATED;
 

trunk/Source/WebCore/loader/ContentFilter.cpp

@@ -229 +229 @@
     ContentFilterUnblockHandler unblockHandler { m_blockingContentFilter->unblockHandler() };
     unblockHandler.setUnreachableURL(m_documentLoader.documentURL());
-    RefPtr<Frame> frame { m_documentLoader.frame() };
+    auto frame { m_documentLoader.frame() };
     String unblockRequestDeniedScript { m_blockingContentFilter->unblockRequestDeniedScript() };
     if (!unblockRequestDeniedScript.isEmpty() && frame) {
-        static_assert(std::is_base_of<ThreadSafeRefCounted<AbstractFrame>, Frame>::value, "AbstractFrame must be ThreadSafeRefCounted.");
-        unblockHandler.wrapWithDecisionHandler([frame = WTFMove(frame), script = unblockRequestDeniedScript.isolatedCopy()](bool unblocked) {
-            if (!unblocked)
-                frame->script().executeScript(script);
+        unblockHandler.wrapWithDecisionHandler([scriptController = makeWeakPtr(frame->script()), script = unblockRequestDeniedScript.isolatedCopy()](bool unblocked) {
+            if (!unblocked && scriptController)
+                scriptController->executeScript(script);
         });
     }