<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195142] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195142">195142</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-15 12:57:37 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add kdebug_trace signposts for a few WebCore operations
https://bugs.webkit.org/show_bug.cgi?id=153136
rdar://problem/24208487
Reviewed by Sam Weinig.
Source/WebCore:
Add trace points for style recalc, layout, view painting and layer painting.
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* page/FrameView.cpp:
(WebCore::FrameView::layout):
(WebCore::FrameView::paintContents):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::platformCALayerPaintContents):
Source/WTF:
New header with the reserved WebKit component code, trace point codes, and
a stack-based helper that traces scope entry and exit.
The available range of trace point codes is arbitrarily segmented into WTF, JSC,
WebCore, WebKit and WebKit2.
* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/SystemTracing.h: Added.
(WTF::TraceScope::TraceScope):
(WTF::TraceScope::~TraceScope):
Tools:
Plist used by kdebug_trace() viewing tools.
* Tracing/SystemTracePoints.plist: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfSystemTracingh">trunk/Source/WTF/wtf/SystemTracing.h</a></li>
<li>trunk/Tools/Tracing/</li>
<li><a href="#trunkToolsTracingSystemTracePointsplist">trunk/Tools/Tracing/SystemTracePoints.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WTF/ChangeLog 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-15 Simon Fraser <simon.fraser@apple.com>
+
+ Add kdebug_trace signposts for a few WebCore operations
+ https://bugs.webkit.org/show_bug.cgi?id=153136
+ rdar://problem/24208487
+
+ Reviewed by Sam Weinig.
+
+ New header with the reserved WebKit component code, trace point codes, and
+ a stack-based helper that traces scope entry and exit.
+
+ The available range of trace point codes is arbitrarily segmented into WTF, JSC,
+ WebCore, WebKit and WebKit2.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+ * wtf/SystemTracing.h: Added.
+ (WTF::TraceScope::TraceScope):
+ (WTF::TraceScope::~TraceScope):
+
</ins><span class="cx"> 2016-01-15 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Fragmentation-free allocator for timeless and/or coupled allocations.
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -269,6 +269,7 @@
</span><span class="cx"> <ClInclude Include="..\wtf\Stopwatch.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\StringExtras.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\StringPrintStream.h" />
</span><ins>+ <ClInclude Include="..\wtf\SystemTracing.h" />
</ins><span class="cx"> <ClInclude Include="..\wtf\TemporaryChange.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\text\ASCIIFastPath.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\text\AtomicString.h" />
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> 0F9D3363165DBA73005AD387 /* PrintStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F9D335E165DBA73005AD387 /* PrintStream.h */; };
</span><span class="cx"> 0FB14E19180FA218009B6B4D /* Bag.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB14E18180FA218009B6B4D /* Bag.h */; };
</span><span class="cx"> 0FB14E1B1810E1DC009B6B4D /* BagToHashMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB14E1A1810E1DA009B6B4D /* BagToHashMap.h */; };
</span><ins>+ 0FB317C41C488001007E395A /* SystemTracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB317C31C488001007E395A /* SystemTracing.h */; };
</ins><span class="cx"> 0FC4488316FE9FE100844BE9 /* ProcessID.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4488216FE9FE100844BE9 /* ProcessID.h */; };
</span><span class="cx"> 0FC4EDE61696149600F65041 /* CommaPrinter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC4EDE51696149600F65041 /* CommaPrinter.h */; };
</span><span class="cx"> 0FD81AC5154FB22E00983E72 /* FastBitVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FD81AC4154FB22E00983E72 /* FastBitVector.h */; settings = {ATTRIBUTES = (); }; };
</span><span class="lines">@@ -346,6 +347,7 @@
</span><span class="cx"> 0F9D335E165DBA73005AD387 /* PrintStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FB14E18180FA218009B6B4D /* Bag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bag.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FB14E1A1810E1DA009B6B4D /* BagToHashMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BagToHashMap.h; sourceTree = "<group>"; };
</span><ins>+ 0FB317C31C488001007E395A /* SystemTracing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemTracing.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FC4488216FE9FE100844BE9 /* ProcessID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessID.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FC4EDE51696149600F65041 /* CommaPrinter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommaPrinter.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FD81AC4154FB22E00983E72 /* FastBitVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastBitVector.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -921,6 +923,7 @@
</span><span class="cx"> A748745117A0BDAE00FA04CB /* StringHashDumpContext.h */,
</span><span class="cx"> 0FDDBFA51666DFA300C55FEF /* StringPrintStream.cpp */,
</span><span class="cx"> 0FDDBFA61666DFA300C55FEF /* StringPrintStream.h */,
</span><ins>+ 0FB317C31C488001007E395A /* SystemTracing.h */,
</ins><span class="cx"> A8A4731A151A825B004123FF /* TemporaryChange.h */,
</span><span class="cx"> A8A4732F151A825B004123FF /* ThreadFunctionInvocation.h */,
</span><span class="cx"> A8A47330151A825B004123FF /* ThreadIdentifierDataPthreads.cpp */,
</span><span class="lines">@@ -1190,6 +1193,7 @@
</span><span class="cx"> A8A473DC151A825B004123FF /* InlineASM.h in Headers */,
</span><span class="cx"> A70DA0841799F04D00529A9B /* Insertion.h in Headers */,
</span><span class="cx"> 26147B0A15DDCCDC00DDB907 /* IntegerToStringConversion.h in Headers */,
</span><ins>+ 0FB317C41C488001007E395A /* SystemTracing.h in Headers */,
</ins><span class="cx"> 7CDD7FF8186D291E007433CD /* IteratorAdaptors.h in Headers */,
</span><span class="cx"> 7CDD7FFA186D2A54007433CD /* IteratorRange.h in Headers */,
</span><span class="cx"> 93AC91A818942FC400244939 /* LChar.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> Stopwatch.h
</span><span class="cx"> StringExtras.h
</span><span class="cx"> StringPrintStream.h
</span><ins>+ SystemTracing.h
</ins><span class="cx"> ThreadIdentifierDataPthreads.h
</span><span class="cx"> ThreadSafeRefCounted.h
</span><span class="cx"> ThreadSpecific.h
</span></span></pre></div>
<a id="trunkSourceWTFwtfSystemTracingh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/SystemTracing.h (0 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SystemTracing.h (rev 0)
+++ trunk/Source/WTF/wtf/SystemTracing.h 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -0,0 +1,99 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SystemTracing_h
+#define SystemTracing_h
+
+#if defined(__has_include) && __has_include(<System/sys/kdebug.h>)
+#include <System/sys/kdebug.h>
+#define HAVE_KDEBUG_H 1
+#endif
+
+// No namespaces because this file has to be includable from C and Objective-C.
+
+// Reserved component code. Do not change this.
+#define WEBKIT_COMPONENT 47
+
+// Trace point codes can be up to 14 bits (0-16383).
+// When adding or changing these codes, update Tools/Tracing/SystemTracePoints.plist to match.
+enum TracePointCode {
+ WTFRange = 0,
+
+ JavaScriptRange = 2500,
+
+ WebCoreRange = 5000,
+ StyleRecalcStart,
+ StyleRecalcEnd,
+ LayoutStart,
+ LayoutEnd,
+ PaintViewStart,
+ PaintViewEnd,
+ PaintLayerStart,
+ PaintLayerEnd,
+
+ WebKitRange = 10000,
+ WebKit2Range = 12000,
+};
+
+#ifdef __cplusplus
+
+namespace WTF {
+
+class TraceScope {
+public:
+
+#if HAVE(KDEBUG_H)
+ TraceScope(TracePointCode entryCode, TracePointCode exitCode)
+ : m_exitCode(exitCode)
+ {
+ kdebug_trace(ARIADNEDBG_CODE(WEBKIT_COMPONENT, entryCode), 0, 0, 0, 0);
+ }
+#else
+ TraceScope(TracePointCode, TracePointCode)
+ {
+ }
+#endif
+
+ ~TraceScope()
+ {
+#if HAVE(KDEBUG_H)
+ kdebug_trace(ARIADNEDBG_CODE(WEBKIT_COMPONENT, m_exitCode), 0, 0, 0, 0);
+#endif
+ }
+
+private:
+#if HAVE(KDEBUG_H)
+ TracePointCode m_exitCode;
+#endif
+};
+
+} // namespace WTF
+
+using WTF::TraceScope;
+
+#endif // __cplusplus
+
+#endif // SystemTracing_h
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WebCore/ChangeLog 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-15 Simon Fraser <simon.fraser@apple.com>
+
+ Add kdebug_trace signposts for a few WebCore operations
+ https://bugs.webkit.org/show_bug.cgi?id=153136
+ rdar://problem/24208487
+
+ Reviewed by Sam Weinig.
+
+ Add trace points for style recalc, layout, view painting and layer painting.
+
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyle):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::paintContents):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::platformCALayerPaintContents):
+
</ins><span class="cx"> 2016-01-15 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Use BumpArena for style sheet object tree.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/SystemTracing.h>
</ins><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx"> #include <wtf/text/StringBuffer.h>
</span><span class="cx"> #include <yarr/RegularExpression.h>
</span><span class="lines">@@ -1823,6 +1824,8 @@
</span><span class="cx"> if (m_inStyleRecalc)
</span><span class="cx"> return; // Guard against re-entrancy. -dwh
</span><span class="cx">
</span><ins>+ TraceScope tracingScope(StyleRecalcStart, StyleRecalcEnd);
+
</ins><span class="cx"> RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
</span><span class="cx"> AnimationUpdateBlock animationUpdateBlock(&m_frame->animation());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><ins>+#include <wtf/SystemTracing.h>
</ins><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="lines">@@ -1236,6 +1237,8 @@
</span><span class="cx"> if (!root || !root->needsLayout())
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ TraceScope tracingScope(LayoutStart, LayoutEnd);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (updateFixedPositionLayoutRect())
</span><span class="lines">@@ -4014,7 +4017,9 @@
</span><span class="cx">
</span><span class="cx"> if (m_layoutPhase == InViewSizeAdjust)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ TraceScope tracingScope(PaintViewStart, PaintViewEnd);
+
</ins><span class="cx"> ASSERT(m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout);
</span><span class="cx">
</span><span class="cx"> RenderView* renderView = this->renderView();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include <limits.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><ins>+#include <wtf/SystemTracing.h>
</ins><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -1446,6 +1447,8 @@
</span><span class="cx"> replayer.replay(clip);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ TraceScope tracingScope(PaintLayerStart, PaintLayerEnd);
</ins><span class="cx"> paintGraphicsLayerContents(context, clip);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195141 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-15 20:01:42 UTC (rev 195141)
+++ trunk/Tools/ChangeLog 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-15 Simon Fraser <simon.fraser@apple.com>
+
+ Add kdebug_trace signposts for a few WebCore operations
+ https://bugs.webkit.org/show_bug.cgi?id=153136
+ rdar://problem/24208487
+
+ Reviewed by Sam Weinig.
+
+ Plist used by kdebug_trace() viewing tools.
+
+ * Tracing/SystemTracePoints.plist: Added.
+
</ins><span class="cx"> 2016-01-14 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [webkitdirs] Replaced grep invocation with perl code
</span></span></pre></div>
<a id="trunkToolsTracingSystemTracePointsplist"></a>
<div class="addfile"><h4>Added: trunk/Tools/Tracing/SystemTracePoints.plist (0 => 195142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Tracing/SystemTracePoints.plist (rev 0)
+++ trunk/Tools/Tracing/SystemTracePoints.plist 2016-01-15 20:57:37 UTC (rev 195142)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ <plist version="1.0">
+ <array>
+ <dict>
+ <key>Name</key>
+ <string>WebKit</string>
+ <key>Children</key>
+ <array>
+ <dict>
+ <key>Name</key>
+ <string>Document::recalcStyle()</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>5001</string>
+ <key>CodeEnd</key>
+ <string>5002</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>FrameView::layout()</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>5003</string>
+ <key>CodeEnd</key>
+ <string>5004</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>FrameView::paintContents()</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>5005</string>
+ <key>CodeEnd</key>
+ <string>5006</string>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>GraphicsLayerCA::paintLayerContents()</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>5007</string>
+ <key>CodeEnd</key>
+ <string>5008</string>
+ </dict>
+ </array>
+ </dict>
+ </array>
+ </plist>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>