Changeset 115654 in webkit

Timestamp:

Apr 30, 2012 11:51:27 AM (12 years ago)

Author:

Nate Chapin

Message:

Move more of committing and starting to write a Document
to DocumentLoader.
​https://bugs.webkit.org/show_bug.cgi?id=83908

Reviewed by Adam Barth.

No new tests, refactor only.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::commitIfReady): Ignore m_gotFirstByte here, since

it was always true here anyway.

(WebCore::DocumentLoader::finishedLoading): If we are finishing an empty

document, create the document now, so that FrameLoaderClient doesn't
have to do it later (FrameLoaderClient code will be removed in a later
patch).

(WebCore::DocumentLoader::commitData): Call receivedFirstData() directly and

do some work receivedFirstData() used to do, setEncoding() only once per
load.

(WebCore::DocumentLoader::receivedData):
(WebCore::DocumentLoader::maybeCreateArchive):

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

(WebCore::DocumentWriter::setEncoding):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::receivedFirstData): Move DocumentLoader calls

to DocumentLoader.

• loader/FrameLoader.h: Remove m_hasReceivedFirstData and willSetEncoding(),

allow hasReceivedData() to be called directly.

(FrameLoader):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (6 diffs)
• loader/DocumentLoader.h (modified) (1 diff)
• loader/DocumentWriter.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (7 diffs)
• loader/FrameLoader.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-30  Nate Chapin  <japhet@chromium.org>
+
+        Move more of committing and starting to write a Document
+        to DocumentLoader.
+        https://bugs.webkit.org/show_bug.cgi?id=83908
+
+        Reviewed by Adam Barth.
+
+        No new tests, refactor only.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::commitIfReady): Ignore m_gotFirstByte here, since
+            it was always true here anyway.
+        (WebCore::DocumentLoader::finishedLoading): If we are finishing an empty
+            document, create the document now, so that FrameLoaderClient doesn't
+            have to do it later (FrameLoaderClient code will be removed in a later
+            patch).
+        (WebCore::DocumentLoader::commitData): Call receivedFirstData() directly and
+            do some work receivedFirstData() used to do, setEncoding() only once per
+            load.
+        (WebCore::DocumentLoader::receivedData):
+        (WebCore::DocumentLoader::maybeCreateArchive):
+        * loader/DocumentLoader.h:
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::setEncoding):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::receivedFirstData): Move DocumentLoader calls
+            to DocumentLoader.
+        * loader/FrameLoader.h: Remove m_hasReceivedFirstData and willSetEncoding(),
+            allow hasReceivedData() to be called directly.
+        (FrameLoader):
+
 2012-04-30  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -277 +277 @@
 void DocumentLoader::commitIfReady()
 {
-    if (m_gotFirstByte && !m_committed) {
+    if (!m_committed) {
         m_committed = true;
         frameLoader()->commitProvisionalLoad();
@@ -285 +285 @@
 void DocumentLoader::finishedLoading()
 {
-    m_gotFirstByte = true;   
     commitIfReady();
     if (!frameLoader() || frameLoader()->stateMachine()->creatingInitialEmptyDocument())
@@ -291 +290 @@
     if (!maybeCreateArchive())
         frameLoader()->client()->finishedLoading(this);
+    
+    // If this is an empty document, it will not have actually been created yet. Commit dummy data so that
+    // DocumentWriter::begin() gets called and creates the Document.
+    if (!m_gotFirstByte)
+        commitData(0, 0);
+
     m_writer.end();
     if (!m_mainDocumentError.isNull())
@@ -318 +323 @@
 void DocumentLoader::commitData(const char* bytes, size_t length)
 {
-    // Set the text encoding.  This is safe to call multiple times.
-    bool userChosen = true;
-    String encoding = overrideEncoding();
-    if (encoding.isNull()) {
-        userChosen = false;
-        encoding = response().textEncodingName();
-    }
-    m_writer.setEncoding(encoding, userChosen);
+    if (!m_gotFirstByte) {
+        m_gotFirstByte = true;
+        m_writer.begin(documentURL(), false);
+        m_writer.setDocumentWasLoadedAsPartOfNavigation();
+        
+#if ENABLE(MHTML)
+        // The origin is the MHTML file, we need to set the base URL to the document encoded in the MHTML so
+        // relative URLs are resolved properly.
+        if (m_archive && m_archive->type() == Archive::MHTML)
+            m_frame->document()->setBaseURLOverride(m_archive->mainResource()->url());
+#endif
+
+        frameLoader()->receivedFirstData();
+
+        bool userChosen = true;
+        String encoding = overrideEncoding();
+        if (encoding.isNull()) {
+            userChosen = false;
+            encoding = response().textEncodingName();
+        }
+        m_writer.setEncoding(encoding, userChosen);
+    }
     ASSERT(m_frame->document()->parsing());
     m_writer.addData(bytes, length);
@@ -336 +355 @@
 
 void DocumentLoader::receivedData(const char* data, int length)
-{    
-    m_gotFirstByte = true;
+{
     if (doesProgressiveLoad(m_response.mimeType()))
         commitLoad(data, length);
@@ -462 +480 @@
     
     ASSERT(m_frame->document());
-    String userChosenEncoding = overrideEncoding();
-    bool encodingIsUserChosen = !userChosenEncoding.isNull();
-    m_writer.setEncoding(encodingIsUserChosen ? userChosenEncoding : mainResource->textEncoding(), encodingIsUserChosen);
-    m_writer.addData(mainResource->data()->data(), mainResource->data()->size());
+    commitData(mainResource->data()->data(), mainResource->data()->size());
     return true;
 #endif // !ENABLE(WEB_ARCHIVE) && !ENABLE(MHTML)

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -133 +133 @@
 
 #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
-        Archive* archive() const { return m_archive.get(); }
         void setArchive(PassRefPtr<Archive>);
         void addAllArchiveResources(Archive*);

trunk/Source/WebCore/loader/DocumentWriter.cpp

@@ -245 +245 @@
 void DocumentWriter::setEncoding(const String& name, bool userChosen)
 {
-    m_frame->loader()->willSetEncoding();
     m_encoding = name;
     m_encodingWasChosenByUser = userChosen;

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -185 +185 @@
     , m_pageDismissalEventBeingDispatched(NoDismissal)
     , m_isComplete(false)
-    , m_hasReceivedFirstData(false)
     , m_needsClear(false)
     , m_checkTimer(this, &FrameLoader::checkTimerFired)
@@ -410 +409 @@
     }
 
-    m_hasReceivedFirstData = true;
-
     if (Document* doc = m_frame->document()) {
         // FIXME: HTML5 doesn't tell us to set the state to complete when aborting, but we do anyway to match legacy behavior.
@@ -476 +473 @@
         }
     }
-    m_hasReceivedFirstData = false;
 
     started();
@@ -562 +558 @@
 void FrameLoader::receivedFirstData()
 {
-    KURL workingURL = activeDocumentLoader()->documentURL();
-    activeDocumentLoader()->writer()->begin(workingURL, false);
-    activeDocumentLoader()->writer()->setDocumentWasLoadedAsPartOfNavigation();
-
-#if ENABLE(MHTML)
-    // The origin is the MHTML file, we need to set the base URL to the document encoded in the MHTML so
-    // relative URLs are resolved properly.
-    if (activeDocumentLoader()->archive() && activeDocumentLoader()->archive()->type() == Archive::MHTML)
-        m_frame->document()->setBaseURLOverride(activeDocumentLoader()->archive()->mainResource()->url());
-#endif
-
     dispatchDidCommitLoad();
     dispatchDidClearWindowObjectsInAllWorlds();
@@ -583 +568 @@
             m_client->dispatchDidReceiveTitle(ptitle);
     }
-
-    m_hasReceivedFirstData = true;
 
     if (!m_documentLoader)
@@ -972 +955 @@
 {
     m_submittedFormURL = KURL();
-}
-
-void FrameLoader::willSetEncoding()
-{
-    if (!m_hasReceivedFirstData)
-        receivedFirstData();
 }
 
@@ -1934 +1911 @@
     if (url.protocolIsInHTTPFamily() && !url.host().isEmpty() && url.path().isEmpty())
         url.setPath("/");
-
-    m_hasReceivedFirstData = false;
 
     started();

trunk/Source/WebCore/loader/FrameLoader.h

@@ -200 +200 @@
     // Callbacks from DocumentWriter
     void didBeginDocument(bool dispatchWindowObjectAvailable);
-    void willSetEncoding();
+
+    void receivedFirstData();
 
     void handledOnloadEvents();
@@ -292 +293 @@
     void loadProvisionalItemFromCachedPage();
 
-    void receivedFirstData();
-
     void updateFirstPartyForCookies();
     void setFirstPartyForCookies(const KURL&);
@@ -405 +404 @@
 
     RefPtr<SerializedScriptValue> m_pendingStateObject;
-
-    bool m_hasReceivedFirstData;
 
     bool m_needsClear;