third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2346663004: Moving platform tracing things into platform/tracing.

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2346663004: Moving platform tracing things into platform/tracing. (Closed)

Patch Set: Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.h ('k') | third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | third_party/WebKit/Source/platform/MemoryCacheDumpProvider.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 #include "core/page/CreateWindow.h"	78 #include "core/page/CreateWindow.h"

79 #include "core/page/FrameTree.h"	79 #include "core/page/FrameTree.h"

80 #include "core/page/Page.h"	80 #include "core/page/Page.h"

81 #include "core/page/WindowFeatures.h"	81 #include "core/page/WindowFeatures.h"

82 #include "core/page/scrolling/ScrollingCoordinator.h"	82 #include "core/page/scrolling/ScrollingCoordinator.h"

83 #include "core/svg/graphics/SVGImage.h"	83 #include "core/svg/graphics/SVGImage.h"

84 #include "core/xml/parser/XMLDocumentParser.h"	84 #include "core/xml/parser/XMLDocumentParser.h"

85 #include "platform/PluginScriptForbiddenScope.h"	85 #include "platform/PluginScriptForbiddenScope.h"

86 #include "platform/RuntimeEnabledFeatures.h"	86 #include "platform/RuntimeEnabledFeatures.h"

87 #include "platform/ScriptForbiddenScope.h"	87 #include "platform/ScriptForbiddenScope.h"

88 #include "platform/TraceEvent.h"

89 #include "platform/UserGestureIndicator.h"	88 #include "platform/UserGestureIndicator.h"

90 #include "platform/network/HTTPParsers.h"	89 #include "platform/network/HTTPParsers.h"

91 #include "platform/network/ResourceRequest.h"	90 #include "platform/network/ResourceRequest.h"

92 #include "platform/scroll/ScrollAnimatorBase.h"	91 #include "platform/scroll/ScrollAnimatorBase.h"

	92 #include "platform/tracing/TraceEvent.h"

93 #include "platform/weborigin/SecurityOrigin.h"	93 #include "platform/weborigin/SecurityOrigin.h"

94 #include "platform/weborigin/SecurityPolicy.h"	94 #include "platform/weborigin/SecurityPolicy.h"

95 #include "platform/weborigin/Suborigin.h"	95 #include "platform/weborigin/Suborigin.h"

96 #include "public/platform/WebCachePolicy.h"	96 #include "public/platform/WebCachePolicy.h"

97 #include "public/platform/WebURLRequest.h"	97 #include "public/platform/WebURLRequest.h"

98 #include "wtf/AutoReset.h"	98 #include "wtf/AutoReset.h"

99 #include "wtf/text/CString.h"	99 #include "wtf/text/CString.h"

100 #include "wtf/text/WTFString.h"	100 #include "wtf/text/WTFString.h"

101 #include <memory>	101 #include <memory>

102	102

(...skipping 1565 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1668 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());	1668 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());

1669 return tracedValue;	1669 return tracedValue;

1670 }	1670 }

1671	1671

1672 inline void FrameLoader::takeObjectSnapshot() const	1672 inline void FrameLoader::takeObjectSnapshot() const

1673 {	1673 {

1674 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());	1674 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());

1675 }	1675 }

1676	1676

1677 } // namespace blink	1677 } // namespace blink

OLD	NEW