<!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>[163139] trunk/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/163139">163139</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 17:34:31 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Include profile with FunctionCall and EvaluateScript Timeline records.
https://bugs.webkit.org/show_bug.cgi?id=127663
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
* inspector/InjectedScriptBase.cpp:
(Inspector::InjectedScriptBase::callFunctionWithEvalEnabled):
* inspector/InspectorEnvironment.h:
* inspector/JSGlobalObjectInspectorController.h:
Source/WebCore:
* bindings/js/JSCallbackData.cpp:
(WebCore::JSCallbackData::invokeCallback):
* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::handleEvent):
* bindings/js/JSMutationCallback.cpp:
(WebCore::JSMutationCallback::call):
* bindings/js/ScheduledAction.cpp:
(WebCore::ScheduledAction::executeFunctionInContext):
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::evaluateInWorld):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::didCallInjectedScriptFunction):
* inspector/InspectorController.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCallFunctionImpl):
(WebCore::InspectorInstrumentation::didEvaluateScriptImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didCallFunction):
(WebCore::InspectorInstrumentation::didEvaluateScript):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::willCallFunction):
(WebCore::InspectorTimelineAgent::didCallFunction):
(WebCore::InspectorTimelineAgent::willEvaluateScript):
(WebCore::InspectorTimelineAgent::didEvaluateScript):
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
* inspector/InspectorTimelineAgent.h:
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::appendProfile):
* inspector/TimelineRecordFactory.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::didCallInjectedScriptFunction):
* inspector/WorkerInspectorController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorEnvironmenth">trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCallbackDatacpp">trunk/Source/WebCore/bindings/js/JSCallbackData.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSEventListenercpp">trunk/Source/WebCore/bindings/js/JSEventListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMutationCallbackcpp">trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScheduledActioncpp">trunk/Source/WebCore/bindings/js/ScheduledAction.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactorycpp">trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactoryh">trunk/Source/WebCore/inspector/TimelineRecordFactory.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllerh">trunk/Source/WebCore/inspector/WorkerInspectorController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-26 Timothy Hatcher <timothy@apple.com>
+
+ Include profile with FunctionCall and EvaluateScript Timeline records.
+
+ https://bugs.webkit.org/show_bug.cgi?id=127663
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InjectedScriptBase.cpp:
+ (Inspector::InjectedScriptBase::callFunctionWithEvalEnabled):
+ * inspector/InspectorEnvironment.h:
+ * inspector/JSGlobalObjectInspectorController.h:
+
</ins><span class="cx"> 2014-01-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL should support GetById(Untyped:)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> scriptState->lexicalGlobalObject()->setEvalEnabled(false);
</span><span class="cx">
</span><span class="cx"> if (m_environment)
</span><del>- m_environment->didCallInjectedScriptFunction();
</del><ins>+ m_environment->didCallInjectedScriptFunction(m_injectedScriptObject.scriptState());
</ins><span class="cx">
</span><span class="cx"> return resultValue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorEnvironmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> virtual InspectorFunctionCallHandler functionCallHandler() const = 0;
</span><span class="cx"> virtual InspectorEvaluateHandler evaluateHandler() const = 0;
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String& scriptName, int scriptLine) = 0;
</span><del>- virtual void didCallInjectedScriptFunction() = 0;
</del><ins>+ virtual void didCallInjectedScriptFunction(JSC::ExecState*) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> virtual InspectorFunctionCallHandler functionCallHandler() const override;
</span><span class="cx"> virtual InspectorEvaluateHandler evaluateHandler() const override;
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String&, int) override { }
</span><del>- virtual void didCallInjectedScriptFunction() override { }
</del><ins>+ virtual void didCallInjectedScriptFunction(JSC::ExecState*) override { }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> JSC::JSGlobalObject& m_globalObject;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-01-26 Timothy Hatcher <timothy@apple.com>
+
+ Include profile with FunctionCall and EvaluateScript Timeline records.
+
+ https://bugs.webkit.org/show_bug.cgi?id=127663
+
+ Reviewed by Joseph Pecoraro.
+
+ * bindings/js/JSCallbackData.cpp:
+ (WebCore::JSCallbackData::invokeCallback):
+ * bindings/js/JSEventListener.cpp:
+ (WebCore::JSEventListener::handleEvent):
+ * bindings/js/JSMutationCallback.cpp:
+ (WebCore::JSMutationCallback::call):
+ * bindings/js/ScheduledAction.cpp:
+ (WebCore::ScheduledAction::executeFunctionInContext):
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::evaluateInWorld):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::didCallInjectedScriptFunction):
+ * inspector/InspectorController.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didCallFunctionImpl):
+ (WebCore::InspectorInstrumentation::didEvaluateScriptImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didCallFunction):
+ (WebCore::InspectorInstrumentation::didEvaluateScript):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willCallFunction):
+ (WebCore::InspectorTimelineAgent::didCallFunction):
+ (WebCore::InspectorTimelineAgent::willEvaluateScript):
+ (WebCore::InspectorTimelineAgent::didEvaluateScript):
+ (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::appendProfile):
+ * inspector/TimelineRecordFactory.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::didCallInjectedScriptFunction):
+ * inspector/WorkerInspectorController.h:
+
</ins><span class="cx"> 2014-01-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove now-empty ScriptController::setCaptureCallStackForUncaughtExceptions
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCallbackDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ? JSMainThreadExecState::call(exec, function, callType, callData, thisValue, args)
</span><span class="cx"> : JSC::call(exec, function, callType, callData, thisValue, args);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didCallFunction(cookie);
</del><ins>+ InspectorInstrumentation::didCallFunction(cookie, context);
</ins><span class="cx">
</span><span class="cx"> if (exec->hadException()) {
</span><span class="cx"> reportCurrentException(exec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventListener.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> ? JSMainThreadExecState::call(exec, handleEventFunction, callType, callData, thisValue, args)
</span><span class="cx"> : JSC::call(exec, handleEventFunction, callType, callData, thisValue, args);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didCallFunction(cookie);
</del><ins>+ InspectorInstrumentation::didCallFunction(cookie, scriptExecutionContext);
</ins><span class="cx">
</span><span class="cx"> globalObject->setCurrentEvent(savedEvent);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMutationCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> JSMainThreadExecState::call(exec, callback, callType, callData, jsObserver, args);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didCallFunction(cookie);
</del><ins>+ InspectorInstrumentation::didCallFunction(cookie, context);
</ins><span class="cx">
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> reportCurrentException(exec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScheduledActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScheduledAction.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScheduledAction.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/bindings/js/ScheduledAction.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> else
</span><span class="cx"> JSC::call(exec, m_function.get(), callType, callData, thisValue, args);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didCallFunction(cookie);
</del><ins>+ InspectorInstrumentation::didCallFunction(cookie, context);
</ins><span class="cx">
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> reportCurrentException(exec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue returnValue = JSMainThreadExecState::evaluate(exec, jsSourceCode, shell, &evaluationException);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didEvaluateScript(cookie);
</del><ins>+ InspectorInstrumentation::didEvaluateScript(cookie, &m_frame);
</ins><span class="cx">
</span><span class="cx"> if (evaluationException) {
</span><span class="cx"> reportException(exec, evaluationException, sourceCode.cachedScript());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -469,11 +469,12 @@
</span><span class="cx"> m_injectedScriptInstrumentationCookies.append(cookie);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::didCallInjectedScriptFunction()
</del><ins>+void InspectorController::didCallInjectedScriptFunction(JSC::ExecState* scriptState)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_injectedScriptInstrumentationCookies.isEmpty());
</span><ins>+ ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextFromExecState(scriptState);
</ins><span class="cx"> InspectorInstrumentationCookie cookie = m_injectedScriptInstrumentationCookies.takeLast();
</span><del>- InspectorInstrumentation::didCallFunction(cookie);
</del><ins>+ InspectorInstrumentation::didCallFunction(cookie, scriptExecutionContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> virtual Inspector::InspectorFunctionCallHandler functionCallHandler() const override;
</span><span class="cx"> virtual Inspector::InspectorEvaluateHandler evaluateHandler() const override;
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String& scriptName, int scriptLine) override;
</span><del>- virtual void didCallInjectedScriptFunction() override;
</del><ins>+ virtual void didCallInjectedScriptFunction(JSC::ExecState*) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend InstrumentingAgents* instrumentationForPage(Page*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -316,10 +316,10 @@
</span><span class="cx"> return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didCallFunctionImpl(const InspectorInstrumentationCookie& cookie)
</del><ins>+void InspectorInstrumentation::didCallFunctionImpl(const InspectorInstrumentationCookie& cookie, ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
</span><del>- timelineAgent->didCallFunction();
</del><ins>+ timelineAgent->didCallFunction(frameForScriptExecutionContext(context));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentationCookie InspectorInstrumentation::willDispatchXHRReadyStateChangeEventImpl(InstrumentingAgents* instrumentingAgents, XMLHttpRequest* request, ScriptExecutionContext* context)
</span><span class="lines">@@ -394,10 +394,10 @@
</span><span class="cx"> return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didEvaluateScriptImpl(const InspectorInstrumentationCookie& cookie)
</del><ins>+void InspectorInstrumentation::didEvaluateScriptImpl(const InspectorInstrumentationCookie& cookie, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
</span><del>- timelineAgent->didEvaluateScript();
</del><ins>+ timelineAgent->didEvaluateScript(frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::scriptsEnabledImpl(InstrumentingAgents* instrumentingAgents, bool isEnabled)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> static void didRemoveTimer(ScriptExecutionContext*, int timerId);
</span><span class="cx">
</span><span class="cx"> static InspectorInstrumentationCookie willCallFunction(ScriptExecutionContext*, const String& scriptName, int scriptLine);
</span><del>- static void didCallFunction(const InspectorInstrumentationCookie&);
</del><ins>+ static void didCallFunction(const InspectorInstrumentationCookie&, ScriptExecutionContext*);
</ins><span class="cx"> static InspectorInstrumentationCookie willDispatchXHRReadyStateChangeEvent(ScriptExecutionContext*, XMLHttpRequest*);
</span><span class="cx"> static void didDispatchXHRReadyStateChangeEvent(const InspectorInstrumentationCookie&);
</span><span class="cx"> static InspectorInstrumentationCookie willDispatchEvent(Document*, const Event&, bool hasEventListeners);
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> static InspectorInstrumentationCookie willDispatchEventOnWindow(Frame*, const Event& event, DOMWindow* window);
</span><span class="cx"> static void didDispatchEventOnWindow(const InspectorInstrumentationCookie&);
</span><span class="cx"> static InspectorInstrumentationCookie willEvaluateScript(Frame*, const String& url, int lineNumber);
</span><del>- static void didEvaluateScript(const InspectorInstrumentationCookie&);
</del><ins>+ static void didEvaluateScript(const InspectorInstrumentationCookie&, Frame*);
</ins><span class="cx"> static void scriptsEnabled(Page*, bool isEnabled);
</span><span class="cx"> static void didCreateIsolatedContext(Frame*, JSC::ExecState*, SecurityOrigin*);
</span><span class="cx"> static InspectorInstrumentationCookie willFireTimer(ScriptExecutionContext*, int timerId);
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> static void didRemoveTimerImpl(InstrumentingAgents*, int timerId, ScriptExecutionContext*);
</span><span class="cx">
</span><span class="cx"> static InspectorInstrumentationCookie willCallFunctionImpl(InstrumentingAgents*, const String& scriptName, int scriptLine, ScriptExecutionContext*);
</span><del>- static void didCallFunctionImpl(const InspectorInstrumentationCookie&);
</del><ins>+ static void didCallFunctionImpl(const InspectorInstrumentationCookie&, ScriptExecutionContext*);
</ins><span class="cx"> static InspectorInstrumentationCookie willDispatchXHRReadyStateChangeEventImpl(InstrumentingAgents*, XMLHttpRequest*, ScriptExecutionContext*);
</span><span class="cx"> static void didDispatchXHRReadyStateChangeEventImpl(const InspectorInstrumentationCookie&);
</span><span class="cx"> static InspectorInstrumentationCookie willDispatchEventImpl(InstrumentingAgents*, const Event&, bool hasEventListeners, Document*);
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> static InspectorInstrumentationCookie willDispatchEventOnWindowImpl(InstrumentingAgents*, const Event&, DOMWindow*);
</span><span class="cx"> static void didDispatchEventOnWindowImpl(const InspectorInstrumentationCookie&);
</span><span class="cx"> static InspectorInstrumentationCookie willEvaluateScriptImpl(InstrumentingAgents*, const String& url, int lineNumber, Frame*);
</span><del>- static void didEvaluateScriptImpl(const InspectorInstrumentationCookie&);
</del><ins>+ static void didEvaluateScriptImpl(const InspectorInstrumentationCookie&, Frame*);
</ins><span class="cx"> static void scriptsEnabledImpl(InstrumentingAgents*, bool isEnabled);
</span><span class="cx"> static void didCreateIsolatedContextImpl(InstrumentingAgents*, Frame*, JSC::ExecState*, SecurityOrigin*);
</span><span class="cx"> static InspectorInstrumentationCookie willFireTimerImpl(InstrumentingAgents*, int timerId, ScriptExecutionContext*);
</span><span class="lines">@@ -823,14 +823,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::didCallFunction(const InspectorInstrumentationCookie& cookie)
</del><ins>+inline void InspectorInstrumentation::didCallFunction(const InspectorInstrumentationCookie& cookie, ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (cookie.isValid())
</span><del>- didCallFunctionImpl(cookie);
</del><ins>+ didCallFunctionImpl(cookie, context);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(cookie);
</span><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -946,14 +947,15 @@
</span><span class="cx"> return InspectorInstrumentationCookie();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::didEvaluateScript(const InspectorInstrumentationCookie& cookie)
</del><ins>+inline void InspectorInstrumentation::didEvaluateScript(const InspectorInstrumentationCookie& cookie, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (cookie.isValid())
</span><del>- didEvaluateScriptImpl(cookie);
</del><ins>+ didEvaluateScriptImpl(cookie, frame);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(cookie);
</span><ins>+ UNUSED_PARAM(frame);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><ins>+#include "ScriptProfiler.h"
</ins><span class="cx"> #include "TimelineRecordFactory.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="lines">@@ -137,10 +138,28 @@
</span><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><ins>+
+ if (frame && !m_recordingProfile) {
+ m_recordingProfile = true;
+ ScriptProfiler::start(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline FunctionCall"));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::didCallFunction()
</del><ins>+void InspectorTimelineAgent::didCallFunction(Frame* frame)
</ins><span class="cx"> {
</span><ins>+ if (frame && m_recordingProfile) {
+ if (m_recordStack.isEmpty())
+ return;
+
+ TimelineRecordEntry& entry = m_recordStack.last();
+ ASSERT(entry.type == TimelineRecordType::FunctionCall);
+
+ RefPtr<ScriptProfile> profile = ScriptProfiler::stop(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline FunctionCall"));
+ TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
+
+ m_recordingProfile = false;
+ }
+
</ins><span class="cx"> didCompleteCurrentRecord(TimelineRecordType::FunctionCall);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -299,10 +318,28 @@
</span><span class="cx"> void InspectorTimelineAgent::willEvaluateScript(const String& url, int lineNumber, Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptData(url, lineNumber), TimelineRecordType::EvaluateScript, true, frame);
</span><ins>+
+ if (frame && !m_recordingProfile) {
+ m_recordingProfile = true;
+ ScriptProfiler::start(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline EvaluateScript"));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::didEvaluateScript()
</del><ins>+void InspectorTimelineAgent::didEvaluateScript(Frame* frame)
</ins><span class="cx"> {
</span><ins>+ if (frame && m_recordingProfile) {
+ if (m_recordStack.isEmpty())
+ return;
+
+ TimelineRecordEntry& entry = m_recordStack.last();
+ ASSERT(entry.type == TimelineRecordType::EvaluateScript);
+
+ RefPtr<ScriptProfile> profile = ScriptProfiler::stop(toJSDOMWindow(frame, debuggerWorld())->globalExec(), ASCIILiteral("Timeline EvaluateScript"));
+ TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
+
+ m_recordingProfile = false;
+ }
+
</ins><span class="cx"> didCompleteCurrentRecord(TimelineRecordType::EvaluateScript);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -592,6 +629,7 @@
</span><span class="cx"> , m_weakFactory(this)
</span><span class="cx"> , m_enabled(false)
</span><span class="cx"> , m_includeDOMCounters(false)
</span><ins>+ , m_recordingProfile(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> // Methods called from WebCore.
</span><span class="cx"> void willCallFunction(const String& scriptName, int scriptLine, Frame*);
</span><del>- void didCallFunction();
</del><ins>+ void didCallFunction(Frame*);
</ins><span class="cx">
</span><span class="cx"> void willDispatchEvent(const Event&, Frame*);
</span><span class="cx"> void didDispatchEvent();
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> void didDispatchXHRLoadEvent();
</span><span class="cx">
</span><span class="cx"> void willEvaluateScript(const String&, int, Frame*);
</span><del>- void didEvaluateScript();
</del><ins>+ void didEvaluateScript(Frame*);
</ins><span class="cx">
</span><span class="cx"> void didTimeStamp(Frame*, const String&);
</span><span class="cx"> void didMarkDOMContentEvent(Frame*);
</span><span class="lines">@@ -268,6 +268,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_enabled;
</span><span class="cx"> bool m_includeDOMCounters;
</span><ins>+ bool m_recordingProfile;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptCallStack.h"
</span><span class="cx"> #include "ScriptCallStackFactory.h"
</span><ins>+#include "ScriptProfile.h"
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="lines">@@ -251,6 +252,11 @@
</span><span class="cx"> data->setArray("root", createQuad(quad));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TimelineRecordFactory::appendProfile(InspectorObject* data, PassRefPtr<ScriptProfile> profile)
+{
+ data->setValue("profile", profile->buildInspectorObjectForHead());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> class FloatQuad;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><ins>+ class ScriptProfile;
</ins><span class="cx">
</span><span class="cx"> class TimelineRecordFactory {
</span><span class="cx"> public:
</span><span class="lines">@@ -92,6 +93,8 @@
</span><span class="cx">
</span><span class="cx"> static void appendLayoutRoot(Inspector::InspectorObject* data, const FloatQuad&);
</span><span class="cx">
</span><ins>+ static void appendProfile(Inspector::InspectorObject*, PassRefPtr<ScriptProfile>);
+
</ins><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> static inline PassRefPtr<Inspector::InspectorObject> createWebSocketCreateData(unsigned long identifier, const URL& url, const String& protocol)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -166,11 +166,12 @@
</span><span class="cx"> m_injectedScriptInstrumentationCookies.append(cookie);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerInspectorController::didCallInjectedScriptFunction()
</del><ins>+void WorkerInspectorController::didCallInjectedScriptFunction(JSC::ExecState* scriptState)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_injectedScriptInstrumentationCookies.isEmpty());
</span><ins>+ ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextFromExecState(scriptState);
</ins><span class="cx"> InspectorInstrumentationCookie cookie = m_injectedScriptInstrumentationCookies.takeLast();
</span><del>- InspectorInstrumentation::didCallFunction(cookie);
</del><ins>+ InspectorInstrumentation::didCallFunction(cookie, scriptExecutionContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (163138 => 163139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2014-01-31 01:34:19 UTC (rev 163138)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2014-01-31 01:34:31 UTC (rev 163139)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> virtual Inspector::InspectorFunctionCallHandler functionCallHandler() const override;
</span><span class="cx"> virtual Inspector::InspectorEvaluateHandler evaluateHandler() const override;
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String& scriptName, int scriptLine) override;
</span><del>- virtual void didCallInjectedScriptFunction() override;
</del><ins>+ virtual void didCallInjectedScriptFunction(JSC::ExecState*) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope*);
</span></span></pre>
</div>
</div>
</body>
</html>