Changeset 112728 in webkit

Timestamp:

Mar 30, 2012, 2:42:01 PM (13 years ago)

Author:

Nate Chapin

Message:

Merge FrameLoader::finishedLoading() into DocumentLoader::finishedLoading().
​https://bugs.webkit.org/show_bug.cgi?id=82653

Reviewed by Adam Barth.

No new tests, no functionality change intended.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::finishedLoading):

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

(WebCore::MainResourceLoader::didFinishLoading):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/FrameLoader.h (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-30  Nate Chapin  <japhet@chromium.org>
+
+        Merge FrameLoader::finishedLoading() into DocumentLoader::finishedLoading().
+        https://bugs.webkit.org/show_bug.cgi?id=82653
+
+        Reviewed by Adam Barth.
+
+        No new tests, no functionality change intended.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::finishedLoading):
+        * loader/FrameLoader.cpp:
+        * loader/FrameLoader.h:
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::didFinishLoading):
+
 2012-03-30  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -289 +289 @@
     m_gotFirstByte = true;   
     commitIfReady();
-    if (FrameLoader* loader = frameLoader()) {
-        loader->finishedLoadingDocument(this);
-        m_writer.end();
-    }
+    if (!frameLoader())
+        return;
+    frameLoader()->finishedLoadingDocument(this);
+    m_writer.end();
+    if (!m_mainDocumentError.isNull() || frameLoader()->stateMachine()->creatingInitialEmptyDocument())
+        return;
+    setPrimaryLoadComplete(true);
+    frameLoader()->checkLoadComplete();
 }
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1974 +1974 @@
 }
 
-void FrameLoader::finishedLoading()
-{
-    // Retain because the stop may release the last reference to it.
-    RefPtr<Frame> protect(m_frame);
-
-    RefPtr<DocumentLoader> dl = activeDocumentLoader();
-    dl->finishedLoading();
-    if (!dl->mainDocumentError().isNull() || !dl->frameLoader())
-        return;
-    dl->setPrimaryLoadComplete(true);
-    checkLoadComplete();
-}
-
 bool FrameLoader::isHostedByObjectElement() const
 {

trunk/Source/WebCore/loader/FrameLoader.h

@@ -157 +157 @@
     void handleFallbackContent();
 
-    void finishedLoading();
-
     ResourceError cancelledError(const ResourceRequest&) const;
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -478 +478 @@
 
     documentLoader()->timing()->setResponseEnd(finishTime ? finishTime : (m_timeOfLastDataReceived ? m_timeOfLastDataReceived : monotonicallyIncreasingTime()));
-    frameLoader()->finishedLoading();
+    documentLoader()->finishedLoading();
     ResourceLoader::didFinishLoading(finishTime);