| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 6 * (http://www.torchmobile.com/) | 6 * (http://www.torchmobile.com/) |
| 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 10 * Copyright (C) 2011 Google Inc. All rights reserved. | 10 * Copyright (C) 2011 Google Inc. All rights reserved. |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #include "core/dom/ViewportDescription.h" | 47 #include "core/dom/ViewportDescription.h" |
| 48 #include "core/editing/Editor.h" | 48 #include "core/editing/Editor.h" |
| 49 #include "core/events/GestureEvent.h" | 49 #include "core/events/GestureEvent.h" |
| 50 #include "core/events/KeyboardEvent.h" | 50 #include "core/events/KeyboardEvent.h" |
| 51 #include "core/events/MouseEvent.h" | 51 #include "core/events/MouseEvent.h" |
| 52 #include "core/events/PageTransitionEvent.h" | 52 #include "core/events/PageTransitionEvent.h" |
| 53 #include "core/frame/FrameHost.h" | 53 #include "core/frame/FrameHost.h" |
| 54 #include "core/frame/FrameView.h" | 54 #include "core/frame/FrameView.h" |
| 55 #include "core/frame/LocalDOMWindow.h" | 55 #include "core/frame/LocalDOMWindow.h" |
| 56 #include "core/frame/LocalFrame.h" | 56 #include "core/frame/LocalFrame.h" |
| 57 #include "core/frame/LocalFrameClient.h" |
| 57 #include "core/frame/Settings.h" | 58 #include "core/frame/Settings.h" |
| 58 #include "core/frame/VisualViewport.h" | 59 #include "core/frame/VisualViewport.h" |
| 59 #include "core/frame/csp/ContentSecurityPolicy.h" | 60 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 60 #include "core/html/HTMLFormElement.h" | 61 #include "core/html/HTMLFormElement.h" |
| 61 #include "core/html/HTMLFrameOwnerElement.h" | 62 #include "core/html/HTMLFrameOwnerElement.h" |
| 62 #include "core/html/parser/HTMLParserIdioms.h" | 63 #include "core/html/parser/HTMLParserIdioms.h" |
| 63 #include "core/input/EventHandler.h" | 64 #include "core/input/EventHandler.h" |
| 64 #include "core/inspector/ConsoleMessage.h" | 65 #include "core/inspector/ConsoleMessage.h" |
| 65 #include "core/inspector/InspectorInstrumentation.h" | 66 #include "core/inspector/InspectorInstrumentation.h" |
| 66 #include "core/inspector/InspectorTraceEvents.h" | 67 #include "core/inspector/InspectorTraceEvents.h" |
| 67 #include "core/loader/DocumentLoadTiming.h" | 68 #include "core/loader/DocumentLoadTiming.h" |
| 68 #include "core/loader/DocumentLoader.h" | 69 #include "core/loader/DocumentLoader.h" |
| 69 #include "core/loader/FormSubmission.h" | 70 #include "core/loader/FormSubmission.h" |
| 70 #include "core/loader/FrameLoadRequest.h" | 71 #include "core/loader/FrameLoadRequest.h" |
| 71 #include "core/loader/FrameLoaderClient.h" | |
| 72 #include "core/loader/LinkLoader.h" | 72 #include "core/loader/LinkLoader.h" |
| 73 #include "core/loader/MixedContentChecker.h" | 73 #include "core/loader/MixedContentChecker.h" |
| 74 #include "core/loader/NavigationScheduler.h" | 74 #include "core/loader/NavigationScheduler.h" |
| 75 #include "core/loader/NetworkHintsInterface.h" | 75 #include "core/loader/NetworkHintsInterface.h" |
| 76 #include "core/loader/ProgressTracker.h" | 76 #include "core/loader/ProgressTracker.h" |
| 77 #include "core/loader/appcache/ApplicationCacheHost.h" | 77 #include "core/loader/appcache/ApplicationCacheHost.h" |
| 78 #include "core/origin_trials/OriginTrialContext.h" | 78 #include "core/origin_trials/OriginTrialContext.h" |
| 79 #include "core/page/ChromeClient.h" | 79 #include "core/page/ChromeClient.h" |
| 80 #include "core/page/CreateWindow.h" | 80 #include "core/page/CreateWindow.h" |
| 81 #include "core/page/FrameTree.h" | 81 #include "core/page/FrameTree.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 if (m_documentLoader) | 229 if (m_documentLoader) |
| 230 m_documentLoader->setSentDidFinishLoad(); | 230 m_documentLoader->setSentDidFinishLoad(); |
| 231 // Self-suspend if created in an already suspended Page. Note that both | 231 // Self-suspend if created in an already suspended Page. Note that both |
| 232 // startLoadingMainResource() and cancelParsing() may have already detached | 232 // startLoadingMainResource() and cancelParsing() may have already detached |
| 233 // the frame, since they both fire JS events. | 233 // the frame, since they both fire JS events. |
| 234 if (m_frame->page() && m_frame->page()->suspended()) | 234 if (m_frame->page() && m_frame->page()->suspended()) |
| 235 setDefersLoading(true); | 235 setDefersLoading(true); |
| 236 takeObjectSnapshot(); | 236 takeObjectSnapshot(); |
| 237 } | 237 } |
| 238 | 238 |
| 239 FrameLoaderClient* FrameLoader::client() const { | 239 LocalFrameClient* FrameLoader::client() const { |
| 240 return static_cast<FrameLoaderClient*>(m_frame->client()); | 240 return static_cast<LocalFrameClient*>(m_frame->client()); |
| 241 } | 241 } |
| 242 | 242 |
| 243 void FrameLoader::setDefersLoading(bool defers) { | 243 void FrameLoader::setDefersLoading(bool defers) { |
| 244 if (m_provisionalDocumentLoader) | 244 if (m_provisionalDocumentLoader) |
| 245 m_provisionalDocumentLoader->fetcher()->setDefersLoading(defers); | 245 m_provisionalDocumentLoader->fetcher()->setDefersLoading(defers); |
| 246 | 246 |
| 247 if (Document* document = m_frame->document()) { | 247 if (Document* document = m_frame->document()) { |
| 248 document->fetcher()->setDefersLoading(defers); | 248 document->fetcher()->setDefersLoading(defers); |
| 249 if (defers) | 249 if (defers) |
| 250 document->suspendScheduledTasks(); | 250 document->suspendScheduledTasks(); |
| (...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2036 m_isNavigationHandledByClient = true; | 2036 m_isNavigationHandledByClient = true; |
| 2037 InspectorInstrumentation::frameScheduledClientNavigation(m_frame); | 2037 InspectorInstrumentation::frameScheduledClientNavigation(m_frame); |
| 2038 } | 2038 } |
| 2039 | 2039 |
| 2040 void FrameLoader::clearNavigationHandledByClient() { | 2040 void FrameLoader::clearNavigationHandledByClient() { |
| 2041 m_isNavigationHandledByClient = false; | 2041 m_isNavigationHandledByClient = false; |
| 2042 InspectorInstrumentation::frameClearedScheduledClientNavigation(m_frame); | 2042 InspectorInstrumentation::frameClearedScheduledClientNavigation(m_frame); |
| 2043 } | 2043 } |
| 2044 | 2044 |
| 2045 } // namespace blink | 2045 } // namespace blink |
| OLD | NEW |