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

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

Issue 1426923007: Remove PluginLoadObserver and related logic, it was only used for NPAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 if (m_documentLoader) 987 if (m_documentLoader)
988 m_documentLoader->stopLoading(); 988 m_documentLoader->stopLoading();
989 m_frame->document()->cancelParsing(); 989 m_frame->document()->cancelParsing();
990 990
991 detachDocumentLoader(m_provisionalDocumentLoader); 991 detachDocumentLoader(m_provisionalDocumentLoader);
992 992
993 m_checkTimer.stop(); 993 m_checkTimer.stop();
994 m_frame->navigationScheduler().cancel(); 994 m_frame->navigationScheduler().cancel();
995 995
996 m_inStopAllLoaders = false; 996 m_inStopAllLoaders = false;
997
998 // LocalFrame::detach() can be called multiple times which
dcheng 2015/11/19 03:41:40 \(^_^)/
999 // means we may no longer have a FrameLoaderClient to talk to.
1000 if (client())
1001 client()->didStopAllLoaders();
1002 } 997 }
1003 998
1004 void FrameLoader::didAccessInitialDocument() 999 void FrameLoader::didAccessInitialDocument()
1005 { 1000 {
1006 // We only need to notify the client once, and only for the main frame. 1001 // We only need to notify the client once, and only for the main frame.
1007 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { 1002 if (isLoadingMainFrame() && !m_didAccessInitialDocument) {
1008 m_didAccessInitialDocument = true; 1003 m_didAccessInitialDocument = true;
1009 // Notify asynchronously, since this is called within a JavaScript secur ity check. 1004 // Notify asynchronously, since this is called within a JavaScript secur ity check.
1010 m_didAccessInitialDocumentTimer.startOneShot(0, BLINK_FROM_HERE); 1005 m_didAccessInitialDocumentTimer.startOneShot(0, BLINK_FROM_HERE);
1011 } 1006 }
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
1546 // FIXME: We need a way to propagate insecure requests policy flags to 1541 // FIXME: We need a way to propagate insecure requests policy flags to
1547 // out-of-process frames. For now, we'll always use default behavior. 1542 // out-of-process frames. For now, we'll always use default behavior.
1548 if (!parentFrame->isLocalFrame()) 1543 if (!parentFrame->isLocalFrame())
1549 return nullptr; 1544 return nullptr;
1550 1545
1551 ASSERT(toLocalFrame(parentFrame)->document()); 1546 ASSERT(toLocalFrame(parentFrame)->document());
1552 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1547 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1553 } 1548 }
1554 1549
1555 } // namespace blink 1550 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698