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

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

Issue 1231273003: Refresh Frame(Loader) detach() related comments. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 975 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 m_documentLoader->stopLoading(); 986 m_documentLoader->stopLoading();
987 987
988 detachDocumentLoader(m_provisionalDocumentLoader); 988 detachDocumentLoader(m_provisionalDocumentLoader);
989 detachDocumentLoader(m_policyDocumentLoader); 989 detachDocumentLoader(m_policyDocumentLoader);
990 990
991 m_checkTimer.stop(); 991 m_checkTimer.stop();
992 m_frame->navigationScheduler().cancel(); 992 m_frame->navigationScheduler().cancel();
993 993
994 m_inStopAllLoaders = false; 994 m_inStopAllLoaders = false;
995 995
996 // detachFromParent() can be called multiple times on same LocalFrame, which 996 // LocalFrame::detach() can be called multiple times which
997 // means we may no longer have a FrameLoaderClient to talk to. 997 // means we may no longer have a FrameLoaderClient to talk to.
998 if (client()) 998 if (client())
999 client()->didStopAllLoaders(); 999 client()->didStopAllLoaders();
1000 } 1000 }
1001 1001
1002 void FrameLoader::didAccessInitialDocument() 1002 void FrameLoader::didAccessInitialDocument()
1003 { 1003 {
1004 // We only need to notify the client once, and only for the main frame. 1004 // We only need to notify the client once, and only for the main frame.
1005 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { 1005 if (isLoadingMainFrame() && !m_didAccessInitialDocument) {
1006 m_didAccessInitialDocument = true; 1006 m_didAccessInitialDocument = true;
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 // FIXME: We need a way to propagate insecure requests policy flags to 1494 // FIXME: We need a way to propagate insecure requests policy flags to
1495 // out-of-process frames. For now, we'll always use default behavior. 1495 // out-of-process frames. For now, we'll always use default behavior.
1496 if (!parentFrame->isLocalFrame()) 1496 if (!parentFrame->isLocalFrame())
1497 return nullptr; 1497 return nullptr;
1498 1498
1499 ASSERT(toLocalFrame(parentFrame)->document()); 1499 ASSERT(toLocalFrame(parentFrame)->document());
1500 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1500 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1501 } 1501 }
1502 1502
1503 } // namespace blink 1503 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698