Title: [133555] trunk/Source/WebKit/blackberry
- Revision
- 133555
- Author
- [email protected]
- Date
- 2012-11-05 20:08:21 -0800 (Mon, 05 Nov 2012)
Log Message
[BlackBerry] Do not show error page for main loads denied by client application
https://bugs.webkit.org/show_bug.cgi?id=101287
Internal PR: 237574.
Internally reviewed by Arvid Nilsson, Joe Mason.
Patch by Lianghui Chen <[email protected]> on 2012-11-05
Reviewed by George Staikos.
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::dispatchDidFailProvisionalLoad):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (133554 => 133555)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-11-06 03:46:16 UTC (rev 133554)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-11-06 04:08:21 UTC (rev 133555)
@@ -1,5 +1,17 @@
2012-11-05 Lianghui Chen <[email protected]>
+ [BlackBerry] Do not show error page for main loads denied by client application
+ https://bugs.webkit.org/show_bug.cgi?id=101287
+
+ Internal PR: 237574.
+ Internally reviewed by Arvid Nilsson, Joe Mason.
+ Reviewed by George Staikos.
+
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::dispatchDidFailProvisionalLoad):
+
+2012-11-05 Lianghui Chen <[email protected]>
+
[BlackBerry] Do not display error page for failed downloads
https://bugs.webkit.org/show_bug.cgi?id=101246
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (133554 => 133555)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-11-06 03:46:16 UTC (rev 133554)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-11-06 04:08:21 UTC (rev 133555)
@@ -709,6 +709,12 @@
if (!isMainFrame())
return;
+ if (error.domain() == ResourceError::platformErrorDomain
+ && (error.errorCode() == BlackBerry::Platform::FilterStream::StatusDeniedByApplication)) {
+ // Do not display error page for loading DENYed by application.
+ return;
+ }
+
// Make sure we're still in the provisionalLoad state - getErrorPage runs a
// nested event loop while it's waiting for client resources to load so
// there's a small window for the user to hit stop.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
