| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "core/HTMLNames.h" | 42 #include "core/HTMLNames.h" |
| 43 #include "core/dom/Document.h" | 43 #include "core/dom/Document.h" |
| 44 #include "core/dom/Element.h" | 44 #include "core/dom/Element.h" |
| 45 #include "core/dom/TaskRunnerHelper.h" | 45 #include "core/dom/TaskRunnerHelper.h" |
| 46 #include "core/dom/ViewportDescription.h" | 46 #include "core/dom/ViewportDescription.h" |
| 47 #include "core/editing/Editor.h" | 47 #include "core/editing/Editor.h" |
| 48 #include "core/events/GestureEvent.h" | 48 #include "core/events/GestureEvent.h" |
| 49 #include "core/events/KeyboardEvent.h" | 49 #include "core/events/KeyboardEvent.h" |
| 50 #include "core/events/MouseEvent.h" | 50 #include "core/events/MouseEvent.h" |
| 51 #include "core/events/PageTransitionEvent.h" | 51 #include "core/events/PageTransitionEvent.h" |
| 52 #include "core/fetch/ResourceFetcher.h" | |
| 53 #include "core/frame/FrameHost.h" | 52 #include "core/frame/FrameHost.h" |
| 54 #include "core/frame/FrameView.h" | 53 #include "core/frame/FrameView.h" |
| 55 #include "core/frame/LocalDOMWindow.h" | 54 #include "core/frame/LocalDOMWindow.h" |
| 56 #include "core/frame/LocalFrame.h" | 55 #include "core/frame/LocalFrame.h" |
| 57 #include "core/frame/Settings.h" | 56 #include "core/frame/Settings.h" |
| 58 #include "core/frame/VisualViewport.h" | 57 #include "core/frame/VisualViewport.h" |
| 59 #include "core/frame/csp/ContentSecurityPolicy.h" | 58 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 60 #include "core/html/HTMLFormElement.h" | 59 #include "core/html/HTMLFormElement.h" |
| 61 #include "core/html/HTMLFrameOwnerElement.h" | 60 #include "core/html/HTMLFrameOwnerElement.h" |
| 62 #include "core/html/parser/HTMLParserIdioms.h" | 61 #include "core/html/parser/HTMLParserIdioms.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 83 #include "core/page/WindowFeatures.h" | 82 #include "core/page/WindowFeatures.h" |
| 84 #include "core/page/scrolling/ScrollingCoordinator.h" | 83 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 85 #include "core/svg/graphics/SVGImage.h" | 84 #include "core/svg/graphics/SVGImage.h" |
| 86 #include "core/xml/parser/XMLDocumentParser.h" | 85 #include "core/xml/parser/XMLDocumentParser.h" |
| 87 #include "platform/InstanceCounters.h" | 86 #include "platform/InstanceCounters.h" |
| 88 #include "platform/PluginScriptForbiddenScope.h" | 87 #include "platform/PluginScriptForbiddenScope.h" |
| 89 #include "platform/ScriptForbiddenScope.h" | 88 #include "platform/ScriptForbiddenScope.h" |
| 90 #include "platform/UserGestureIndicator.h" | 89 #include "platform/UserGestureIndicator.h" |
| 91 #include "platform/feature_policy/FeaturePolicy.h" | 90 #include "platform/feature_policy/FeaturePolicy.h" |
| 92 #include "platform/instrumentation/tracing/TraceEvent.h" | 91 #include "platform/instrumentation/tracing/TraceEvent.h" |
| 92 #include "platform/loader/fetch/ResourceFetcher.h" |
| 93 #include "platform/network/HTTPParsers.h" | 93 #include "platform/network/HTTPParsers.h" |
| 94 #include "platform/network/ResourceRequest.h" | 94 #include "platform/network/ResourceRequest.h" |
| 95 #include "platform/scroll/ScrollAnimatorBase.h" | 95 #include "platform/scroll/ScrollAnimatorBase.h" |
| 96 #include "platform/weborigin/SecurityOrigin.h" | 96 #include "platform/weborigin/SecurityOrigin.h" |
| 97 #include "platform/weborigin/SecurityPolicy.h" | 97 #include "platform/weborigin/SecurityPolicy.h" |
| 98 #include "platform/weborigin/Suborigin.h" | 98 #include "platform/weborigin/Suborigin.h" |
| 99 #include "public/platform/WebCachePolicy.h" | 99 #include "public/platform/WebCachePolicy.h" |
| 100 #include "public/platform/WebFeaturePolicy.h" | 100 #include "public/platform/WebFeaturePolicy.h" |
| 101 #include "public/platform/WebURLRequest.h" | 101 #include "public/platform/WebURLRequest.h" |
| 102 #include "wtf/AutoReset.h" | 102 #include "wtf/AutoReset.h" |
| (...skipping 1802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1905 m_documentLoader ? m_documentLoader->url() : String()); | 1905 m_documentLoader ? m_documentLoader->url() : String()); |
| 1906 return tracedValue; | 1906 return tracedValue; |
| 1907 } | 1907 } |
| 1908 | 1908 |
| 1909 inline void FrameLoader::takeObjectSnapshot() const { | 1909 inline void FrameLoader::takeObjectSnapshot() const { |
| 1910 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1910 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1911 toTracedValue()); | 1911 toTracedValue()); |
| 1912 } | 1912 } |
| 1913 | 1913 |
| 1914 } // namespace blink | 1914 } // namespace blink |
| OLD | NEW |