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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12327026: Merge 143514 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 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 | « LayoutTests/http/tests/misc/resources/empty.ogv ('k') | 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 143521)
+++ Source/WebCore/loader/FrameLoader.cpp (working copy)
@@ -742,6 +742,7 @@
void FrameLoader::checkCompleted()
{
+ RefPtr<Frame> protect(m_frame);
m_shouldCallCheckCompleted = false;
if (m_frame->view())
@@ -772,7 +773,6 @@
m_requestedHistoryItem = 0;
m_frame->document()->setReadyState(Document::Complete);
- RefPtr<Frame> protect(m_frame);
checkCallImplicitClose(); // if we didn't do it before
m_frame->navigationScheduler()->startTimer();
« no previous file with comments | « LayoutTests/http/tests/misc/resources/empty.ogv ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698