Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: Source/WebCore/loader/FrameLoader.cpp

Issue 10331005: Revert 115549 - Ensure that there's always a provisional document loader if the frame loader is in … (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1123/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/FrameLoader.cpp
===================================================================
--- Source/WebCore/loader/FrameLoader.cpp (revision 115915)
+++ Source/WebCore/loader/FrameLoader.cpp (working copy)
@@ -216,9 +216,6 @@
// It would be better if this could be done with even fewer steps.
m_stateMachine.advanceTo(FrameLoaderStateMachine::CreatingInitialEmptyDocument);
setPolicyDocumentLoader(m_client->createDocumentLoader(ResourceRequest(KURL(ParsedURLString, emptyString())), SubstituteData()).get());
- // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
- if (!m_policyDocumentLoader.get())
- CRASH();
setProvisionalDocumentLoader(m_policyDocumentLoader.get());
setState(FrameStateProvisional);
m_provisionalDocumentLoader->setResponse(ResourceResponse(KURL(), "text/html", 0, String(), String()));
@@ -1095,9 +1092,6 @@
void FrameLoader::setupForReplace()
{
- // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
- if (!m_documentLoader.get())
- CRASH();
setState(FrameStateProvisional);
m_provisionalDocumentLoader = m_documentLoader;
m_documentLoader = 0;
@@ -1506,8 +1500,6 @@
m_documentLoader->stopLoading();
setProvisionalDocumentLoader(0);
- if (m_state == FrameStateProvisional)
- setState(FrameStateComplete);
m_checkTimer.stop();
@@ -1622,9 +1614,9 @@
void FrameLoader::clearProvisionalLoad()
{
+ setProvisionalDocumentLoader(0);
if (Page* page = m_frame->page())
page->progress()->progressCompleted(m_frame);
- setProvisionalDocumentLoader(0);
setState(FrameStateComplete);
}
@@ -2578,9 +2570,6 @@
if (m_provisionalDocumentLoader && !equalIgnoringFragmentIdentifier(m_provisionalDocumentLoader->request().url(), request.url())) {
m_provisionalDocumentLoader->stopLoading();
setProvisionalDocumentLoader(0);
- // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
- if (m_state == FrameStateProvisional)
- CRASH();
}
bool isRedirect = m_quickRedirectComing || policyChecker()->loadType() == FrameLoadTypeRedirectWithLockedBackForwardList;
@@ -2743,9 +2732,6 @@
}
#endif
- // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
- if (!m_policyDocumentLoader.get())
- CRASH();
setProvisionalDocumentLoader(m_policyDocumentLoader.get());
m_loadType = type;
setState(FrameStateProvisional);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698