Changeset 202020 in webkit

Timestamp:

Jun 13, 2016 7:27:08 PM (8 years ago)

Author:

ddkilzer@apple.com

Message:

False-positive over-release of WebView in destroyWebViewAndOffscreenWindow() in DumpRenderTree.mm
<​https://webkit.org/b/158716>

Reviewed by Andy Estes.

• DumpRenderTree/mac/DumpRenderTree.mm:

(destroyWebViewAndOffscreenWindow): Change this function to take
a WebView, and assert that it's the same as [mainFrame webView].
(dumpRenderTree): Pass 'webView' into
destroyWebViewAndOffscreenWindow().

• DumpRenderTree/mac/DumpRenderTreeMac.h:

(createWebViewAndOffscreenWindow): Add NS_RETURNS_RETAINED since
this function returns a +1 WebView. Declare this method only for
Objective-C[++] source.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (2 diffs)
• DumpRenderTree/mac/DumpRenderTreeMac.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-06-13  David Kilzer  <ddkilzer@apple.com>
+
+        False-positive over-release of WebView in destroyWebViewAndOffscreenWindow() in DumpRenderTree.mm
+        <https://webkit.org/b/158716>
+
+        Reviewed by Andy Estes.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (destroyWebViewAndOffscreenWindow): Change this function to take
+        a WebView, and assert that it's the same as [mainFrame webView].
+        (dumpRenderTree): Pass 'webView' into
+        destroyWebViewAndOffscreenWindow().
+        * DumpRenderTree/mac/DumpRenderTreeMac.h:
+        (createWebViewAndOffscreenWindow): Add NS_RETURNS_RETAINED since
+        this function returns a +1 WebView.  Declare this method only for
+        Objective-C[++] source.
+
 2016-06-13  Sam Weinig  <sam@webkit.org>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -856 +856 @@
 }
 
-static void destroyWebViewAndOffscreenWindow()
-{
-    WebView *webView = [mainFrame webView];
+static void destroyWebViewAndOffscreenWindow(WebView *webView)
+{
+    ASSERT(webView == [mainFrame webView]);
 #if !PLATFORM(IOS)
     NSWindow *window = [webView window];
@@ -1314 +1314 @@
         stopJavaScriptThreads();
 
-    destroyWebViewAndOffscreenWindow();
+    destroyWebViewAndOffscreenWindow(webView);
     
     releaseGlobalControllers();

trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h

@@ -68 +68 @@
 bool shouldSetWaitToDumpWatchdog();
 
-WebView* createWebViewAndOffscreenWindow();
+#ifdef __OBJC__
+WebView *createWebViewAndOffscreenWindow() NS_RETURNS_RETAINED;
+#endif
+
 void setPersistentUserStyleSheetLocation(CFStringRef);