Title: [96508] trunk
- Revision
- 96508
- Author
- [email protected]
- Date
- 2011-10-03 09:17:49 -0700 (Mon, 03 Oct 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96507 => 96508)
--- trunk/Source/WebKit2/ChangeLog 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-03 16:17:49 UTC (rev 96508)
@@ -1,5 +1,17 @@
2011-10-03 Carlos Garcia Campos <[email protected]>
+ [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 <[email protected]>
+
[UNIX] Rename NetscapePluginModule::pluginInfo to NetscapePluginModule::getPluginInfoForLoadedPlugin()
https://bugs.webkit.org/show_bug.cgi?id=69147
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (96507 => 96508)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-03 16:17:49 UTC (rev 96508)
@@ -216,8 +216,10 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(uri);
+ WKURLRef url = ""
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
- WKPageLoadURL(toAPI(page), WKURLCreateWithUTF8CString(uri));
+ WKPageLoadURL(toAPI(page), url);
+ WKRelease(url);
}
/**
Modified: trunk/Tools/ChangeLog (96507 => 96508)
--- trunk/Tools/ChangeLog 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Tools/ChangeLog 2011-10-03 16:17:49 UTC (rev 96508)
@@ -1,3 +1,17 @@
+2011-10-03 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
Unreviewed. Add Zoltán Árvai as contributor.
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (96507 => 96508)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-10-03 16:17:49 UTC (rev 96508)
@@ -64,8 +64,9 @@
static void activateUriEntryCallback(BrowserWindow* window)
{
- const gchar *uri = gtk_entry_get_text(GTK_ENTRY(window->uriEntry));
- WKPageLoadURL(WKViewGetPage(window->webView), WKURLCreateWithUTF8CString(uri));
+ WKURLRef url = ""
+ WKPageLoadURL(WKViewGetPage(window->webView), url);
+ WKRelease(url);
}
static void goBackCallback(BrowserWindow* window)
Modified: trunk/Tools/MiniBrowser/gtk/main.c (96507 => 96508)
--- trunk/Tools/MiniBrowser/gtk/main.c 2011-10-03 16:16:21 UTC (rev 96507)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2011-10-03 16:17:49 UTC (rev 96508)
@@ -61,8 +61,10 @@
WKViewRef webView = WKViewCreate(processContext, 0);
GtkWidget *mainWindow = browser_window_new(webView);
gchar *url = ""
- 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));
gtk_widget_show(mainWindow);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
