Changeset 126507 in webkit

Timestamp:

Aug 23, 2012 5:09:29 PM (12 years ago)

Author:

kbr@google.com

Message:

Unreviewed, rolling out r126483.
​http://trac.webkit.org/changeset/126483
​https://bugs.webkit.org/show_bug.cgi?id=92272

Caused two Chromium browser_tests to time out 100% reliably.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::init):
(WebCore::FrameLoader::prepareForLoadStart):
(WebCore::FrameLoader::clearProvisionalLoad):
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
(WebCore::FrameLoader::detachFromParent):

• loader/FrameLoader.h:

(FrameLoader):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (7 diffs)
• loader/FrameLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-23  Kenneth Russell  <kbr@google.com>
+
+        Unreviewed, rolling out r126483.
+        http://trac.webkit.org/changeset/126483
+        https://bugs.webkit.org/show_bug.cgi?id=92272
+
+        Caused two Chromium browser_tests to time out 100% reliably.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::init):
+        (WebCore::FrameLoader::prepareForLoadStart):
+        (WebCore::FrameLoader::clearProvisionalLoad):
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+        (WebCore::FrameLoader::detachFromParent):
+        * loader/FrameLoader.h:
+        (FrameLoader):
+
 2012-08-23  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -166 +166 @@
 }
 
-class FrameLoader::FrameProgressTracker {
-public:
-    static PassOwnPtr<FrameProgressTracker> create(Frame* frame) { return adoptPtr(new FrameProgressTracker(frame)); }
-    ~FrameProgressTracker()
-    {
-        ASSERT(!m_inProgressCount || m_frame->page());
-        for (; m_inProgressCount; m_inProgressCount--)
-            m_frame->page()->progress()->progressCompleted(m_frame);
-    }
-
-    void progressStarted()
-    {
-        ASSERT(m_frame->page());
-        m_inProgressCount++;
-        m_frame->page()->progress()->progressStarted(m_frame);
-    }
-
-    void progressCompleted()
-    {
-        ASSERT(m_inProgressCount > 0);
-        ASSERT(m_frame->page());
-        m_inProgressCount--;
-        m_frame->page()->progress()->progressCompleted(m_frame);
-    }
-
-private:
-    FrameProgressTracker(Frame* frame)
-        : m_frame(frame)
-        , m_inProgressCount(0)
-    {
-    }
-
-    Frame* m_frame;
-    int m_inProgressCount;
-};
-
 FrameLoader::FrameLoader(Frame* frame, FrameLoaderClient* client)
     : m_frame(frame)
@@ -265 +229 @@
 
     m_networkingContext = m_client->createNetworkingContext();
-    m_progressTracker = FrameProgressTracker::create(m_frame);
 }
 
@@ -1125 +1088 @@
 void FrameLoader::prepareForLoadStart()
 {
-    m_progressTracker->progressStarted();
+    if (Page* page = m_frame->page())
+        page->progress()->progressStarted(m_frame);
     m_client->dispatchDidStartProvisionalLoad();
 
@@ -1683 +1647 @@
 {
     setProvisionalDocumentLoader(0);
-    m_progressTracker->progressCompleted();
+    if (Page* page = m_frame->page())
+        page->progress()->progressCompleted(m_frame);
     setState(FrameStateComplete);
 }
@@ -2159 +2124 @@
 
             if (!settings->needsDidFinishLoadOrderQuirk()) {
-                m_progressTracker->progressCompleted();
                 if (Page* page = m_frame->page()) {
+                    page->progress()->progressCompleted(m_frame);
+
                     if (m_frame == page->mainFrame())
                         page->resetRelevantPaintedObjectCounter();
@@ -2178 +2144 @@
 
             if (settings->needsDidFinishLoadOrderQuirk()) {
-                m_progressTracker->progressCompleted();
                 if (Page* page = m_frame->page()) {
+                    page->progress()->progressCompleted(m_frame);
+
                     if (m_frame == page->mainFrame())
                         page->resetRelevantPaintedObjectCounter();
@@ -2402 +2369 @@
 
     detachViewsAndDocumentLoader();
-
-    m_progressTracker.clear();
 
     if (Frame* parent = m_frame->tree()->parent()) {

trunk/Source/WebCore/loader/FrameLoader.h

@@ -386 +386 @@
     mutable IconController m_icon;
 
-    class FrameProgressTracker;
-    OwnPtr<FrameProgressTracker> m_progressTracker;
-
     FrameState m_state;
     FrameLoadType m_loadType;