Title: [164597] trunk/Source/WebKit2
- Revision
- 164597
- Author
- [email protected]
- Date
- 2014-02-24 11:43:19 -0800 (Mon, 24 Feb 2014)
Log Message
REGRESSION(r164438): [GTK] Tests /webkit2/WebKitWebView/tls-errors-policy and /webkit2/WebKitWebContext/uri-scheme fail
https://bugs.webkit.org/show_bug.cgi?id=129252
Patch by Enrique Ocaña González <[email protected]> on 2014-02-24
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitPrivate.cpp: Manage error values generated by the user application and not present in WebCore
(toWebKitError):
(toWebCoreError):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164596 => 164597)
--- trunk/Source/WebKit2/ChangeLog 2014-02-24 19:23:08 UTC (rev 164596)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-24 19:43:19 UTC (rev 164597)
@@ -1,3 +1,14 @@
+2014-02-24 Enrique Ocaña González <[email protected]>
+
+ REGRESSION(r164438): [GTK] Tests /webkit2/WebKitWebView/tls-errors-policy and /webkit2/WebKitWebContext/uri-scheme fail
+ https://bugs.webkit.org/show_bug.cgi?id=129252
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitPrivate.cpp: Manage error values generated by the user application and not present in WebCore
+ (toWebKitError):
+ (toWebCoreError):
+
2014-02-24 Alexey Proskuryakov <[email protected]>
<rdar://problem/16059894> Update AppleConnect sandbox profile for XPC process names.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (164596 => 164597)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2014-02-24 19:23:08 UTC (rev 164596)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2014-02-24 19:43:19 UTC (rev 164597)
@@ -102,8 +102,8 @@
case WebCore::PrintErrorInvalidPageRange:
return WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE;
default:
- ASSERT_NOT_REACHED();
- return WEBKIT_NETWORK_ERROR_FAILED;
+ // This may be a user app defined error, which needs to be passed as-is.
+ return webCoreError;
}
}
@@ -155,7 +155,7 @@
case WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE:
return WebCore::PrintErrorInvalidPageRange;
default:
- ASSERT_NOT_REACHED();
- return WebCore::NetworkErrorFailed;
+ // This may be a user app defined error, which needs to be passed as-is.
+ return webKitError;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
