Changeset 112599 in webkit

Timestamp:

Mar 29, 2012 4:17:09 PM (12 years ago)

Author:

Nate Chapin

Message:

Simplify reporting a main resource error to DocumentLoader and
FrameLoader.
​https://bugs.webkit.org/show_bug.cgi?id=82649

Reviewed by Adam Barth.

No new tests, no functionality change intended.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::mainReceivedError): Remove isComplete parameter,

since it was always true. Call FrameLoader::receivedMainResourceError,
instead of the other way around.

• loader/DocumentLoader.h:
• loader/FrameLoader.cpp:

(WebCore::FrameLoader::receivedMainResourceError): Remove isComplete parameter,

since it was always true. Merge in most of mainReceivedCompleteError().

• loader/FrameLoader.h:
• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::receivedError):
(WebCore::MainResourceLoader::didCancel):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (3 diffs)
• loader/DocumentLoader.h (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (4 diffs)
• loader/FrameLoader.h (modified) (2 diffs)
• loader/MainResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-29  Nate Chapin  <japhet@chromium.org>
+
+        Simplify reporting a main resource error to DocumentLoader and
+        FrameLoader.
+        https://bugs.webkit.org/show_bug.cgi?id=82649
+
+        Reviewed by Adam Barth.
+
+        No new tests, no functionality change intended.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::mainReceivedError): Remove isComplete parameter,
+            since it was always true. Call FrameLoader::receivedMainResourceError,
+            instead of the other way around.
+        * loader/DocumentLoader.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::receivedMainResourceError): Remove isComplete parameter,
+            since it was always true. Merge in most of mainReceivedCompleteError().
+        * loader/FrameLoader.h:
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::receivedError):
+        (WebCore::MainResourceLoader::didCancel):
+
 2012-03-28  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -194 +194 @@
 }
 
-void DocumentLoader::mainReceivedError(const ResourceError& error, bool isComplete)
+void DocumentLoader::mainReceivedError(const ResourceError& error)
 {
     ASSERT(!error.isNull());
@@ -203 +203 @@
         return;
     setMainDocumentError(error);
-    if (isComplete)
-        frameLoader()->mainReceivedCompleteError(this, error);
+    setPrimaryLoadComplete(true);
+    frameLoader()->receivedMainResourceError(error);
 }
 
@@ -263 +263 @@
         // If there are no resource loaders, we need to manufacture a cancelled message.
         // (A back/forward navigation has no resource loaders because its resources are cached.)
-        mainReceivedError(frameLoader->cancelledError(m_request), true);
+        mainReceivedError(frameLoader->cancelledError(m_request));
     
     stopLoadingSubresources();

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -117 +117 @@
         const ResourceResponse& response() const { return m_response; }
         const ResourceError& mainDocumentError() const { return m_mainDocumentError; }
-        void mainReceivedError(const ResourceError&, bool isComplete);
+        void mainReceivedError(const ResourceError&);
         void setResponse(const ResourceResponse& response) { m_response = response; }
         void prepareForLoadStart();

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2595 +2595 @@
 }
 
-void FrameLoader::receivedMainResourceError(const ResourceError& error, bool isComplete)
+void FrameLoader::receivedMainResourceError(const ResourceError& error)
 {
     // Retain because the stop may release the last reference to it.
@@ -2601 +2601 @@
 
     RefPtr<DocumentLoader> loader = activeDocumentLoader();
-
-    if (isComplete) {
-        // FIXME: Don't want to do this if an entirely new load is going, so should check
-        // that both data sources on the frame are either this or nil.
-        stop();
-        if (m_client->shouldFallBack(error))
-            handleFallbackContent();
-    }
+    // FIXME: Don't want to do this if an entirely new load is going, so should check
+    // that both data sources on the frame are either this or nil.
+    stop();
+    if (m_client->shouldFallBack(error))
+        handleFallbackContent();
 
     if (m_state == FrameStateProvisional && m_provisionalDocumentLoader) {
@@ -2628 +2625 @@
     }
 
-    loader->mainReceivedError(error, isComplete);
+    checkCompleted();
+    if (m_frame->page())
+        checkLoadComplete();
 }
 
@@ -3082 +3081 @@
 }
 
-void FrameLoader::mainReceivedCompleteError(DocumentLoader* loader, const ResourceError&)
-{
-    loader->setPrimaryLoadComplete(true);
-    checkCompleted();
-    if (m_frame->page())
-        checkLoadComplete();
-}
-
 ResourceError FrameLoader::cancelledError(const ResourceRequest& request) const
 {

trunk/Source/WebCore/loader/FrameLoader.h

@@ -151 +151 @@
     const ResourceRequest& originalRequest() const;
     const ResourceRequest& initialRequest() const;
-    void receivedMainResourceError(const ResourceError&, bool isComplete);
+    void receivedMainResourceError(const ResourceError&);
 
     bool willLoadMediaElementURL(KURL&);
@@ -167 +167 @@
     bool isReplacing() const;
     void setReplacing();
-    void mainReceivedCompleteError(DocumentLoader*, const ResourceError&);
     bool subframeIsLoading() const;
     void willChangeTitle(DocumentLoader*);

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -91 +91 @@
     RefPtr<Frame> protectFrame(m_frame);
 
-    // It is important that we call FrameLoader::receivedMainResourceError before calling 
-    // FrameLoader::didFailToLoad because receivedMainResourceError clears out the relevant
-    // document loaders. Also, receivedMainResourceError ends up calling a FrameLoadDelegate method
+    // It is important that we call DocumentLoader::mainReceivedError before calling 
+    // ResourceLoadNotifier::didFailToLoad because mainReceivedError clears out the relevant
+    // document loaders. Also, mainReceivedError ends up calling a FrameLoadDelegate method
     // and didFailToLoad calls a ResourceLoadDelegate method and they need to be in the correct order.
-    frameLoader()->receivedMainResourceError(error, true);
+    documentLoader()->mainReceivedError(error);
 
     if (!cancelled()) {
@@ -123 +123 @@
     // We should notify the frame loader after fully canceling the load, because it can do complicated work
     // like calling DOMWindow::print(), during which a half-canceled load could try to finish.
-    frameLoader()->receivedMainResourceError(error, true);
+    documentLoader()->mainReceivedError(error);
 }