<!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>[171405] branches/safari-600.1-branch</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/171405">171405</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 22:27:26 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171195">r171195</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchLayoutTestsfastprofilerprofilewithnotitleexpectedtxt">branches/safari-600.1-branch/LayoutTests/fast/profiler/profile-with-no-title-expected.txt</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorebindingsjsScriptStatecpp">branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorebindingsjsScriptStateh">branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorInspectorControllercpp">branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorInspectorControllerh">branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorInspectorInstrumentationcpp">branches/safari-600.1-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorInspectorTimelineAgentcpp">branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorInspectorTimelineAgenth">branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorInstrumentingAgentscpp">branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorInstrumentingAgentsh">branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorTimelineRecordFactorycpp">branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorTimelineRecordFactoryh">branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreinspectorprotocolTimelinejson">branches/safari-600.1-branch/Source/WebCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepagePageConsolecpp">branches/safari-600.1-branch/Source/WebCore/page/PageConsole.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceProtocolTimelineObserverjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineIconscss">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordTreeElementjs">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacChangeLog">branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacWebInspectorWebInspectormm">branches/safari-600.1-branch/Source/WebKit/mac/WebInspector/WebInspector.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebPageWebInspectorcpp">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesTimelineRecordConsoleProfilesvg">branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/TimelineRecordConsoleProfile.svg</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>branches/safari-600.1-branch/LayoutTests/inspector-protocol/profiler/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171195.
+
+ 2014-07-17 Timothy Hatcher <timothy@apple.com>
+
+ Make console.profile record to the Timeline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=134643
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::setJavaScriptProfilingEnabled):
+ (WebKit::WebInspector::startJavaScriptProfiling):
+ (WebKit::WebInspector::stopJavaScriptProfiling):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171184.
</span><span class="cx">
</span><span class="cx"> 2014-07-17 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsfastprofilerprofilewithnotitleexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/fast/profiler/profile-with-no-title-expected.txt (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/fast/profiler/profile-with-no-title-expected.txt 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/LayoutTests/fast/profiler/profile-with-no-title-expected.txt 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">
</span><span class="cx"> To run this test manually, load it in the browser then load the WebInspector and look at the profile. If there is a profile that is sufficient for this test.
</span><span class="cx">
</span><del>-Profile title: org.webkit.profiles.user-initiated.1
</del><ins>+Profile title:
</ins><span class="cx"> Thread_1 (no file) (line 0:0)
</span><span class="cx"> startTest profile-with-no-title.html (line 11:1)
</span><span class="cx"> endTest profiler-test-JS-resources.js (line 1:20)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -1,5 +1,69 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171195.
+
+ 2014-07-17 Timothy Hatcher <timothy@apple.com>
+
+ Make console.profile record to the Timeline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=134643
+
+ Reviewed by Joseph Pecoraro.
+
+ Passes existing profiler tests in fast/profiler.
+
+ * bindings/js/ScriptState.cpp:
+ (WebCore::domWindowFromExecState):
+ (WebCore::frameFromExecState):
+ (WebCore::scriptExecutionContextFromExecState):
+ (WebCore::mainWorldExecState):
+ (WebCore::execStateFromNode):
+ * bindings/js/ScriptState.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::profilerEnabled):
+ (WebCore::InspectorController::setProfilerEnabled):
+ * inspector/InspectorController.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::startProfilingImpl):
+ (WebCore::InspectorInstrumentation::stopProfilingImpl):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorTimelineAgent::start):
+ (WebCore::InspectorTimelineAgent::stop):
+ (WebCore::startProfiling):
+ (WebCore::stopProfiling):
+ (WebCore::InspectorTimelineAgent::startFromConsole):
+ (WebCore::InspectorTimelineAgent::stopFromConsole):
+ (WebCore::InspectorTimelineAgent::didWriteHTML):
+ (WebCore::InspectorTimelineAgent::breakpointActionProbe):
+ (WebCore::toProtocol):
+ (WebCore::InspectorTimelineAgent::addRecordToTimeline):
+ (WebCore::InspectorTimelineAgent::didCompleteRecordEntry):
+ (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
+ (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+ (WebCore::InspectorTimelineAgent::sendEvent):
+ (WebCore::InspectorTimelineAgent::createRecordEntry):
+ (WebCore::InspectorTimelineAgent::pushCurrentRecord):
+ * inspector/InspectorTimelineAgent.h:
+ (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
+ (WebCore::InspectorTimelineAgent::pushCurrentRecord):
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ (WebCore::InstrumentingAgents::reset):
+ * inspector/InstrumentingAgents.h:
+ (WebCore::InstrumentingAgents::persistentInspectorTimelineAgent):
+ (WebCore::InstrumentingAgents::setPersistentInspectorTimelineAgent):
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createConsoleProfileData):
+ * inspector/TimelineRecordFactory.h:
+ * inspector/protocol/Timeline.json:
+ * page/PageConsole.cpp:
+ (WebCore::PageConsole::profileEnd):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171188.
</span><span class="cx">
</span><span class="cx"> 2014-07-16 Sam Weinig <sam@webkit.org>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorebindingsjsScriptStatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -51,22 +51,29 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::JSGlobalObject* globalObject = scriptState->lexicalGlobalObject();
</span><span class="cx"> if (!globalObject->inherits(JSDOMWindowBase::info()))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return &JSC::jsCast<JSDOMWindowBase*>(globalObject)->impl();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Frame* frameFromExecState(JSC::ExecState* scriptState)
+{
+ ScriptExecutionContext* context = scriptExecutionContextFromExecState(scriptState);
+ Document* document = context && context->isDocument() ? toDocument(context) : nullptr;
+ return document ? document->frame() : nullptr;
+}
+
</ins><span class="cx"> ScriptExecutionContext* scriptExecutionContextFromExecState(JSC::ExecState* scriptState)
</span><span class="cx"> {
</span><span class="cx"> JSC::JSGlobalObject* globalObject = scriptState->lexicalGlobalObject();
</span><span class="cx"> if (!globalObject->inherits(JSDOMGlobalObject::info()))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return JSC::jsCast<JSDOMGlobalObject*>(globalObject)->scriptExecutionContext();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* mainWorldExecState(Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> if (!frame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> JSDOMWindowShell* shell = frame->script().windowShell(mainThreadNormalWorld());
</span><span class="cx"> return shell->window()->globalExec();
</span><span class="cx"> }
</span><span class="lines">@@ -74,12 +81,12 @@
</span><span class="cx"> JSC::ExecState* execStateFromNode(DOMWrapperWorld& world, Node* node)
</span><span class="cx"> {
</span><span class="cx"> if (!node)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> Frame* frame = node->document().frame();
</span><span class="cx"> if (!frame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> if (!frame->script().canExecuteScripts(NotAboutToExecuteScript))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return frame->script().globalObject(world)->globalExec();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorebindingsjsScriptStateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.h (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.h 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/bindings/js/ScriptState.h 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> typedef JSC::ExecState ScriptState;
</span><span class="cx">
</span><span class="cx"> DOMWindow* domWindowFromExecState(JSC::ExecState*);
</span><ins>+Frame* frameFromExecState(JSC::ExecState*);
</ins><span class="cx"> ScriptExecutionContext* scriptExecutionContextFromExecState(JSC::ExecState*);
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* mainWorldExecState(Frame*);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> m_agents.append(WTF::move(domStorageAgentPtr));
</span><span class="cx">
</span><span class="cx"> auto timelineAgentPtr = std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), pageAgent, InspectorTimelineAgent::PageInspector, inspectorClient);
</span><del>- InspectorTimelineAgent* timelineAgent = timelineAgentPtr.get();
</del><ins>+ m_timelineAgent = timelineAgentPtr.get();
</ins><span class="cx"> m_agents.append(WTF::move(timelineAgentPtr));
</span><span class="cx">
</span><span class="cx"> auto resourceAgentPtr = std::make_unique<InspectorResourceAgent>(m_instrumentingAgents.get(), pageAgent, inspectorClient);
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</span><del>- timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</del><ins>+ m_timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</ins><span class="cx"> m_profilerAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -380,16 +380,18 @@
</span><span class="cx">
</span><span class="cx"> bool InspectorController::profilerEnabled() const
</span><span class="cx"> {
</span><del>- return m_profilerAgent->enabled();
</del><ins>+ return m_instrumentingAgents->inspectorTimelineAgent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorController::setProfilerEnabled(bool enable)
</span><span class="cx"> {
</span><del>- ErrorString error;
- if (enable)
- m_profilerAgent->enable(&error);
- else
- m_profilerAgent->disable(&error);
</del><ins>+ if (enable) {
+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(m_timelineAgent);
+ m_timelineAgent->start();
+ } else {
+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
+ m_timelineAgent->stop();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorController::resume()
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.h (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.h 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/InspectorController.h 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> class InspectorFrontendClient;
</span><span class="cx"> class InspectorPageAgent;
</span><span class="cx"> class InspectorResourceAgent;
</span><ins>+class InspectorTimelineAgent;
</ins><span class="cx"> class InstrumentingAgents;
</span><span class="cx"> class Node;
</span><span class="cx"> class Page;
</span><span class="lines">@@ -144,6 +145,7 @@
</span><span class="cx"> PageDebuggerAgent* m_debuggerAgent;
</span><span class="cx"> InspectorDOMDebuggerAgent* m_domDebuggerAgent;
</span><span class="cx"> Inspector::InspectorProfilerAgent* m_profilerAgent;
</span><ins>+ InspectorTimelineAgent* m_timelineAgent;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Inspector::InspectorBackendDispatcher> m_inspectorBackendDispatcher;
</span><span class="cx"> std::unique_ptr<InspectorFrontendClient> m_inspectorFrontendClient;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -945,14 +945,14 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::startProfilingImpl(InstrumentingAgents* instrumentingAgents, JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
- profilerAgent->startProfiling(title, exec);
</del><ins>+ if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->persistentInspectorTimelineAgent())
+ timelineAgent->startFromConsole(exec, title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<JSC::Profile> InspectorInstrumentation::stopProfilingImpl(InstrumentingAgents* instrumentingAgents, JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
- return profilerAgent->stopProfiling(title, exec);
</del><ins>+ if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->persistentInspectorTimelineAgent())
+ return timelineAgent->stopFromConsole(exec, title);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = std::make_unique<InspectorTimelineFrontendDispatcher>(frontendChannel);
</span><span class="cx"> m_backendDispatcher = InspectorTimelineBackendDispatcher::create(backendDispatcher, this);
</span><ins>+
+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</span><span class="lines">@@ -81,15 +83,14 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><ins>+ m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
+
</ins><span class="cx"> ErrorString error;
</span><span class="cx"> stop(&error);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth)
</span><span class="cx"> {
</span><del>- if (!m_frontendDispatcher)
- return;
-
</del><span class="cx"> if (maxCallStackDepth && *maxCallStackDepth > 0)
</span><span class="cx"> m_maxCallStackDepth = *maxCallStackDepth;
</span><span class="cx"> else
</span><span class="lines">@@ -103,6 +104,9 @@
</span><span class="cx"> m_scriptDebugServer->addListener(this);
</span><span class="cx">
</span><span class="cx"> m_enabled = true;
</span><ins>+
+ if (m_frontendDispatcher)
+ m_frontendDispatcher->recordingStarted();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::stop(ErrorString*)
</span><span class="lines">@@ -110,7 +114,6 @@
</span><span class="cx"> if (!m_enabled)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_weakFactory.revokeAll();
</del><span class="cx"> m_instrumentingAgents->setInspectorTimelineAgent(nullptr);
</span><span class="cx">
</span><span class="cx"> if (m_scriptDebugServer)
</span><span class="lines">@@ -119,6 +122,9 @@
</span><span class="cx"> clearRecordStack();
</span><span class="cx">
</span><span class="cx"> m_enabled = false;
</span><ins>+
+ if (m_frontendDispatcher)
+ m_frontendDispatcher->recordingStopped();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::setPageScriptDebugServer(PageScriptDebugServer* scriptDebugServer)
</span><span class="lines">@@ -129,16 +135,76 @@
</span><span class="cx"> m_scriptDebugServer = scriptDebugServer;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline void startProfiling(JSC::ExecState* exec, const String& title)
+{
+ JSC::LegacyProfiler::profiler()->startProfiling(exec, title);
+}
+
+static inline PassRefPtr<JSC::Profile> stopProfiling(JSC::ExecState* exec, const String& title)
+{
+ return JSC::LegacyProfiler::profiler()->stopProfiling(exec, title);
+}
+
</ins><span class="cx"> static inline void startProfiling(Frame* frame, const String& title)
</span><span class="cx"> {
</span><del>- JSC::LegacyProfiler::profiler()->startProfiling(toJSDOMWindow(frame, debuggerWorld())->globalExec(), title);
</del><ins>+ startProfiling(toJSDOMWindow(frame, debuggerWorld())->globalExec(), title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline PassRefPtr<JSC::Profile> stopProfiling(Frame* frame, const String& title)
</span><span class="cx"> {
</span><del>- return JSC::LegacyProfiler::profiler()->stopProfiling(toJSDOMWindow(frame, debuggerWorld())->globalExec(), title);
</del><ins>+ return stopProfiling(toJSDOMWindow(frame, debuggerWorld())->globalExec(), title);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorTimelineAgent::startFromConsole(JSC::ExecState* exec, const String &title)
+{
+ // Only allow recording of a profile if it is anonymous (empty title) or does not match
+ // the title of an already recording profile.
+ if (!title.isEmpty()) {
+ for (const TimelineRecordEntry& record : m_pendingConsoleProfileRecords) {
+ String recordTitle;
+ record.data->getString(ASCIILiteral("title"), &recordTitle);
+ if (recordTitle == title)
+ return;
+ }
+ }
+
+ if (m_pendingConsoleProfileRecords.isEmpty())
+ start();
+
+ startProfiling(exec, title);
+
+ m_pendingConsoleProfileRecords.append(createRecordEntry(TimelineRecordFactory::createConsoleProfileData(title), TimelineRecordType::ConsoleProfile, true, frameFromExecState(exec)));
+}
+
+PassRefPtr<JSC::Profile> InspectorTimelineAgent::stopFromConsole(JSC::ExecState* exec, const String& title)
+{
+ // Stop profiles in reverse order. If the title is empty, then stop the last profile.
+ // Otherwise, match the title of the profile to stop.
+ for (ptrdiff_t i = m_pendingConsoleProfileRecords.size() - 1; i >= 0; --i) {
+ const TimelineRecordEntry& record = m_pendingConsoleProfileRecords[i];
+
+ String recordTitle;
+ record.data->getString(ASCIILiteral("title"), &recordTitle);
+
+ if (title.isEmpty() || recordTitle == title) {
+ RefPtr<JSC::Profile> profile = stopProfiling(exec, title);
+ if (profile)
+ TimelineRecordFactory::appendProfile(record.data.get(), profile);
+
+ didCompleteRecordEntry(record);
+
+ m_pendingConsoleProfileRecords.remove(i);
+
+ if (m_pendingConsoleProfileRecords.isEmpty())
+ stop();
+
+ return profile.release();
+ }
+ }
+
+ return nullptr;
+}
+
</ins><span class="cx"> void InspectorTimelineAgent::willCallFunction(const String& scriptName, int scriptLine, Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> pushCurrentRecord(TimelineRecordFactory::createFunctionCallData(scriptName, scriptLine), TimelineRecordType::FunctionCall, true, frame);
</span><span class="lines">@@ -264,7 +330,7 @@
</span><span class="cx"> void InspectorTimelineAgent::didWriteHTML(unsigned endLine)
</span><span class="cx"> {
</span><span class="cx"> if (!m_recordStack.isEmpty()) {
</span><del>- TimelineRecordEntry entry = m_recordStack.last();
</del><ins>+ const TimelineRecordEntry& entry = m_recordStack.last();
</ins><span class="cx"> entry.data->setNumber("endLine", endLine);
</span><span class="cx"> didCompleteCurrentRecord(TimelineRecordType::ParseHTML);
</span><span class="cx"> }
</span><span class="lines">@@ -457,10 +523,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(exec);
</span><span class="cx">
</span><del>- ScriptExecutionContext* context = scriptExecutionContextFromExecState(exec);
- Document* document = (context && context->isDocument()) ? toDocument(context) : nullptr;
- Frame* frame = document ? document->frame() : nullptr;
- appendRecord(TimelineRecordFactory::createProbeSampleData(action, hitCount), TimelineRecordType::ProbeSample, false, frame);
</del><ins>+ appendRecord(TimelineRecordFactory::createProbeSampleData(action, hitCount), TimelineRecordType::ProbeSample, false, frameFromExecState(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Inspector::TypeBuilder::Timeline::EventType::Enum toProtocol(TimelineRecordType type)
</span><span class="lines">@@ -528,6 +591,8 @@
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::FunctionCall;
</span><span class="cx"> case TimelineRecordType::ProbeSample:
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::ProbeSample;
</span><ins>+ case TimelineRecordType::ConsoleProfile:
+ return Inspector::TypeBuilder::Timeline::EventType::ConsoleProfile;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::RequestAnimationFrame:
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::RequestAnimationFrame;
</span><span class="lines">@@ -558,7 +623,7 @@
</span><span class="cx"> if (m_recordStack.isEmpty())
</span><span class="cx"> sendEvent(record.release());
</span><span class="cx"> else {
</span><del>- TimelineRecordEntry parent = m_recordStack.last();
</del><ins>+ const TimelineRecordEntry& parent = m_recordStack.last();
</ins><span class="cx"> parent.children->pushObject(record.release());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -573,6 +638,14 @@
</span><span class="cx"> record->setString("frameId", frameId);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorTimelineAgent::didCompleteRecordEntry(const TimelineRecordEntry& entry)
+{
+ entry.record->setObject(ASCIILiteral("data"), entry.data);
+ entry.record->setArray(ASCIILiteral("children"), entry.children);
+ entry.record->setNumber(ASCIILiteral("endTime"), timestamp());
+ addRecordToTimeline(entry.record, entry.type);
+}
+
</ins><span class="cx"> void InspectorTimelineAgent::didCompleteCurrentRecord(TimelineRecordType type)
</span><span class="cx"> {
</span><span class="cx"> // An empty stack could merely mean that the timeline agent was turned on in the middle of
</span><span class="lines">@@ -580,11 +653,8 @@
</span><span class="cx"> if (!m_recordStack.isEmpty()) {
</span><span class="cx"> TimelineRecordEntry entry = m_recordStack.last();
</span><span class="cx"> m_recordStack.removeLast();
</span><del>- ASSERT(entry.type == type);
- entry.record->setObject("data", entry.data);
- entry.record->setArray("children", entry.children);
- entry.record->setNumber("endTime", timestamp());
- addRecordToTimeline(entry.record, type);
</del><ins>+ ASSERT_UNUSED(type, entry.type == type);
+ didCompleteRecordEntry(entry);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -596,7 +666,6 @@
</span><span class="cx"> , m_maxCallStackDepth(5)
</span><span class="cx"> , m_inspectorType(type)
</span><span class="cx"> , m_client(client)
</span><del>- , m_weakFactory(this)
</del><span class="cx"> , m_enabled(false)
</span><span class="cx"> , m_recordingProfile(false)
</span><span class="cx"> {
</span><span class="lines">@@ -612,18 +681,26 @@
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::sendEvent(PassRefPtr<InspectorObject> event)
</span><span class="cx"> {
</span><ins>+ if (!m_frontendDispatcher)
+ return;
+
</ins><span class="cx"> // FIXME: runtimeCast is a hack. We do it because we can't build TimelineEvent directly now.
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Timeline::TimelineEvent> recordChecked = Inspector::TypeBuilder::Timeline::TimelineEvent::runtimeCast(event);
</span><span class="cx"> m_frontendDispatcher->eventRecorded(recordChecked.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<InspectorObject> data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</del><ins>+InspectorTimelineAgent::TimelineRecordEntry InspectorTimelineAgent::createRecordEntry(PassRefPtr<InspectorObject> data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
</span><span class="cx"> setFrameIdentifier(record.get(), frame);
</span><del>- m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type));
</del><ins>+ return TimelineRecordEntry(record.release(), data, InspectorArray::create(), type);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<InspectorObject> data, TimelineRecordType type, bool captureCallStack, Frame* frame)
+{
+ pushCurrentRecord(createRecordEntry(data, type, captureCallStack, frame));
+}
+
</ins><span class="cx"> void InspectorTimelineAgent::clearRecordStack()
</span><span class="cx"> {
</span><span class="cx"> m_recordStack.clear();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.h (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -43,6 +43,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><ins>+namespace JSC {
+class Profile;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Event;
</span><span class="lines">@@ -97,6 +101,7 @@
</span><span class="cx">
</span><span class="cx"> FunctionCall,
</span><span class="cx"> ProbeSample,
</span><ins>+ ConsoleProfile,
</ins><span class="cx">
</span><span class="cx"> RequestAnimationFrame,
</span><span class="cx"> CancelAnimationFrame,
</span><span class="lines">@@ -136,8 +141,8 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual void start(ErrorString*, const int* maxCallStackDepth) override;
- virtual void stop(ErrorString*) override;
</del><ins>+ virtual void start(ErrorString* = nullptr, const int* maxCallStackDepth = nullptr) override;
+ virtual void stop(ErrorString* = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> int id() const { return m_id; }
</span><span class="cx">
</span><span class="lines">@@ -146,6 +151,9 @@
</span><span class="cx"> void didCommitLoad();
</span><span class="cx">
</span><span class="cx"> // Methods called from WebCore.
</span><ins>+ void startFromConsole(JSC::ExecState*, const String &title);
+ PassRefPtr<JSC::Profile> stopFromConsole(JSC::ExecState*, const String& title);
+
</ins><span class="cx"> void willCallFunction(const String& scriptName, int scriptLine, Frame*);
</span><span class="cx"> void didCallFunction(Frame*);
</span><span class="cx">
</span><span class="lines">@@ -224,10 +232,13 @@
</span><span class="cx"> friend class TimelineRecordStack;
</span><span class="cx">
</span><span class="cx"> struct TimelineRecordEntry {
</span><ins>+ TimelineRecordEntry()
+ : type(TimelineRecordType::EventDispatch) { }
</ins><span class="cx"> TimelineRecordEntry(PassRefPtr<Inspector::InspectorObject> record, PassRefPtr<Inspector::InspectorObject> data, PassRefPtr<Inspector::InspectorArray> children, TimelineRecordType type)
</span><span class="cx"> : record(record), data(data), children(children), type(type)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> RefPtr<Inspector::InspectorObject> record;
</span><span class="cx"> RefPtr<Inspector::InspectorObject> data;
</span><span class="cx"> RefPtr<Inspector::InspectorArray> children;
</span><span class="lines">@@ -237,9 +248,13 @@
</span><span class="cx"> void sendEvent(PassRefPtr<Inspector::InspectorObject>);
</span><span class="cx"> void appendRecord(PassRefPtr<Inspector::InspectorObject> data, TimelineRecordType, bool captureCallStack, Frame*);
</span><span class="cx"> void pushCurrentRecord(PassRefPtr<Inspector::InspectorObject>, TimelineRecordType, bool captureCallStack, Frame*);
</span><ins>+ void pushCurrentRecord(const TimelineRecordEntry& record) { m_recordStack.append(record); }
</ins><span class="cx">
</span><ins>+ TimelineRecordEntry createRecordEntry(PassRefPtr<Inspector::InspectorObject> data, TimelineRecordType, bool captureCallStack, Frame*);
+
</ins><span class="cx"> void setFrameIdentifier(Inspector::InspectorObject* record, Frame*);
</span><span class="cx">
</span><ins>+ void didCompleteRecordEntry(const TimelineRecordEntry&);
</ins><span class="cx"> void didCompleteCurrentRecord(TimelineRecordType);
</span><span class="cx">
</span><span class="cx"> void addRecordToTimeline(PassRefPtr<Inspector::InspectorObject>, TimelineRecordType);
</span><span class="lines">@@ -264,8 +279,9 @@
</span><span class="cx"> int m_maxCallStackDepth;
</span><span class="cx"> InspectorType m_inspectorType;
</span><span class="cx"> InspectorClient* m_client;
</span><del>- WeakPtrFactory<InspectorTimelineAgent> m_weakFactory;
</del><span class="cx">
</span><ins>+ Vector<TimelineRecordEntry> m_pendingConsoleProfileRecords;
+
</ins><span class="cx"> bool m_enabled;
</span><span class="cx"> bool m_recordingProfile;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> , m_pageRuntimeAgent(nullptr)
</span><span class="cx"> , m_workerRuntimeAgent(nullptr)
</span><span class="cx"> , m_inspectorTimelineAgent(nullptr)
</span><ins>+ , m_persistentInspectorTimelineAgent(nullptr)
</ins><span class="cx"> , m_inspectorDOMStorageAgent(nullptr)
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> , m_inspectorReplayAgent(nullptr)
</span><span class="lines">@@ -84,6 +85,7 @@
</span><span class="cx"> m_pageRuntimeAgent = nullptr;
</span><span class="cx"> m_workerRuntimeAgent = nullptr;
</span><span class="cx"> m_inspectorTimelineAgent = nullptr;
</span><ins>+ m_persistentInspectorTimelineAgent = nullptr;
</ins><span class="cx"> m_inspectorDOMStorageAgent = nullptr;
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> m_inspectorReplayAgent = nullptr;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.h (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.h 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/InstrumentingAgents.h 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> InspectorTimelineAgent* inspectorTimelineAgent() const { return m_inspectorTimelineAgent; }
</span><span class="cx"> void setInspectorTimelineAgent(InspectorTimelineAgent* agent) { m_inspectorTimelineAgent = agent; }
</span><span class="cx">
</span><ins>+ InspectorTimelineAgent* persistentInspectorTimelineAgent() const { return m_persistentInspectorTimelineAgent; }
+ void setPersistentInspectorTimelineAgent(InspectorTimelineAgent* agent) { m_persistentInspectorTimelineAgent = agent; }
+
</ins><span class="cx"> InspectorDOMStorageAgent* inspectorDOMStorageAgent() const { return m_inspectorDOMStorageAgent; }
</span><span class="cx"> void setInspectorDOMStorageAgent(InspectorDOMStorageAgent* agent) { m_inspectorDOMStorageAgent = agent; }
</span><span class="cx">
</span><span class="lines">@@ -154,6 +157,7 @@
</span><span class="cx"> PageRuntimeAgent* m_pageRuntimeAgent;
</span><span class="cx"> WorkerRuntimeAgent* m_workerRuntimeAgent;
</span><span class="cx"> InspectorTimelineAgent* m_inspectorTimelineAgent;
</span><ins>+ InspectorTimelineAgent* m_persistentInspectorTimelineAgent;
</ins><span class="cx"> InspectorDOMStorageAgent* m_inspectorDOMStorageAgent;
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> InspectorReplayAgent* m_inspectorReplayAgent;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -90,6 +90,13 @@
</span><span class="cx"> return data.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createConsoleProfileData(const String& title)
+{
+ RefPtr<InspectorObject> data = InspectorObject::create();
+ data->setString("title", title);
+ return data.release();
+}
+
</ins><span class="cx"> PassRefPtr<InspectorObject> TimelineRecordFactory::createProbeSampleData(const ScriptBreakpointAction& action, int hitCount)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> data = InspectorObject::create();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorTimelineRecordFactoryh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.h (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.h 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/TimelineRecordFactory.h 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> static PassRefPtr<Inspector::InspectorObject> createGCEventData(const size_t usedHeapSizeDelta);
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<Inspector::InspectorObject> createFunctionCallData(const String& scriptName, int scriptLine);
</span><ins>+ static PassRefPtr<Inspector::InspectorObject> createConsoleProfileData(const String& title);
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<Inspector::InspectorObject> createProbeSampleData(const Inspector::ScriptBreakpointAction&, int hitCount);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/inspector/protocol/Timeline.json (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/inspector/protocol/Timeline.json 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/inspector/protocol/Timeline.json 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> {
</span><span class="cx"> "id": "EventType",
</span><span class="cx"> "type": "string",
</span><del>- "enum": ["EventDispatch", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "ProbeSample", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</del><ins>+ "enum": ["EventDispatch", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "ProbeSample", "ConsoleProfile", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</ins><span class="cx"> "description": "Timeline record type."
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -39,6 +39,14 @@
</span><span class="cx"> { "name": "record", "$ref": "TimelineEvent", "description": "Timeline event record data." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Fired for every instrumentation event while timeline is started."
</span><ins>+ },
+ {
+ "name": "recordingStarted",
+ "description": "Fired when recording has started."
+ },
+ {
+ "name": "recordingStopped",
+ "description": "Fired when recording has stopped."
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepagePageConsolecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/PageConsole.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/PageConsole.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebCore/page/PageConsole.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -170,8 +170,7 @@
</span><span class="cx">
</span><span class="cx"> void PageConsole::profileEnd(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- RefPtr<JSC::Profile> profile = InspectorInstrumentation::stopProfiling(&m_page, exec, title);
- if (profile)
</del><ins>+ if (RefPtr<JSC::Profile> profile = InspectorInstrumentation::stopProfiling(&m_page, exec, title))
</ins><span class="cx"> m_profiles.append(profile.release());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-07-17 Timothy Hatcher <timothy@apple.com>
+
+ Make console.profile record to the Timeline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=134643
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype.startCapturing):
+ (WebInspector.TimelineManager.prototype.stopCapturing):
+ (WebInspector.TimelineManager.prototype.capturingStarted):
+ (WebInspector.TimelineManager.prototype.capturingStopped):
+ (WebInspector.TimelineManager.prototype.eventRecorded.processRecord):
+ (WebInspector.TimelineManager.prototype.eventRecorded):
+ * UserInterface/Images/TimelineRecordConsoleProfile.svg: Added.
+ * UserInterface/Models/ScriptTimelineRecord.js:
+ * UserInterface/Protocol/TimelineObserver.js:
+ (WebInspector.TimelineObserver.prototype.eventRecorded):
+ (WebInspector.TimelineObserver.prototype.recordingStarted):
+ (WebInspector.TimelineObserver.prototype.recordingStopped):
+ * UserInterface/Views/TimelineIcons.css:
+ (.console-profile-record .icon):
+ * UserInterface/Views/TimelineRecordTreeElement.js:
+ (WebInspector.TimelineRecordTreeElement):
+
</ins><span class="cx"> 2014-07-16 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: TextContentView calls the wrong super function in shown()
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n d i t i o n " ] = " C o n d i t i o n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n d i t i o n a l e x p r e s s i o n " ] = " C o n d i t i o n a l e x p r e s s i o n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n s o l e " ] = " C o n s o l e " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " C o n s o l e P r o f i l e R e c o r d e d " ] = " C o n s o l e P r o f i l e R e c o r d e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n s o l e e r r o r s , c l i c k t o s h o w t h e C o n s o l e " ] = " C o n s o l e e r r o r s , c l i c k t o s h o w t h e C o n s o l e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n s o l e l o g s , c l i c k t o s h o w t h e C o n s o l e " ] = " C o n s o l e l o g s , c l i c k t o s h o w t h e C o n s o l e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " C o n s o l e w a r n i n g s , c l i c k t o s h o w t h e C o n s o l e " ] = " C o n s o l e w a r n i n g s , c l i c k t o s h o w t h e C o n s o l e " ;
</span><span class="lines">@@ -152,7 +153,6 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t c l i p s c o m p o s i t i n g d e s c e n d a n t s " ] = " E l e m e n t c l i p s c o m p o s i t i n g d e s c e n d a n t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t e s t a b l i s h e s a s t a c k i n g c o n t e x t " ] = " E l e m e n t e s t a b l i s h e s a s t a c k i n g c o n t e x t " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t h a s C S S b l e n d i n g a p p l i e d a n d c o m p o s i t e d d e s c e n d a n t s " ] = " E l e m e n t h a s C S S b l e n d i n g a p p l i e d a n d c o m p o s i t e d d e s c e n d a n t s " ;
</span><del>- l o c a l i z e d S t r i n g s [ " E l e m e n t i s a s t a c k i n g c o n t e x t a n d h a s c o m p o s i t e d d e s c e n d a n t s w i t h C S S b l e n d i n g a p p l i e d " ] = " E l e m e n t i s a s t a c k i n g c o n t e x t a n d h a s c o m p o s i t e d d e s c e n d a n t s w i t h C S S b l e n d i n g a p p l i e d " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t h a s C S S f i l t e r s a p p l i e d " ] = " E l e m e n t h a s C S S f i l t e r s a p p l i e d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t h a s C S S f i l t e r s a p p l i e d a n d c o m p o s i t e d d e s c e n d a n t s " ] = " E l e m e n t h a s C S S f i l t e r s a p p l i e d a n d c o m p o s i t e d d e s c e n d a n t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t h a s a 2 D t r a n s f o r m a n d c o m p o s i t e d d e s c e n d a n t s " ] = " E l e m e n t h a s a 2 D t r a n s f o r m a n d c o m p o s i t e d d e s c e n d a n t s " ;
</span><span class="lines">@@ -171,6 +171,7 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s < i f r a m e > " ] = " E l e m e n t i s < i f r a m e > " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s < v i d e o > " ] = " E l e m e n t i s < v i d e o > " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s a p l u g - i n " ] = " E l e m e n t i s a p l u g - i n " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " E l e m e n t i s a s t a c k i n g c o n t e x t a n d h a s c o m p o s i t e d d e s c e n d a n t s w i t h C S S b l e n d i n g a p p l i e d " ] = " E l e m e n t i s a s t a c k i n g c o n t e x t a n d h a s c o m p o s i t e d d e s c e n d a n t s w i t h C S S b l e n d i n g a p p l i e d " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s a n i m a t e d " ] = " E l e m e n t i s a n i m a t e d " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s m a s k e d a n d c o m p o s i t e d d e s c e n d a n t s " ] = " E l e m e n t i s m a s k e d a n d c o m p o s i t e d d e s c e n d a n t s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " E l e m e n t i s t h e r o o t e l e m e n t " ] = " E l e m e n t i s t h e r o o t e l e m e n t " ;
</span><span class="lines">@@ -216,9 +217,9 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " H T M L A t t r i b u t e s " ] = " H T M L A t t r i b u t e s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " H T T P " ] = " H T T P " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " H e i g h t " ] = " H e i g h t " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " H i d e R e p l a y C o n t r o l s " ] = " H i d e R e p l a y C o n t r o l s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " H i d e c o m p o s i t i n g b o r d e r s " ] = " H i d e c o m p o s i t i n g b o r d e r s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " H i d e c o n s o l e ( % s ) " ] = " H i d e c o n s o l e ( % s ) " ;
</span><del>- l o c a l i z e d S t r i n g s [ " H i d e R e p l a y C o n t r o l s " ] = " H i d e R e p l a y C o n t r o l s " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " H i d e s h a d o w D O M n o d e s " ] = " H i d e s h a d o w D O M n o d e s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " H i d e t h e % s d e t a i l s s i d e b a r " ] = " H i d e t h e % s d e t a i l s s i d e b a r " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " H i d e t h e % s d e t a i l s s i d e b a r ( % s ) " ] = " H i d e t h e % s d e t a i l s s i d e b a r ( % s ) " ;
</span><span class="lines">@@ -344,8 +345,8 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e f e r e n c e I s s u e " ] = " R e f e r e n c e I s s u e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e f l e c t i o n " ] = " R e f l e c t i o n " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e f r e s h " ] = " R e f r e s h " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " R e g i o n F l o w " ] = " R e g i o n F l o w " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " R e g i o n a n n o u n c e d i n i t s e n t i r e t y . " ] = " R e g i o n a n n o u n c e d i n i t s e n t i r e t y . " ;
</span><del>- l o c a l i z e d S t r i n g s [ " R e g i o n F l o w " ] = " R e g i o n F l o w " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " R e l o a d p a g e ( % s ) \ n R e l o a d i g n o r i n g c a c h e ( % s ) " ] = " R e l o a d p a g e ( % s ) \ n R e l o a d i g n o r i n g c a c h e ( % s ) " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e m o v a l s " ] = " R e m o v a l s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " R e m o v e t h i s b r e a k p o i n t a c t i o n " ] = " R e m o v e t h i s b r e a k p o i n t a c t i o n " ;
</span><span class="lines">@@ -387,11 +388,11 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h a r e d F o c u s " ] = " S h a r e d F o c u s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w A l l " ] = " S h o w A l l " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w A l l N o d e s ( % d M o r e ) " ] = " S h o w A l l N o d e s ( % d M o r e ) " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " S h o w R e p l a y C o n t r o l s " ] = " S h o w R e p l a y C o n t r o l s " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w c o m p o s i t i n g b o r d e r s " ] = " S h o w c o m p o s i t i n g b o r d e r s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w c o n s o l e ( % s ) " ] = " S h o w c o n s o l e ( % s ) " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w f u l l - h e i g h t c o n s o l e " ] = " S h o w f u l l - h e i g h t c o n s o l e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w f u n c t i o n d e f i n i t i o n " ] = " S h o w f u n c t i o n d e f i n i t i o n " ;
</span><del>- l o c a l i z e d S t r i n g s [ " S h o w R e p l a y C o n t r o l s " ] = " S h o w R e p l a y C o n t r o l s " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w s h a d o w D O M n o d e s " ] = " S h o w s h a d o w D O M n o d e s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w s p l i t c o n s o l e " ] = " S h o w s p l i t c o n s o l e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S h o w t h e % s d e t a i l s s i d e b a r " ] = " S h o w t h e % s d e t a i l s s i d e b a r " ;
</span><span class="lines">@@ -407,8 +408,8 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S o u r c e C o d e " ] = " S o u r c e C o d e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S p e l l i n g " ] = " S p e l l i n g " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a r t J a v a S c r i p t p r o f i l i n g . " ] = " S t a r t J a v a S c r i p t p r o f i l i n g . " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " S t a r t P l a y b a c k " ] = " S t a r t P l a y b a c k " ;
</ins><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a r t R e c o r d i n g " ] = " S t a r t R e c o r d i n g " ;
</span><del>- l o c a l i z e d S t r i n g s [ " S t a r t P l a y b a c k " ] = " S t a r t P l a y b a c k " ;
</del><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a r t T i m e " ] = " S t a r t T i m e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t a t u s " ] = " S t a t u s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " S t e p i n t o ( % s o r % s ) " ] = " S t e p i n t o ( % s o r % s ) " ;
</span><span class="lines">@@ -462,3 +463,4 @@
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " l i n e " ] = " l i n e " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " o r i g i n a l l y % s " ] = " o r i g i n a l l y % s " ;
</span><span class="cx"> l o c a l i z e d S t r i n g s [ " u n d e f i n e d \xD7 % d " ] = " u n d e f i n e d \xD7 % d " ;
</span><ins>+ l o c a l i z e d S t r i n g s [ " % s P r o f i l e R e c o r d e d " ] = " % s P r o f i l e R e c o r d e d " ;
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -61,17 +61,25 @@
</span><span class="cx">
</span><span class="cx"> startCapturing: function()
</span><span class="cx"> {
</span><ins>+ TimelineAgent.start();
+ },
+
+ stopCapturing: function()
+ {
+ TimelineAgent.stop();
+ },
+
+ capturingStarted: function()
+ {
</ins><span class="cx"> if (this._isCapturing)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._isCapturing = true;
</span><span class="cx">
</span><del>- TimelineAgent.start();
-
</del><span class="cx"> this.dispatchEventToListeners(WebInspector.TimelineManager.Event.CapturingStarted);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- stopCapturing: function()
</del><ins>+ capturingStopped: function()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._isCapturing)
</span><span class="cx"> return;
</span><span class="lines">@@ -86,8 +94,6 @@
</span><span class="cx"> delete this._deadTimeTimeout;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TimelineAgent.stop();
-
</del><span class="cx"> this._isCapturing = false;
</span><span class="cx"> this._autoCapturingMainResource = null;
</span><span class="cx">
</span><span class="lines">@@ -229,6 +235,12 @@
</span><span class="cx"> this._activeRecording.addEventMarker(eventMarker);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case TimelineAgent.EventType.ConsoleProfile:
+ var profile = this._profileFromPayload(recordPayload.data.profile);
+ console.assert(profile);
+ this._addRecord(new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.ConsoleProfileRecorded, startTime, endTime, callFrames, sourceCodeLocation, recordPayload.data.title, profile));
+ break;
+
</ins><span class="cx"> case TimelineAgent.EventType.FunctionCall:
</span><span class="cx"> // FunctionCall always happens as a child of another record, and since the FunctionCall record
</span><span class="cx"> // has useful info we just make the timeline record here (combining the data from both records).
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceImagesTimelineRecordConsoleProfilesvgfromrev171195trunkSourceWebInspectorUIUserInterfaceImagesTimelineRecordConsoleProfilesvg"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/TimelineRecordConsoleProfile.svg (from rev 171195, trunk/Source/WebInspectorUI/UserInterface/Images/TimelineRecordConsoleProfile.svg) (0 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/TimelineRecordConsoleProfile.svg (rev 0)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Images/TimelineRecordConsoleProfile.svg 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2013 Apple Inc. All rights reserved. -->
+<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path fill="rgb(190, 165, 202)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 Z"/>
+ <path fill="rgb(141, 118, 153)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/>
+ <path fill="rgb(153, 127, 166)" d="M 7.09187665 9.86486483 L 8.09187665 9.86486483 L 8.09187675 12 L 8.09187675 13 L 7.09187675 13 L 5.4 13 L 4.4 13 L 4.4 12 L 4.4 4 L 4.4 3 L 5.4 3 L 8.2907563 3 C 9.49663194 3 10.4135483 3.20769232 11.0534889 3.69149996 C 11.7636984 4.22843229 12.097479 5.0719049 12.097479 6.12432432 C 12.097479 7.27475638 11.6870881 8.23200847 10.8722916 8.91131913 C 10.0975424 9.55724163 9.06464428 9.86486486 7.80896359 9.86486486 L 7.09187675 9.86486486 L 7.09187675 9.36486486 L 7.09187675 8.86486486 L 7.80896359 8.86486486 C 8.11369101 8.86486486 8.39855198 8.84414571 8.66354709 8.80270722 C 9.30146061 8.70295376 9.82425299 8.48313329 10.2319328 8.14324324 C 10.8089665 7.66215976 11.097479 6.98919351 11.097479 6.12432432 C 11.097479 5.36035654 10.8817949 4.81531695 10.4504202 4.48918919 C 10.0190455 4.16306143 9.29916471 4 8.2907563 4 L 5.4 4 L 5.4 12 L 7.09187675 12 L 7.09187675 9.36486486 L 7.09187665 9.86486483 Z M 7.09187675 7.76756757 L 7.4280112 7.76756757 C 8.01811686 7.76756757 8.4840319 7.63513646 8.82577031 7.37027027 C 9.16750871 7.10540408 9.33837535 6.74594822 9.33837535 6.29189189 C 9.33837535 5.49549151 8.81363737 5.0972973 7.76414566 5.0972973 L 7.09187675 5.0972973 L 7.09187675 7.76756757 Z M 7.09187675 7.76756757"/>
+ <path fill="white" d="M 5.4 12 L 5.4 4 L 8.2907563 4 C 9.29916471 4 10.0190455 4.16306143 10.4504202 4.48918919 C 10.8817949 4.81531695 11.097479 5.36035654 11.097479 6.12432432 C 11.097479 6.98919351 10.8089665 7.66215976 10.2319328 8.14324324 C 9.65489908 8.62432673 8.84725076 8.86486486 7.80896359 8.86486486 L 7.09187675 8.86486486 L 7.09187675 12 L 5.4 12 Z M 7.09187675 7.76756757 L 7.4280112 7.76756757 C 8.01811686 7.76756757 8.4840319 7.63513646 8.82577031 7.37027027 C 9.16750871 7.10540408 9.33837535 6.74594822 9.33837535 6.29189189 C 9.33837535 5.49549151 8.81363737 5.0972973 7.76414566 5.0972973 L 7.09187675 5.0972973 L 7.09187675 7.76756757 Z M 7.09187675 7.76756757"/>
+</svg>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceModelsScriptTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -46,7 +46,8 @@
</span><span class="cx"> TimerRemoved: "script-timeline-record-timer-removed",
</span><span class="cx"> AnimationFrameFired: "script-timeline-record-animation-frame-fired",
</span><span class="cx"> AnimationFrameRequested: "script-timeline-record-animation-frame-requested",
</span><del>- AnimationFrameCanceled: "script-timeline-record-animation-frame-canceled"
</del><ins>+ AnimationFrameCanceled: "script-timeline-record-animation-frame-canceled",
+ ConsoleProfileRecorded: "script-timeline-record-console-profile-recorded"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ScriptTimelineRecord.EventType.displayName = function(eventType, details, includeTimerIdentifierInMainTitle)
</span><span class="lines">@@ -216,6 +217,10 @@
</span><span class="cx"> return WebInspector.UIString("Event Dispatched");
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.ProbeSampleRecorded:
</span><span class="cx"> return WebInspector.UIString("Probe Sample Recorded");
</span><ins>+ case WebInspector.ScriptTimelineRecord.EventType.ConsoleProfileRecorded:
+ if (details && (details instanceof String || typeof details === "string"))
+ return WebInspector.UIString("“%s” Profile Recorded").format(details);
+ return WebInspector.UIString("Console Profile Recorded");
</ins><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerFired:
</span><span class="cx"> if (details && includeTimerIdentifierInMainTitle)
</span><span class="cx"> return WebInspector.UIString("Timer %s Fired").format(details);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceProtocolTimelineObserverjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Protocol/TimelineObserver.js 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -36,6 +36,16 @@
</span><span class="cx"> eventRecorded: function(record)
</span><span class="cx"> {
</span><span class="cx"> WebInspector.timelineManager.eventRecorded(record);
</span><ins>+ },
+
+ recordingStarted: function()
+ {
+ WebInspector.timelineManager.capturingStarted();
+ },
+
+ recordingStopped: function()
+ {
+ WebInspector.timelineManager.capturingStopped();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineIconscss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -79,6 +79,10 @@
</span><span class="cx"> content: url(../Images/TimelineRecordProbeSampled.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.console-profile-record .icon {
+ content: url(../Images/TimelineRecordConsoleProfile.svg);
+}
+
</ins><span class="cx"> .timer-record .icon {
</span><span class="cx"> content: url(../Images/TimelineRecordTimer.svg);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -80,6 +80,9 @@
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.ProbeSampleRecorded:
</span><span class="cx"> iconStyleClass = WebInspector.TimelineRecordTreeElement.ProbeRecordIconStyleClass;
</span><span class="cx"> break;
</span><ins>+ case WebInspector.ScriptTimelineRecord.EventType.ConsoleProfileRecorded:
+ iconStyleClass = WebInspector.TimelineRecordTreeElement.ConsoleProfileIconStyleClass;
+ break;
</ins><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerFired:
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerInstalled:
</span><span class="cx"> case WebInspector.ScriptTimelineRecord.EventType.TimerRemoved:
</span><span class="lines">@@ -116,6 +119,7 @@
</span><span class="cx"> WebInspector.TimelineRecordTreeElement.TimerRecordIconStyleClass = "timer-record";
</span><span class="cx"> WebInspector.TimelineRecordTreeElement.AnimationRecordIconStyleClass = "animation-record";
</span><span class="cx"> WebInspector.TimelineRecordTreeElement.ProbeRecordIconStyleClass = "probe-record";
</span><ins>+WebInspector.TimelineRecordTreeElement.ConsoleProfileIconStyleClass = "console-profile-record";
</ins><span class="cx">
</span><span class="cx"> WebInspector.TimelineRecordTreeElement.prototype = {
</span><span class="cx"> constructor: WebInspector.TimelineRecordTreeElement,
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-22 Dana Burkart <dburkart@apple.com>
+
+ Merge r171195.
+
+ 2014-07-17 Timothy Hatcher <timothy@apple.com>
+
+ Make console.profile record to the Timeline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=134643
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebInspector/WebInspector.mm:
+ (-[WebInspector isProfilingJavaScript]):
+ (-[WebInspector toggleProfilingJavaScript:]):
+ (-[WebInspector startProfilingJavaScript:]):
+ (-[WebInspector stopProfilingJavaScript:]):
+ (-[WebInspector isJavaScriptProfilingEnabled]):
+ (-[WebInspector setJavaScriptProfilingEnabled:]):
+
</ins><span class="cx"> 2014-07-17 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/17675068> Disable some features on this branch.
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacWebInspectorWebInspectormm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebInspector/WebInspector.mm (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/WebInspector/WebInspector.mm 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebInspector/WebInspector.mm 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -109,45 +109,34 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)isProfilingJavaScript
</span><span class="cx"> {
</span><del>- return _frontend && [_frontend isProfilingJavaScript];
</del><ins>+ // No longer supported.
+ return NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)toggleProfilingJavaScript:(id)sender
</span><span class="cx"> {
</span><del>- [self showWindow];
-
- if ([self isProfilingJavaScript])
- [_frontend stopProfilingJavaScript];
- else
- [_frontend startProfilingJavaScript];
</del><ins>+ // No longer supported.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)startProfilingJavaScript:(id)sender
</span><span class="cx"> {
</span><del>- if (_frontend)
- [_frontend startProfilingJavaScript];
</del><ins>+ // No longer supported.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)stopProfilingJavaScript:(id)sender
</span><span class="cx"> {
</span><del>- if (_frontend)
- [_frontend stopProfilingJavaScript];
</del><ins>+ // No longer supported.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isJavaScriptProfilingEnabled
</span><span class="cx"> {
</span><del>- if (Page* page = core(_webView))
- return page->inspectorController().profilerEnabled();
</del><ins>+ // No longer supported.
</ins><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setJavaScriptProfilingEnabled:(BOOL)enabled
</span><span class="cx"> {
</span><del>- Page* page = core(_webView);
- if (!page)
- return;
-
- page->inspectorController().setProfilerEnabled(enabled);
</del><ins>+ // No longer supported.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isTimelineProfilingEnabled
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171195.
+
+ 2014-07-17 Timothy Hatcher <timothy@apple.com>
+
+ Make console.profile record to the Timeline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=134643
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::setJavaScriptProfilingEnabled):
+ (WebKit::WebInspector::startJavaScriptProfiling):
+ (WebKit::WebInspector::stopJavaScriptProfiling):
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171194.
</span><span class="cx">
</span><span class="cx"> 2014-07-17 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (171404 => 171405)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-07-23 05:18:09 UTC (rev 171404)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-07-23 05:27:26 UTC (rev 171405)
</span><span class="lines">@@ -277,25 +277,17 @@
</span><span class="cx">
</span><span class="cx"> void WebInspector::setJavaScriptProfilingEnabled(bool enabled)
</span><span class="cx"> {
</span><del>- m_page->corePage()->inspectorController().show();
- if (!m_frontendClient)
- return;
-
- m_page->corePage()->inspectorController().setProfilerEnabled(enabled);
</del><ins>+ // No longer supported.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::startJavaScriptProfiling()
</span><span class="cx"> {
</span><del>- m_page->corePage()->inspectorController().show();
- if (m_frontendClient)
- m_frontendClient->startProfilingJavaScript();
</del><ins>+ // No longer supported.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::stopJavaScriptProfiling()
</span><span class="cx"> {
</span><del>- m_page->corePage()->inspectorController().show();
- if (m_frontendClient)
- m_frontendClient->stopProfilingJavaScript();
</del><ins>+ // No longer supported.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::startPageProfiling()
</span></span></pre>
</div>
</div>
</body>
</html>