<!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>[193292] branches/safari-601-branch/Source</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/193292">193292</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:07:21 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191732">r191732</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorPageAgentcpp">branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorResourceAgentcpp">branches/safari-601-branch/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorTimelineAgentcpp">branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorTimelineAgenth">branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorTimelineRecordFactorycpp">branches/safari-601-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191732. rdar://problem/23221163
+
+ 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Clean up and audit TimelineRecordFactory records
+ https://bugs.webkit.org/show_bug.cgi?id=150660
+
+ Reviewed by Brian Burg.
+
+ Cleanup included removing unused methods and payload data that the
+ frontend wasn't likely to use. Also added ASCIILiteral and removed
+ unnecessary includes.
+
+ * inspector/InspectorNetworkAgent.cpp:
+ * inspector/InspectorPageAgent.cpp:
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willLayout):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createGenericRecord):
+ (WebCore::TimelineRecordFactory::createFunctionCallData):
+ (WebCore::TimelineRecordFactory::createConsoleProfileData):
+ (WebCore::TimelineRecordFactory::createEventDispatchData):
+ (WebCore::TimelineRecordFactory::createGenericTimerData):
+ (WebCore::TimelineRecordFactory::createTimerInstallData):
+ (WebCore::TimelineRecordFactory::createEvaluateScriptData):
+ (WebCore::TimelineRecordFactory::createTimeStampData):
+ (WebCore::TimelineRecordFactory::createParseHTMLData):
+ (WebCore::TimelineRecordFactory::createAnimationFrameData):
+ (WebCore::TimelineRecordFactory::createPaintData):
+ (WebCore::TimelineRecordFactory::appendLayoutRoot):
+ (WebCore::TimelineRecordFactory::createBackgroundRecord): Deleted.
+ (WebCore::TimelineRecordFactory::createLayoutData): Deleted.
+ * inspector/TimelineRecordFactory.h:
+ (WebCore::TimelineRecordFactory::TimelineRecordFactory):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191651. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-27 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> #include <inspector/IdentifiersFactory.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><ins>+#include <wtf/Stopwatch.h>
</ins><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <yarr/RegularExpression.h>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorResourceAgent.cpp (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <inspector/ScriptCallStackFactory.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/Stopwatch.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -39,20 +39,14 @@
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><del>-#include "IntRect.h"
</del><span class="cx"> #include "JSDOMWindow.h"
</span><del>-#include "MainFrame.h"
</del><span class="cx"> #include "PageScriptDebugServer.h"
</span><del>-#include "RenderElement.h"
</del><span class="cx"> #include "RenderView.h"
</span><del>-#include "ResourceRequest.h"
-#include "ResourceResponse.h"
</del><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include "TimelineRecordFactory.h"
</span><del>-#include <inspector/IdentifiersFactory.h>
</del><span class="cx"> #include <inspector/ScriptBreakpoint.h>
</span><span class="cx"> #include <profiler/LegacyProfiler.h>
</span><del>-#include <wtf/CurrentTime.h>
</del><ins>+#include <wtf/Stopwatch.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "RuntimeApplicationChecksIOS.h"
</span><span class="lines">@@ -349,20 +343,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::willLayout(Frame& frame)
</span><span class="cx"> {
</span><del>- RenderObject* root = frame.view()->layoutRoot();
- bool partialLayout = !!root;
-
- if (!partialLayout)
- root = frame.contentRenderer();
-
- unsigned dirtyObjects = 0;
- unsigned totalObjects = 0;
- for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
- ++totalObjects;
- if (o->needsLayout())
- ++dirtyObjects;
- }
- pushCurrentRecord(TimelineRecordFactory::createLayoutData(dirtyObjects, totalObjects, partialLayout), TimelineRecordType::Layout, true, &frame);
</del><ins>+ pushCurrentRecord(InspectorObject::create(), TimelineRecordType::Layout, true, &frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::didLayout(RenderObject* root)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.h (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -38,9 +38,7 @@
</span><span class="cx"> #include <inspector/InspectorFrontendDispatchers.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <inspector/ScriptDebugListener.h>
</span><del>-#include <wtf/Stopwatch.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/WeakPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class Profile;
</span><span class="lines">@@ -59,8 +57,6 @@
</span><span class="cx"> class Page;
</span><span class="cx"> class PageScriptDebugServer;
</span><span class="cx"> class RenderObject;
</span><del>-class ResourceRequest;
-class ResourceResponse;
</del><span class="cx"> class RunLoopObserver;
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -34,11 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><del>-#include "IntRect.h"
</del><span class="cx"> #include "JSMainThreadExecState.h"
</span><del>-#include "LayoutRect.h"
-#include "ResourceRequest.h"
-#include "ResourceResponse.h"
</del><span class="cx"> #include <inspector/InspectorProtocolObjects.h>
</span><span class="cx"> #include <inspector/ScriptBreakpoint.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="lines">@@ -52,12 +48,12 @@
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createGenericRecord(double startTime, int maxCallStackDepth)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> record = InspectorObject::create();
</span><del>- record->setDouble("startTime", startTime);
</del><ins>+ record->setDouble(ASCIILiteral("startTime"), startTime);
</ins><span class="cx">
</span><span class="cx"> if (maxCallStackDepth) {
</span><span class="cx"> RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), maxCallStackDepth);
</span><span class="cx"> if (stackTrace && stackTrace->size())
</span><del>- record->setValue("stackTrace", stackTrace->buildInspectorArray());
</del><ins>+ record->setValue(ASCIILiteral("stackTrace"), stackTrace->buildInspectorArray());
</ins><span class="cx"> }
</span><span class="cx"> return WTF::move(record);
</span><span class="cx"> }
</span><span class="lines">@@ -80,15 +76,15 @@
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createFunctionCallData(const String& scriptName, int scriptLine)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setString("scriptName", scriptName);
- data->setInteger("scriptLine", scriptLine);
</del><ins>+ data->setString(ASCIILiteral("scriptName"), scriptName);
+ data->setInteger(ASCIILiteral("scriptLine"), scriptLine);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createConsoleProfileData(const String& title)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setString("title", title);
</del><ins>+ data->setString(ASCIILiteral("title"), title);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -103,23 +99,23 @@
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createEventDispatchData(const Event& event)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setString("type", event.type().string());
</del><ins>+ data->setString(ASCIILiteral("type"), event.type().string());
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createGenericTimerData(int timerId)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setInteger("timerId", timerId);
</del><ins>+ data->setInteger(ASCIILiteral("timerId"), timerId);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createTimerInstallData(int timerId, int timeout, bool singleShot)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setInteger("timerId", timerId);
- data->setInteger("timeout", timeout);
- data->setBoolean("singleShot", singleShot);
</del><ins>+ data->setInteger(ASCIILiteral("timerId"), timerId);
+ data->setInteger(ASCIILiteral("timeout"), timeout);
+ data->setBoolean(ASCIILiteral("singleShot"), singleShot);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,38 +137,29 @@
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createEvaluateScriptData(const String& url, double lineNumber)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setString("url", url);
- data->setInteger("lineNumber", lineNumber);
</del><ins>+ data->setString(ASCIILiteral("url"), url);
+ data->setInteger(ASCIILiteral("lineNumber"), lineNumber);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createTimeStampData(const String& message)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setString("message", message);
</del><ins>+ data->setString(ASCIILiteral("message"), message);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setInteger("dirtyObjects", dirtyObjects);
- data->setInteger("totalObjects", totalObjects);
- data->setBoolean("partialLayout", partialLayout);
- return WTF::move(data);
-}
-
</del><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned startLine)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setInteger("startLine", startLine);
</del><ins>+ data->setInteger(ASCIILiteral("startLine"), startLine);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createAnimationFrameData(int callbackId)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setInteger("id", callbackId);
</del><ins>+ data->setInteger(ASCIILiteral("id"), callbackId);
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -193,13 +180,13 @@
</span><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createPaintData(const FloatQuad& quad)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span><del>- data->setArray("clip", createQuad(quad));
</del><ins>+ data->setArray(ASCIILiteral("clip"), createQuad(quad));
</ins><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TimelineRecordFactory::appendLayoutRoot(InspectorObject* data, const FloatQuad& quad)
</span><span class="cx"> {
</span><del>- data->setArray("root", createQuad(quad));
</del><ins>+ data->setArray(ASCIILiteral("root"), createQuad(quad));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ref<Protocol::Timeline::CPUProfileNodeAggregateCallInfo> buildAggregateCallInfoInspectorObject(const JSC::ProfileNode* node)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191732. rdar://problem/23221163
+
+ 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Clean up and audit TimelineRecordFactory records
+ https://bugs.webkit.org/show_bug.cgi?id=150660
+
+ Reviewed by Brian Burg.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._processRecord):
+ (WebInspector.TimelineManager.prototype._processEvent):
+ Add FIXME for payload data which we are not yet using but could.
+ Fix typo in some rAF records where we were mistakenly using "timerId"
+ instead of "id" for the request identifier.
+
+ * UserInterface/Models/ScriptTimelineRecord.js:
+ (WebInspector.ScriptTimelineRecord.EventType.displayName):
+ Display the now correctly accessed rAF identifier in the Scripts timeline.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191715. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-28 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx"> localizedStrings["An unexpected error occurred."] = "An unexpected error occurred.";
</span><span class="cx"> localizedStrings["Angle"] = "Angle";
</span><span class="cx"> localizedStrings["Animation"] = "Animation";
</span><ins>+localizedStrings["Animation Frame %s Canceled"] = "Animation Frame %s Canceled";
+localizedStrings["Animation Frame %s Fired"] = "Animation Frame %s Fired";
+localizedStrings["Animation Frame %s Requested"] = "Animation Frame %s Requested";
</ins><span class="cx"> localizedStrings["Animation Frame Canceled"] = "Animation Frame Canceled";
</span><span class="cx"> localizedStrings["Animation Frame Fired"] = "Animation Frame Fired";
</span><span class="cx"> localizedStrings["Animation Frame Requested"] = "Animation Frame Requested";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -384,6 +384,7 @@
</span><span class="cx"> console.assert(isNaN(endTime));
</span><span class="cx">
</span><span class="cx"> // Pass the startTime as the endTime since this record type has no duration.
</span><ins>+ // FIXME: Make use of "timeout" and "singleShot" payload properties.
</ins><span class="cx"> return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.TimerInstalled, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.timerId);
</span><span class="cx">
</span><span class="cx"> case TimelineAgent.EventType.TimerRemove:
</span><span class="lines">@@ -396,13 +397,13 @@
</span><span class="cx"> console.assert(isNaN(endTime));
</span><span class="cx">
</span><span class="cx"> // Pass the startTime as the endTime since this record type has no duration.
</span><del>- return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.AnimationFrameRequested, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.timerId);
</del><ins>+ return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.AnimationFrameRequested, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.id);
</ins><span class="cx">
</span><span class="cx"> case TimelineAgent.EventType.CancelAnimationFrame:
</span><span class="cx"> console.assert(isNaN(endTime));
</span><span class="cx">
</span><span class="cx"> // Pass the startTime as the endTime since this record type has no duration.
</span><del>- return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.AnimationFrameCanceled, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.timerId);
</del><ins>+ return new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.AnimationFrameCanceled, startTime, startTime, callFrames, sourceCodeLocation, recordPayload.data.id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return null;
</span><span class="lines">@@ -412,6 +413,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (recordPayload.type) {
</span><span class="cx"> case TimelineAgent.EventType.TimeStamp:
</span><ins>+ // FIXME: Make use of "message" payload properties.
</ins><span class="cx"> var timestamp = this.activeRecording.computeElapsedTime(recordPayload.startTime);
</span><span class="cx"> var eventMarker = new WebInspector.TimelineMarker(timestamp, WebInspector.TimelineMarker.Type.TimeStamp);
</span><span class="cx"> this._activeRecording.addEventMarker(eventMarker);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (193291 => 193292)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-12-03 19:07:12 UTC (rev 193291)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-12-03 19:07:21 UTC (rev 193292)
</span><span class="lines">@@ -348,10 +348,16 @@
</span><span class="cx"> return WebInspector.UIString("Timer %s Removed").format(details);
</span><span class="cx"> return WebInspector.UIString("Timer Removed");
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.AnimationFrameFired:
</span><ins>+ if (details && includeDetailsInMainTitle)
+ return WebInspector.UIString("Animation Frame %s Fired").format(details);
</ins><span class="cx"> return WebInspector.UIString("Animation Frame Fired");
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.AnimationFrameRequested:
</span><ins>+ if (details && includeDetailsInMainTitle)
+ return WebInspector.UIString("Animation Frame %s Requested").format(details);
</ins><span class="cx"> return WebInspector.UIString("Animation Frame Requested");
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.AnimationFrameCanceled:
</span><ins>+ if (details && includeDetailsInMainTitle)
+ return WebInspector.UIString("Animation Frame %s Canceled").format(details);
</ins><span class="cx"> return WebInspector.UIString("Animation Frame Canceled");
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>