OLD | NEW |
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 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
989 if (m_documentLoader) | 989 if (m_documentLoader) |
990 m_documentLoader->stopLoading(); | 990 m_documentLoader->stopLoading(); |
991 m_frame->document()->cancelParsing(); | 991 m_frame->document()->cancelParsing(); |
992 | 992 |
993 detachDocumentLoader(m_provisionalDocumentLoader); | 993 detachDocumentLoader(m_provisionalDocumentLoader); |
994 | 994 |
995 m_checkTimer.stop(); | 995 m_checkTimer.stop(); |
996 m_frame->navigationScheduler().cancel(); | 996 m_frame->navigationScheduler().cancel(); |
997 | 997 |
998 m_inStopAllLoaders = false; | 998 m_inStopAllLoaders = false; |
999 | |
1000 // LocalFrame::detach() can be called multiple times which | |
1001 // means we may no longer have a FrameLoaderClient to talk to. | |
1002 if (client()) | |
1003 client()->didStopAllLoaders(); | |
1004 } | 999 } |
1005 | 1000 |
1006 void FrameLoader::didAccessInitialDocument() | 1001 void FrameLoader::didAccessInitialDocument() |
1007 { | 1002 { |
1008 // We only need to notify the client once, and only for the main frame. | 1003 // We only need to notify the client once, and only for the main frame. |
1009 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { | 1004 if (isLoadingMainFrame() && !m_didAccessInitialDocument) { |
1010 m_didAccessInitialDocument = true; | 1005 m_didAccessInitialDocument = true; |
1011 // Notify asynchronously, since this is called within a JavaScript secur
ity check. | 1006 // Notify asynchronously, since this is called within a JavaScript secur
ity check. |
1012 m_didAccessInitialDocumentTimer.startOneShot(0, BLINK_FROM_HERE); | 1007 m_didAccessInitialDocumentTimer.startOneShot(0, BLINK_FROM_HERE); |
1013 } | 1008 } |
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1556 // FIXME: We need a way to propagate insecure requests policy flags to | 1551 // FIXME: We need a way to propagate insecure requests policy flags to |
1557 // out-of-process frames. For now, we'll always use default behavior. | 1552 // out-of-process frames. For now, we'll always use default behavior. |
1558 if (!parentFrame->isLocalFrame()) | 1553 if (!parentFrame->isLocalFrame()) |
1559 return nullptr; | 1554 return nullptr; |
1560 | 1555 |
1561 ASSERT(toLocalFrame(parentFrame)->document()); | 1556 ASSERT(toLocalFrame(parentFrame)->document()); |
1562 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1557 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
1563 } | 1558 } |
1564 | 1559 |
1565 } // namespace blink | 1560 } // namespace blink |
OLD | NEW |