Changeset 96508 in webkit

Timestamp:

Oct 3, 2011 9:17:49 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Fix memory leak when loading url
​https://bugs.webkit.org/show_bug.cgi?id=69247

Reviewed by Martin Robinson.

Release URL created with WKURLCreateWithUTF8CString().

Source/WebKit2:

• UIProcess/API/gtk/WebKitWebView.cpp:

(webkit_web_view_load_uri):

Tools:

• MiniBrowser/gtk/BrowserWindow.c:

(activateUriEntryCallback):

• MiniBrowser/gtk/main.c:

(loadURI):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/gtk/BrowserWindow.c (modified) (1 diff)
• Tools/MiniBrowser/gtk/main.c (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Fix memory leak when loading url
+        https://bugs.webkit.org/show_bug.cgi?id=69247
+
+        Reviewed by Martin Robinson.
+
+        Release URL created with WKURLCreateWithUTF8CString().
+
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkit_web_view_load_uri):
+
 2011-10-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

@@ -217 +217 @@
     g_return_if_fail(uri);
 
+    WKURLRef url = WKURLCreateWithUTF8CString(uri);
     WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-    WKPageLoadURL(toAPI(page), WKURLCreateWithUTF8CString(uri));
+    WKPageLoadURL(toAPI(page), url);
+    WKRelease(url);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Fix memory leak when loading url
+        https://bugs.webkit.org/show_bug.cgi?id=69247
+
+        Reviewed by Martin Robinson.
+
+        Release URL created with WKURLCreateWithUTF8CString().
+
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (activateUriEntryCallback):
+        * MiniBrowser/gtk/main.c:
+        (loadURI):
+
 2011-10-03  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -65 +65 @@
 static void activateUriEntryCallback(BrowserWindow* window)
 {
-    const gchar *uri = gtk_entry_get_text(GTK_ENTRY(window->uriEntry));
-    WKPageLoadURL(WKViewGetPage(window->webView), WKURLCreateWithUTF8CString(uri));
+    WKURLRef url = WKURLCreateWithUTF8CString(gtk_entry_get_text(GTK_ENTRY(window->uriEntry)));
+    WKPageLoadURL(WKViewGetPage(window->webView), url);
+    WKRelease(url);
 }
 

trunk/Tools/MiniBrowser/gtk/main.c

@@ -62 +62 @@
     GtkWidget *mainWindow = browser_window_new(webView);
     gchar *url = argumentToURL(uri);
-    WKPageLoadURL(WKViewGetPage(webView), WKURLCreateWithUTF8CString(url));
+    WKURLRef wkURL = WKURLCreateWithUTF8CString(url);
     g_free(url);
+    WKPageLoadURL(WKViewGetPage(webView), wkURL);
+    WKRelease(wkURL);
 
     gtk_widget_grab_focus(GTK_WIDGET(webView));