| 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 22 matching lines...) Expand all Loading... |
| 33 */ | 33 */ |
| 34 | 34 |
| 35 #include "core/loader/FrameLoader.h" | 35 #include "core/loader/FrameLoader.h" |
| 36 | 36 |
| 37 #include "bindings/core/v8/DOMWrapperWorld.h" | 37 #include "bindings/core/v8/DOMWrapperWorld.h" |
| 38 #include "bindings/core/v8/ScriptController.h" | 38 #include "bindings/core/v8/ScriptController.h" |
| 39 #include "bindings/core/v8/SerializedScriptValue.h" | 39 #include "bindings/core/v8/SerializedScriptValue.h" |
| 40 #include "core/HTMLNames.h" | 40 #include "core/HTMLNames.h" |
| 41 #include "core/dom/Document.h" | 41 #include "core/dom/Document.h" |
| 42 #include "core/dom/Element.h" | 42 #include "core/dom/Element.h" |
| 43 #include "core/dom/TaskRunnerHelper.h" |
| 43 #include "core/dom/ViewportDescription.h" | 44 #include "core/dom/ViewportDescription.h" |
| 44 #include "core/editing/Editor.h" | 45 #include "core/editing/Editor.h" |
| 45 #include "core/events/GestureEvent.h" | 46 #include "core/events/GestureEvent.h" |
| 46 #include "core/events/KeyboardEvent.h" | 47 #include "core/events/KeyboardEvent.h" |
| 47 #include "core/events/MouseEvent.h" | 48 #include "core/events/MouseEvent.h" |
| 48 #include "core/events/PageTransitionEvent.h" | 49 #include "core/events/PageTransitionEvent.h" |
| 49 #include "core/fetch/ResourceFetcher.h" | 50 #include "core/fetch/ResourceFetcher.h" |
| 50 #include "core/fetch/ResourceLoader.h" | 51 #include "core/fetch/ResourceLoader.h" |
| 51 #include "core/frame/FrameHost.h" | 52 #include "core/frame/FrameHost.h" |
| 52 #include "core/frame/FrameView.h" | 53 #include "core/frame/FrameView.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } | 162 } |
| 162 request.setSkipServiceWorker(frameLoadType == FrameLoadTypeReloadBypassingCa
che ? WebURLRequest::SkipServiceWorker::All : WebURLRequest::SkipServiceWorker::
None); | 163 request.setSkipServiceWorker(frameLoadType == FrameLoadTypeReloadBypassingCa
che ? WebURLRequest::SkipServiceWorker::All : WebURLRequest::SkipServiceWorker::
None); |
| 163 return request; | 164 return request; |
| 164 } | 165 } |
| 165 | 166 |
| 166 FrameLoader::FrameLoader(LocalFrame* frame) | 167 FrameLoader::FrameLoader(LocalFrame* frame) |
| 167 : m_frame(frame) | 168 : m_frame(frame) |
| 168 , m_progressTracker(ProgressTracker::create(frame)) | 169 , m_progressTracker(ProgressTracker::create(frame)) |
| 169 , m_loadType(FrameLoadTypeStandard) | 170 , m_loadType(FrameLoadTypeStandard) |
| 170 , m_inStopAllLoaders(false) | 171 , m_inStopAllLoaders(false) |
| 171 , m_checkTimer(this, &FrameLoader::checkTimerFired) | 172 , m_checkTimer(this, &FrameLoader::checkTimerFired, TaskRunnerHelper::getLoa
dingTaskRunner(frame)) |
| 172 , m_didAccessInitialDocument(false) | 173 , m_didAccessInitialDocument(false) |
| 173 , m_forcedSandboxFlags(SandboxNone) | 174 , m_forcedSandboxFlags(SandboxNone) |
| 174 , m_dispatchingDidClearWindowObjectInMainWorld(false) | 175 , m_dispatchingDidClearWindowObjectInMainWorld(false) |
| 175 , m_protectProvisionalLoader(false) | 176 , m_protectProvisionalLoader(false) |
| 176 { | 177 { |
| 177 TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this); | 178 TRACE_EVENT_OBJECT_CREATED_WITH_ID("loading", "FrameLoader", this); |
| 178 takeObjectSnapshot(); | 179 takeObjectSnapshot(); |
| 179 } | 180 } |
| 180 | 181 |
| 181 FrameLoader::~FrameLoader() | 182 FrameLoader::~FrameLoader() |
| (...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1610 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); | 1611 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); |
| 1611 return tracedValue; | 1612 return tracedValue; |
| 1612 } | 1613 } |
| 1613 | 1614 |
| 1614 inline void FrameLoader::takeObjectSnapshot() const | 1615 inline void FrameLoader::takeObjectSnapshot() const |
| 1615 { | 1616 { |
| 1616 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); | 1617 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); |
| 1617 } | 1618 } |
| 1618 | 1619 |
| 1619 } // namespace blink | 1620 } // namespace blink |
| OLD | NEW |