Changeset 61857 in webkit

Timestamp:

Jun 25, 2010 6:13:04 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-25 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Do not load error message for download and cancellation.
When a download is made or a request is cancelled an error page should
not be shown.
​https://bugs.webkit.org/show_bug.cgi?id=40956

• efl/WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::dispatchDidFailLoading): return if it should not fallback. (WebCore::FrameLoaderClientEfl::dispatchDidFailLoad): return if it should not fallback. (WebCore::FrameLoaderClientEfl::interruptForPolicyChangeError): fix typo in related error message. (WebCore::FrameLoaderClientEfl::shouldFallBack): if user cancelled the request or the policy changed (for example, because the request is a download) then it should not fallback.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (4 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-06-25  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Do not load error message for download and cancellation.
+        When a download is made or a request is cancelled an error page should
+        not be shown.
+        https://bugs.webkit.org/show_bug.cgi?id=40956
+
+        * efl/WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchDidFailLoading): return if it
+        should not fallback.
+        (WebCore::FrameLoaderClientEfl::dispatchDidFailLoad): return if it
+        should not fallback.
+        (WebCore::FrameLoaderClientEfl::interruptForPolicyChangeError): fix
+        typo in related error message.
+        (WebCore::FrameLoaderClientEfl::shouldFallBack): if user cancelled the
+        request or the policy changed (for example, because the request is a
+        download) then it should not fallback.
+
 2010-06-25  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 

trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -708 +708 @@
 }
 
-void FrameLoaderClientEfl::dispatchDidFailLoading(DocumentLoader* loader, unsigned long identifier, const ResourceError&)
-{
+void FrameLoaderClientEfl::dispatchDidFailLoading(DocumentLoader* loader, unsigned long identifier, const ResourceError& err)
+{
+    if (!shouldFallBack(err))
+        return;
+
     if (m_firstData) {
         FrameLoader* fl = loader->frameLoader();
@@ -736 +739 @@
 void FrameLoaderClientEfl::dispatchDidFailLoad(const ResourceError& err)
 {
+    if (!shouldFallBack(err))
+        return;
+
     m_loadError = err;
     ewk_frame_load_error(m_frame,
@@ -783 +789 @@
 {
     return ResourceError("Error", WebKitErrorFrameLoadInterruptedByPolicyChange,
-                         request.url().string(), "Frame load interruped by policy change");
+                         request.url().string(), "Frame load interrupted by policy change");
 }
 
@@ -804 +810 @@
 }
 
-bool FrameLoaderClientEfl::shouldFallBack(const ResourceError&)
-{
-    notImplemented();
-    return false;
+bool FrameLoaderClientEfl::shouldFallBack(const ResourceError& error)
+{
+    return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange));
 }