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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2144253002: Remove unused WebFrameClient::hasPendingNavigation method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 return true; 601 return true;
602 } 602 }
603 603
604 static bool shouldSendCompleteNotification(LocalFrame* frame) 604 static bool shouldSendCompleteNotification(LocalFrame* frame)
605 { 605 {
606 // FIXME: We might have already sent stop notifications and be re-completing . 606 // FIXME: We might have already sent stop notifications and be re-completing .
607 if (!frame->isLoading()) 607 if (!frame->isLoading())
608 return false; 608 return false;
609 // Only send didStopLoading() if there are no navigations in progress at all , 609 // Only send didStopLoading() if there are no navigations in progress at all ,
610 // whether committed, provisional, or pending. 610 // whether committed, provisional, or pending.
611 return frame->loader().documentLoader()->sentDidFinishLoad() && !frame->load er().provisionalDocumentLoader() && !frame->loader().client()->hasPendingNavigat ion(); 611 return frame->loader().documentLoader()->sentDidFinishLoad() && !frame->load er().provisionalDocumentLoader();
612 } 612 }
613 613
614 void FrameLoader::checkCompleted() 614 void FrameLoader::checkCompleted()
615 { 615 {
616 if (!shouldComplete(m_frame->document())) 616 if (!shouldComplete(m_frame->document()))
617 return; 617 return;
618 618
619 // OK, completed. 619 // OK, completed.
620 m_frame->document()->setReadyState(Document::Complete); 620 m_frame->document()->setReadyState(Document::Complete);
621 if (m_frame->document()->loadEventStillNeeded()) 621 if (m_frame->document()->loadEventStillNeeded())
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1613 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String()); 1613 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());
1614 return tracedValue; 1614 return tracedValue;
1615 } 1615 }
1616 1616
1617 inline void FrameLoader::takeObjectSnapshot() const 1617 inline void FrameLoader::takeObjectSnapshot() const
1618 { 1618 {
1619 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value()); 1619 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());
1620 } 1620 }
1621 1621
1622 } // namespace blink 1622 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698