Changeset 159322 in webkit

Timestamp:

Nov 14, 2013, 4:28:38 PM (12 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] WKBrowsingContextController's policy client implementation over-releases WKURLRequests and WKURLResponses
​https://bugs.webkit.org/show_bug.cgi?id=124386

Reviewed by Sam Weinig.

• UIProcess/API/mac/WKBrowsingContextController.mm:

(setUpPagePolicyClient): Changed to release the Cocoa objects we copy out of the WK objects
passed into the client callbacks, but not the WK objects themselves, which are not owned by
the callbacks.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKBrowsingContextController.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-14  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] WKBrowsingContextController's policy client implementation over-releases WKURLRequests and WKURLResponses
+        https://bugs.webkit.org/show_bug.cgi?id=124386
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/mac/WKBrowsingContextController.mm:
+        (setUpPagePolicyClient): Changed to release the Cocoa objects we copy out of the WK objects
+        passed into the client callbacks, but not the WK objects themselves, which are not owned by
+        the callbacks.
+
 2013-11-14  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm

@@ -632 +632 @@
                 WKActionModifierFlagsKey: @(modifiers),
                 WKActionMouseButtonKey: @(mouseButton),
-                WKActionURLRequestKey: autoreleased(request)
+                WKActionURLRequestKey: adoptNS(WKURLRequestCopyNSURLRequest(request)).get()
             };
             
@@ -649 +649 @@
                 WKActionModifierFlagsKey: @(modifiers),
                 WKActionMouseButtonKey: @(mouseButton),
-                WKActionURLRequestKey: autoreleased(request),
+                WKActionURLRequestKey: adoptNS(WKURLRequestCopyNSURLRequest(request)).get(),
                 WKActionFrameNameKey: toImpl(frameName)->wrapper()
             };
@@ -664 +664 @@
             NSDictionary *actionDictionary = @{
                 WKActionIsMainFrameKey: @(WKFrameIsMainFrame(frame)),
-                WKActionURLRequestKey: autoreleased(request),
-                WKActionURLResponseKey: autoreleased(response)
+                WKActionURLRequestKey: adoptNS(WKURLRequestCopyNSURLRequest(request)).get(),
+                WKActionURLResponseKey: adoptNS(WKURLResponseCopyNSURLResponse(response)).get()
             };