Changeset 190819 in webkit

Timestamp:

Oct 9, 2015 2:34:56 PM (9 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] Fix some leaks in TestRunnerWKWebView and UIScriptContext
​https://bugs.webkit.org/show_bug.cgi?id=149960

Reviewed by Tim Horton.

Use adoptWK(), and null out some members (file is not using ARC).

• WebKitTestRunner/UIScriptContext/UIScriptContext.cpp:

(UIScriptContext::uiScriptComplete):

• WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:

(-[TestRunnerWKWebView dealloc]):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/UIScriptContext/UIScriptContext.cpp (modified) (1 diff)
• WebKitTestRunner/cocoa/TestRunnerWKWebView.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-10-09  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Fix some leaks in TestRunnerWKWebView and UIScriptContext
+        https://bugs.webkit.org/show_bug.cgi?id=149960
+
+        Reviewed by Tim Horton.
+        
+        Use adoptWK(), and null out some members (file is not using ARC).
+
+        * WebKitTestRunner/UIScriptContext/UIScriptContext.cpp:
+        (UIScriptContext::uiScriptComplete):
+        * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
+        (-[TestRunnerWKWebView dealloc]):
+
 2015-10-09  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptContext.cpp

@@ -139 +139 @@
 void UIScriptContext::uiScriptComplete(JSStringRef result)
 {
-    WKRetainPtr<WKStringRef> uiScriptResult = WKStringCreateWithJSString(result);
+    WKRetainPtr<WKStringRef> uiScriptResult = adoptWK(WKStringCreateWithJSString(result));
     m_delegate.uiScriptDidComplete(uiScriptResult.get(), m_currentScriptCallbackID);
     m_currentScriptCallbackID = 0;

trunk/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm

@@ -71 +71 @@
 - (void)dealloc
 {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+    self.willBeginZoomingCallback = nil;
+    self.didEndZoomingCallback = nil;
+    self.didShowKeyboardCallback = nil;
+    self.didHideKeyboardCallback = nil;
+
+    self.zoomToScaleCompletionHandler = nil;
+    self.showKeyboardCompletionHandler = nil;
+
     [super dealloc];
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }