Title: [131569] trunk/Source/WebKit2
- Revision
- 131569
- Author
- [email protected]
- Date
- 2012-10-17 02:27:41 -0700 (Wed, 17 Oct 2012)
Log Message
[WK2][GTK] Unneeded GError field in internal structure in WebKitFaviconDatabase.cpp
https://bugs.webkit.org/show_bug.cgi?id=99564
Reviewed by Carlos Garcia Campos.
Removed field 'error' from GetFaviconSurfaceAsyncData and updated
the code accordingly, by using g_simple_async_result_take_error().
* UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
(GetFaviconSurfaceAsyncData): Removed unneeded field.
(processPendingIconsForPageURL): Avoid using g_propagate_error and
use g_simple_async_result_take_error directly instead.
(webkit_favicon_database_get_favicon_finish): Remove unneeded code.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (131568 => 131569)
--- trunk/Source/WebKit2/ChangeLog 2012-10-17 08:52:16 UTC (rev 131568)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-17 09:27:41 UTC (rev 131569)
@@ -1,3 +1,19 @@
+2012-10-17 Mario Sanchez Prada <[email protected]>
+
+ [WK2][GTK] Unneeded GError field in internal structure in WebKitFaviconDatabase.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=99564
+
+ Reviewed by Carlos Garcia Campos.
+
+ Removed field 'error' from GetFaviconSurfaceAsyncData and updated
+ the code accordingly, by using g_simple_async_result_take_error().
+
+ * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
+ (GetFaviconSurfaceAsyncData): Removed unneeded field.
+ (processPendingIconsForPageURL): Avoid using g_propagate_error and
+ use g_simple_async_result_take_error directly instead.
+ (webkit_favicon_database_get_favicon_finish): Remove unneeded code.
+
2012-10-17 Christophe Dumez <[email protected]>
[EFL][WK2] Start using OwnPtr for non-ref counted ewk types
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp (131568 => 131569)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2012-10-17 08:52:16 UTC (rev 131568)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2012-10-17 09:27:41 UTC (rev 131569)
@@ -110,7 +110,6 @@
GRefPtr<WebKitFaviconDatabase> faviconDatabase;
String pageURL;
RefPtr<cairo_surface_t> icon;
- GOwnPtr<GError> error;
GRefPtr<GCancellable> cancellable;
};
WEBKIT_DEFINE_ASYNC_DATA_STRUCT(GetFaviconSurfaceAsyncData)
@@ -160,7 +159,7 @@
GetFaviconSurfaceAsyncData* data = ""
if (!g_cancellable_is_cancelled(data->cancellable.get())) {
if (error)
- g_propagate_error(&data->error.outPtr(), error.release());
+ g_simple_async_result_take_error(result, error.release());
else
data->icon = icon;
}
@@ -345,11 +344,6 @@
GetFaviconSurfaceAsyncData* data = ""
ASSERT(data);
- if (data->error) {
- g_propagate_error(error, data->error.release());
- return 0;
- }
-
return cairo_surface_reference(data->icon.get());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
