Title: [126507] trunk/Source/WebCore
- Revision
- 126507
- Author
- k...@google.com
- Date
- 2012-08-23 17:09:29 -0700 (Thu, 23 Aug 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126506 => 126507)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 23:59:06 UTC (rev 126506)
+++ trunk/Source/WebCore/ChangeLog 2012-08-24 00:09:29 UTC (rev 126507)
@@ -1,3 +1,20 @@
+2012-08-23 Kenneth Russell <k...@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 <hara...@chromium.org>
[V8] Remove V8Proxy.{h,cpp}
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (126506 => 126507)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2012-08-23 23:59:06 UTC (rev 126506)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2012-08-24 00:09:29 UTC (rev 126507)
@@ -165,42 +165,6 @@
return frame->document() && frame->document()->isSandboxed(mask);
}
-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)
, m_client(client)
@@ -264,7 +228,6 @@
m_didCallImplicitClose = true;
m_networkingContext = m_client->createNetworkingContext();
- m_progressTracker = FrameProgressTracker::create(m_frame);
}
void FrameLoader::setDefersLoading(bool defers)
@@ -1124,7 +1087,8 @@
void FrameLoader::prepareForLoadStart()
{
- m_progressTracker->progressStarted();
+ if (Page* page = m_frame->page())
+ page->progress()->progressStarted(m_frame);
m_client->dispatchDidStartProvisionalLoad();
// Notify accessibility.
@@ -1682,7 +1646,8 @@
void FrameLoader::clearProvisionalLoad()
{
setProvisionalDocumentLoader(0);
- m_progressTracker->progressCompleted();
+ if (Page* page = m_frame->page())
+ page->progress()->progressCompleted(m_frame);
setState(FrameStateComplete);
}
@@ -2158,8 +2123,9 @@
return;
if (!settings->needsDidFinishLoadOrderQuirk()) {
- m_progressTracker->progressCompleted();
if (Page* page = m_frame->page()) {
+ page->progress()->progressCompleted(m_frame);
+
if (m_frame == page->mainFrame())
page->resetRelevantPaintedObjectCounter();
}
@@ -2177,8 +2143,9 @@
}
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,8 +2369,6 @@
detachViewsAndDocumentLoader();
- m_progressTracker.clear();
-
if (Frame* parent = m_frame->tree()->parent()) {
parent->loader()->closeAndRemoveChild(m_frame);
parent->loader()->scheduleCheckCompleted();
Modified: trunk/Source/WebCore/loader/FrameLoader.h (126506 => 126507)
--- trunk/Source/WebCore/loader/FrameLoader.h 2012-08-23 23:59:06 UTC (rev 126506)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2012-08-24 00:09:29 UTC (rev 126507)
@@ -385,9 +385,6 @@
mutable FrameLoaderStateMachine m_stateMachine;
mutable IconController m_icon;
- class FrameProgressTracker;
- OwnPtr<FrameProgressTracker> m_progressTracker;
-
FrameState m_state;
FrameLoadType m_loadType;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
