Changeset 80392 in webkit

Timestamp:

Mar 4, 2011 4:35:35 PM (13 years ago)

Author:

bweinstein@apple.com

Message:

Reference-counting for WKBundlePageResourceLoadClient::willSendRequestForFrame seems unclear/wrong
​https://bugs.webkit.org/show_bug.cgi?id=53919
<rdar://problem/8966020>

Reviewed by Darin Adler.

Adopt the result of m_client.willSendRequestForFrame (which will be leaked by the client).

• WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp:

(WebKit::InjectedBundlePageResourceLoadClient::willSendRequestForFrame):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundlePage.h (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-04  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Reference-counting for WKBundlePageResourceLoadClient::willSendRequestForFrame seems unclear/wrong
+        https://bugs.webkit.org/show_bug.cgi?id=53919
+        <rdar://problem/8966020>
+        
+        Adopt the result of m_client.willSendRequestForFrame (which will be leaked by the client).
+
+        * WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp:
+        (WebKit::InjectedBundlePageResourceLoadClient::willSendRequestForFrame):
+
 2011-03-04  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

@@ -148 +148 @@
     const void *                                                        clientInfo;
     WKBundlePageDidInitiateLoadForResourceCallback                      didInitiateLoadForResource;
+
+    // willSendRequestForFrame is supposed to return a retained reference to the URL request.
     WKBundlePageWillSendRequestForFrameCallback                         willSendRequestForFrame;
+
     WKBundlePageDidReceiveResponseForResourceCallback                   didReceiveResponseForResource;
     WKBundlePageDidReceiveContentLengthForResourceCallback              didReceiveContentLengthForResource;

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp

@@ -47 +47 @@
         return;
 
-    RefPtr<WebURLRequest> returnedRequest = toImpl(m_client.willSendRequestForFrame(toAPI(page), toAPI(frame), identifier, toAPI(request), toAPI(redirectResponse), m_client.clientInfo));
+    RefPtr<WebURLRequest> returnedRequest = adoptRef(toImpl(m_client.willSendRequestForFrame(toAPI(page), toAPI(frame), identifier, toAPI(request), toAPI(redirectResponse), m_client.clientInfo)));
     if (returnedRequest)
         request = returnedRequest->resourceRequest();