Remove FrameLoader:m_isLoadingMainResource, since it is always

false at the only point it is checked.
https://bugs.webkit.org/show_bug.cgi?id=83819

Reviewed by Adam Barth.

No new tests, no functionality change intended.

* loader/DocumentWriter.cpp:
(WebCore::DocumentWriter::end): Merge with endIfNotLoadingMainResource(), always end, assert that we're still attached.
* loader/DocumentWriter.h:
* loader/FrameLoader.cpp:
* loader/FrameLoader.h: Remove isLoadingMainResource(), didEndDocument(), and m_isLoadingMainResource.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114062 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 451a6d4..8fdc360 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-12  Nate Chapin  <japhet@chromium.org>
+
+        Remove FrameLoader:m_isLoadingMainResource, since it is always
+        false at the only point it is checked.
+        https://bugs.webkit.org/show_bug.cgi?id=83819
+
+        Reviewed by Adam Barth.
+
+        No new tests, no functionality change intended.
+
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::end): Merge with endIfNotLoadingMainResource(), always end, assert that we're still attached.
+        * loader/DocumentWriter.h:
+        * loader/FrameLoader.cpp:
+        * loader/FrameLoader.h: Remove isLoadingMainResource(), didEndDocument(), and m_isLoadingMainResource.
+
 2012-04-12  Rob Buis  <rbuis@rim.com>
 
         XMLSerializer().serializeToString() doesn't generate the XML declaration markup like Opera and Firefox

diff --git a/Source/WebCore/loader/DocumentWriter.cpp b/Source/WebCore/loader/DocumentWriter.cpp
index 654d4e5..a14a030 100644 (file)
--- a/Source/WebCore/loader/DocumentWriter.cpp
+++ b/Source/WebCore/loader/DocumentWriter.cpp
@@ -220,16 +220,8 @@ void DocumentWriter::addData(const char* bytes, size_t length)
 
 void DocumentWriter::end()
 {
-    m_frame->loader()->didEndDocument();
-    endIfNotLoadingMainResource();
-}
-
-void DocumentWriter::endIfNotLoadingMainResource()
-{
-    // FIXME: This isn't really the check we should be doing. We should re-work
-    // how we end parsing to match the model in HTML5.
-    if (m_frame->loader()->isLoadingMainResource() || !m_frame->page() || !m_frame->document())
-        return;
+    ASSERT(m_frame->page());
+    ASSERT(m_frame->document());
 
     // The parser is guaranteed to be released after this point. begin() would
     // have to be called again before we can start writing more data.

diff --git a/Source/WebCore/loader/DocumentWriter.h b/Source/WebCore/loader/DocumentWriter.h
index 34bf830..26178a4 100644 (file)
--- a/Source/WebCore/loader/DocumentWriter.h
+++ b/Source/WebCore/loader/DocumentWriter.h
@@ -70,7 +70,6 @@ public:
 private:
     PassRefPtr<Document> createDocument(const KURL&);
     void clear();
-    void endIfNotLoadingMainResource();
 
     Frame* m_frame;
 

diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index fb80ef3..adb3f8b 100644 (file)
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -184,7 +184,6 @@ FrameLoader::FrameLoader(Frame* frame, FrameLoaderClient* client)
     , m_wasUnloadEventEmitted(false)
     , m_pageDismissalEventBeingDispatched(NoDismissal)
     , m_isComplete(false)
-    , m_isLoadingMainResource(false)
     , m_hasReceivedFirstData(false)
     , m_needsClear(false)
     , m_checkTimer(this, &FrameLoader::checkTimerFired)
@@ -402,7 +401,6 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy)
     }
 
     m_isComplete = true; // to avoid calling completed() in finishedParsing()
-    m_isLoadingMainResource = false;
     m_didCallImplicitClose = true; // don't want that one either
 
     if (m_frame->document() && m_frame->document()->parsing()) {
@@ -465,7 +463,6 @@ bool FrameLoader::didOpenURL()
     m_frame->editor()->clearLastEditCommand();
 
     m_isComplete = false;
-    m_isLoadingMainResource = true;
     m_didCallImplicitClose = false;
 
     // If we are still in the process of initializing an empty document then
@@ -613,7 +610,6 @@ void FrameLoader::didBeginDocument(bool dispatch)
     m_needsClear = true;
     m_isComplete = false;
     m_didCallImplicitClose = false;
-    m_isLoadingMainResource = true;
     m_frame->document()->setReadyState(Document::Loading);
 
     if (m_pendingStateObject) {
@@ -646,11 +642,6 @@ void FrameLoader::didBeginDocument(bool dispatch)
     history()->restoreDocumentState();
 }
 
-void FrameLoader::didEndDocument()
-{
-    m_isLoadingMainResource = false;
-}
-
 void FrameLoader::finishedParsing()
 {
     m_frame->injectUserScripts(InjectAtDocumentEnd);

diff --git a/Source/WebCore/loader/FrameLoader.h b/Source/WebCore/loader/FrameLoader.h
index 291a6ad..7c18fd0 100644 (file)
--- a/Source/WebCore/loader/FrameLoader.h
+++ b/Source/WebCore/loader/FrameLoader.h
@@ -131,7 +131,6 @@ public:
     void cancelAndClear();
     void clear(bool clearWindowProperties = true, bool clearScriptObjects = true, bool clearFrameView = true);
 
-    bool isLoadingMainResource() const { return m_isLoadingMainResource; }
     bool isLoading() const;
     bool frameHasLoaded() const;
 
@@ -200,7 +199,6 @@ public:
 
     // Callbacks from DocumentWriter
     void didBeginDocument(bool dispatchWindowObjectAvailable);
-    void didEndDocument();
     void willSetEncoding();
 
     void handledOnloadEvents();
@@ -402,7 +400,6 @@ private:
     bool m_wasUnloadEventEmitted;
     PageDismissalType m_pageDismissalEventBeingDispatched;
     bool m_isComplete;
-    bool m_isLoadingMainResource;
 
     RefPtr<SerializedScriptValue> m_pendingStateObject;