Title: [164596] trunk/Source/WebKit/gtk
- Revision
- 164596
- Author
- [email protected]
- Date
- 2014-02-24 11:23:08 -0800 (Mon, 24 Feb 2014)
Log Message
REGRESSION(r164438): [GTK] Tests /WebKitGtk/testcontextmenu, /WebKitGtk/testmimehandling, /WebKitGtk/testloading assert in Debug build
https://bugs.webkit.org/show_bug.cgi?id=129256
Patch by Enrique Ocaña González <[email protected]> on 2014-02-24
Reviewed by Carlos Garcia Campos.
* WebCoreSupport/FrameLoaderClientGtk.cpp: Manage error values not present in WebCore
(WebKit::toWebKitNetworkError):
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (164595 => 164596)
--- trunk/Source/WebKit/gtk/ChangeLog 2014-02-24 19:13:16 UTC (rev 164595)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-02-24 19:23:08 UTC (rev 164596)
@@ -1,3 +1,13 @@
+2014-02-24 Enrique Ocaña González <[email protected]>
+
+ REGRESSION(r164438): [GTK] Tests /WebKitGtk/testcontextmenu, /WebKitGtk/testmimehandling, /WebKitGtk/testloading assert in Debug build
+ https://bugs.webkit.org/show_bug.cgi?id=129256
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp: Manage error values not present in WebCore
+ (WebKit::toWebKitNetworkError):
+
2014-02-24 Renata Hodovan <[email protected]>
Get rid of the unused 'immediate' parameters from repaint related functions
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (164595 => 164596)
--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-02-24 19:13:16 UTC (rev 164595)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-02-24 19:23:08 UTC (rev 164596)
@@ -140,8 +140,8 @@
case PluginErrorWillHandleLoad:
return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
default:
- ASSERT_NOT_REACHED();
- return WEBKIT_NETWORK_ERROR_FAILED;
+ // This may be other type of error, which needs to be passed as-is.
+ return errorCode;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
