Changeset 261781 in webkit

Timestamp:

May 16, 2020 2:21:33 AM (4 years ago)

Author:

yurys@chromium.org

Message:

[GTK] Do not leak pages created by window.open
​https://bugs.webkit.org/show_bug.cgi?id=211970

Reviewed by Carlos Garcia Campos.

Previously webkitWebViewCreateNewPage created unbalanced refence to WebPageProxy and returned
it as a raw pointer. That raw pointer was later wrapped in a RefPtr in WebKitUIClient.
This change ensures that all refs are balanced by returnin RefPtr instead of
a raw pointer.

• UIProcess/API/glib/WebKitWebView.cpp:

(webkitWebViewCreateNewPage):

• UIProcess/API/glib/WebKitWebViewPrivate.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitWebView.cpp (modified) (2 diffs)
• UIProcess/API/glib/WebKitWebViewPrivate.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-16  Yury Semikhatsky  <yurys@chromium.org>
+
+        [GTK] Do not leak pages created by window.open
+        https://bugs.webkit.org/show_bug.cgi?id=211970
+
+        Reviewed by Carlos Garcia Campos.
+
+        Previously webkitWebViewCreateNewPage created unbalanced refence to WebPageProxy and returned
+        it as a raw pointer. That raw pointer was later wrapped in a RefPtr in WebKitUIClient.
+        This change ensures that all refs are balanced by returnin RefPtr instead of
+        a raw pointer.
+
+        * UIProcess/API/glib/WebKitWebView.cpp:
+        (webkitWebViewCreateNewPage):
+        * UIProcess/API/glib/WebKitWebViewPrivate.h:
+
 2020-05-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp

@@ -2321 +2321 @@
 #endif
 
-WebPageProxy* webkitWebViewCreateNewPage(WebKitWebView* webView, const WindowFeatures& windowFeatures, WebKitNavigationAction* navigationAction)
+RefPtr<WebPageProxy> webkitWebViewCreateNewPage(WebKitWebView* webView, const WindowFeatures& windowFeatures, WebKitNavigationAction* navigationAction)
 {
     WebKitWebView* newWebView;
@@ -2335 +2335 @@
     webkitWindowPropertiesUpdateFromWebWindowFeatures(newWebView->priv->windowProperties.get(), windowFeatures);
 
-    RefPtr<WebPageProxy> newPage = &getPage(newWebView);
-    return newPage.leakRef();
+    return makeRefPtr(getPage(newWebView));
 }
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h

@@ -53 +53 @@
 void webkitWebViewSetIcon(WebKitWebView*, const WebCore::LinkIcon&, API::Data&);
 #endif
-WebKit::WebPageProxy* webkitWebViewCreateNewPage(WebKitWebView*, const WebCore::WindowFeatures&, WebKitNavigationAction*);
+RefPtr<WebKit::WebPageProxy> webkitWebViewCreateNewPage(WebKitWebView*, const WebCore::WindowFeatures&, WebKitNavigationAction*);
 void webkitWebViewReadyToShowPage(WebKitWebView*);
 void webkitWebViewRunAsModal(WebKitWebView*);