| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 #include "core/page/CreateWindow.h" | 80 #include "core/page/CreateWindow.h" |
| 81 #include "core/page/FrameTree.h" | 81 #include "core/page/FrameTree.h" |
| 82 #include "core/page/Page.h" | 82 #include "core/page/Page.h" |
| 83 #include "core/page/WindowFeatures.h" | 83 #include "core/page/WindowFeatures.h" |
| 84 #include "core/page/scrolling/ScrollingCoordinator.h" | 84 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 85 #include "core/svg/graphics/SVGImage.h" | 85 #include "core/svg/graphics/SVGImage.h" |
| 86 #include "core/xml/parser/XMLDocumentParser.h" | 86 #include "core/xml/parser/XMLDocumentParser.h" |
| 87 #include "platform/PluginScriptForbiddenScope.h" | 87 #include "platform/PluginScriptForbiddenScope.h" |
| 88 #include "platform/RuntimeEnabledFeatures.h" | 88 #include "platform/RuntimeEnabledFeatures.h" |
| 89 #include "platform/ScriptForbiddenScope.h" | 89 #include "platform/ScriptForbiddenScope.h" |
| 90 #include "platform/TraceEvent.h" | |
| 91 #include "platform/UserGestureIndicator.h" | 90 #include "platform/UserGestureIndicator.h" |
| 92 #include "platform/network/HTTPParsers.h" | 91 #include "platform/network/HTTPParsers.h" |
| 93 #include "platform/network/ResourceRequest.h" | 92 #include "platform/network/ResourceRequest.h" |
| 94 #include "platform/scroll/ScrollAnimatorBase.h" | 93 #include "platform/scroll/ScrollAnimatorBase.h" |
| 94 #include "platform/tracing/TraceEvent.h" |
| 95 #include "platform/weborigin/SecurityOrigin.h" | 95 #include "platform/weborigin/SecurityOrigin.h" |
| 96 #include "platform/weborigin/SecurityPolicy.h" | 96 #include "platform/weborigin/SecurityPolicy.h" |
| 97 #include "platform/weborigin/Suborigin.h" | 97 #include "platform/weborigin/Suborigin.h" |
| 98 #include "public/platform/WebCachePolicy.h" | 98 #include "public/platform/WebCachePolicy.h" |
| 99 #include "public/platform/WebURLRequest.h" | 99 #include "public/platform/WebURLRequest.h" |
| 100 #include "wtf/AutoReset.h" | 100 #include "wtf/AutoReset.h" |
| 101 #include "wtf/text/CString.h" | 101 #include "wtf/text/CString.h" |
| 102 #include "wtf/text/WTFString.h" | 102 #include "wtf/text/WTFString.h" |
| 103 #include <memory> | 103 #include <memory> |
| 104 | 104 |
| (...skipping 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1883 m_documentLoader ? m_documentLoader->url() : String()); | 1883 m_documentLoader ? m_documentLoader->url() : String()); |
| 1884 return tracedValue; | 1884 return tracedValue; |
| 1885 } | 1885 } |
| 1886 | 1886 |
| 1887 inline void FrameLoader::takeObjectSnapshot() const { | 1887 inline void FrameLoader::takeObjectSnapshot() const { |
| 1888 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1888 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1889 toTracedValue()); | 1889 toTracedValue()); |
| 1890 } | 1890 } |
| 1891 | 1891 |
| 1892 } // namespace blink | 1892 } // namespace blink |
| OLD | NEW |