Title: [112728] trunk/Source/WebCore
- Revision
- 112728
- Author
- jap...@chromium.org
- Date
- 2012-03-30 14:42:01 -0700 (Fri, 30 Mar 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112727 => 112728)
--- trunk/Source/WebCore/ChangeLog 2012-03-30 21:23:35 UTC (rev 112727)
+++ trunk/Source/WebCore/ChangeLog 2012-03-30 21:42:01 UTC (rev 112728)
@@ -1,3 +1,19 @@
+2012-03-30 Nate Chapin <jap...@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 <an...@apple.com>
Cache origin check result to RuleData
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (112727 => 112728)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2012-03-30 21:23:35 UTC (rev 112727)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2012-03-30 21:42:01 UTC (rev 112728)
@@ -288,10 +288,14 @@
{
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();
}
void DocumentLoader::commitLoad(const char* data, int length)
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (112727 => 112728)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2012-03-30 21:23:35 UTC (rev 112727)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2012-03-30 21:42:01 UTC (rev 112728)
@@ -1973,19 +1973,6 @@
cachedFrame.restore();
}
-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
{
HTMLFrameOwnerElement* owner = m_frame->ownerElement();
Modified: trunk/Source/WebCore/loader/FrameLoader.h (112727 => 112728)
--- trunk/Source/WebCore/loader/FrameLoader.h 2012-03-30 21:23:35 UTC (rev 112727)
+++ trunk/Source/WebCore/loader/FrameLoader.h 2012-03-30 21:42:01 UTC (rev 112728)
@@ -156,8 +156,6 @@
void handleFallbackContent();
- void finishedLoading();
-
ResourceError cancelledError(const ResourceRequest&) const;
bool isHostedByObjectElement() const;
Modified: trunk/Source/WebCore/loader/MainResourceLoader.cpp (112727 => 112728)
--- trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-03-30 21:23:35 UTC (rev 112727)
+++ trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-03-30 21:42:01 UTC (rev 112728)
@@ -477,7 +477,7 @@
dl->maybeFinishLoadingMultipartContent();
documentLoader()->timing()->setResponseEnd(finishTime ? finishTime : (m_timeOfLastDataReceived ? m_timeOfLastDataReceived : monotonicallyIncreasingTime()));
- frameLoader()->finishedLoading();
+ documentLoader()->finishedLoading();
ResourceLoader::didFinishLoading(finishTime);
dl->applicationCacheHost()->finishedLoadingMainResource();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
