<!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>[202072] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202072">202072</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-14 17:42:51 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Rename Timeline.setAutoCaptureInstruments to Timeline.setInstruments
https://bugs.webkit.org/show_bug.cgi?id=158762
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-06-14
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
Rename the protocol methods since the backend may use the instruments
for purposes other then auto-capture, such as programmatic capture
via console.profile.
* inspector/protocol/Timeline.json:
Source/WebCore:
Test: inspector/timeline/setInstruments-errors.html
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorTimelineAgent::setInstruments):
(WebCore::InspectorTimelineAgent::mainFrameStartedLoading):
(WebCore::InspectorTimelineAgent::setAutoCaptureInstruments): Deleted.
* inspector/InspectorTimelineAgent.h:
Source/WebInspectorUI:
* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager.prototype._updateAutoCaptureInstruments):
(WebInspector.TimelineManager):
LayoutTests:
* inspector/timeline/setInstruments-errors-expected.txt: Renamed from LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors-expected.txt.
* inspector/timeline/setInstruments-errors.html: Renamed from LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors.html.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolTimelinejson">trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectortimelinesetInstrumentserrorsexpectedtxt">trunk/LayoutTests/inspector/timeline/setInstruments-errors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinesetInstrumentserrorshtml">trunk/LayoutTests/inspector/timeline/setInstruments-errors.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectortimelinesetAutoCaptureInstrumentserrorsexpectedtxt">trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectortimelinesetAutoCaptureInstrumentserrorshtml">trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/LayoutTests/ChangeLog 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rename Timeline.setAutoCaptureInstruments to Timeline.setInstruments
+ https://bugs.webkit.org/show_bug.cgi?id=158762
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/timeline/setInstruments-errors-expected.txt: Renamed from LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors-expected.txt.
+ * inspector/timeline/setInstruments-errors.html: Renamed from LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors.html.
+
</ins><span class="cx"> 2016-06-14 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> decompose4 return value is unchecked, leading to potentially uninitialized data.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinesetAutoCaptureInstrumentserrorsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors-expected.txt (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors-expected.txt 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors-expected.txt 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-Tests for error cases with Timeline.setAutoCaptureInstruments.
-
-
-== Running test suite: Timeline.setAutoCaptureInstruments.errors
--- Running test case: MissingRequiredArgument
-PASS: Should be an error: Some arguments of method 'Timeline.setAutoCaptureInstruments' can't be processed
-
--- Running test case: InvalidTypeInInstrumentsList
-PASS: Should be an error: Unexpected type in instruments list, should be string
-
--- Running test case: InvalidInstrumentInInstrumentsList
-PASS: Should be an error: Unexpected enum value: NoSuchInstrument
-
--- Running test case: ValidInstrumentInInstrumentsList
-PASS: Should not be an error setting valid instruments.
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinesetAutoCaptureInstrumentserrorshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors.html (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors.html 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors.html 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../http/tests/inspector/resources/protocol-test.js"></script>
-<script>
-function test()
-{
- let suite = ProtocolTest.createAsyncSuite("Timeline.setAutoCaptureInstruments.errors");
-
- ProtocolTest.dumpActivityToSystemConsole = true;
- ProtocolTest.dumpInspectorProtocolMessages = true;
-
- suite.addTestCase({
- name: "MissingRequiredArgument",
- test: (resolve, reject) => {
- InspectorProtocol.sendCommand("Timeline.setAutoCaptureInstruments", {}, (messageObject) => {
- ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
- resolve();
- });
- }
- });
-
- suite.addTestCase({
- name: "InvalidTypeInInstrumentsList",
- test: (resolve, reject) => {
- InspectorProtocol.sendCommand("Timeline.setAutoCaptureInstruments", {"instruments": [123]}, (messageObject) => {
- ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
- resolve();
- });
- }
- });
-
- suite.addTestCase({
- name: "InvalidInstrumentInInstrumentsList",
- test: (resolve, reject) => {
- InspectorProtocol.sendCommand("Timeline.setAutoCaptureInstruments", {"instruments": ["NoSuchInstrument"]}, (messageObject) => {
- ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
- resolve();
- });
- }
- });
-
- suite.addTestCase({
- name: "ValidInstrumentInInstrumentsList",
- test: (resolve, reject) => {
- InspectorProtocol.sendCommand("Timeline.setAutoCaptureInstruments", {"instruments": ["ScriptProfiler", "Heap", "Timeline", "Memory"]}, (messageObject) => {
- ProtocolTest.expectThat(!messageObject.error, "Should not be an error setting valid instruments.");
- resolve();
- });
- }
- });
-
- suite.runTestCasesAndFinish();
-}
-</script>
-</head>
-<body onload="runTest()">
-<p>Tests for error cases with Timeline.setAutoCaptureInstruments.</p>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinesetInstrumentserrorsexpectedtxtfromrev202071trunkLayoutTestsinspectortimelinesetAutoCaptureInstrumentserrorsexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/inspector/timeline/setInstruments-errors-expected.txt (from rev 202071, trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors-expected.txt) (0 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/setInstruments-errors-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/timeline/setInstruments-errors-expected.txt 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Tests for error cases with Timeline.setInstruments.
+
+
+== Running test suite: Timeline.setInstruments.errors
+-- Running test case: MissingRequiredArgument
+PASS: Should be an error: Some arguments of method 'Timeline.setInstruments' can't be processed
+
+-- Running test case: InvalidTypeInInstrumentsList
+PASS: Should be an error: Unexpected type in instruments list, should be string
+
+-- Running test case: InvalidInstrumentInInstrumentsList
+PASS: Should be an error: Unexpected enum value: NoSuchInstrument
+
+-- Running test case: ValidInstrumentInInstrumentsList
+PASS: Should not be an error setting valid instruments.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectortimelinesetInstrumentserrorshtmlfromrev202071trunkLayoutTestsinspectortimelinesetAutoCaptureInstrumentserrorshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/inspector/timeline/setInstruments-errors.html (from rev 202071, trunk/LayoutTests/inspector/timeline/setAutoCaptureInstruments-errors.html) (0 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/timeline/setInstruments-errors.html (rev 0)
+++ trunk/LayoutTests/inspector/timeline/setInstruments-errors.html 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/protocol-test.js"></script>
+<script>
+function test()
+{
+ let suite = ProtocolTest.createAsyncSuite("Timeline.setInstruments.errors");
+
+ suite.addTestCase({
+ name: "MissingRequiredArgument",
+ test: (resolve, reject) => {
+ InspectorProtocol.sendCommand("Timeline.setInstruments", {}, (messageObject) => {
+ ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "InvalidTypeInInstrumentsList",
+ test: (resolve, reject) => {
+ InspectorProtocol.sendCommand("Timeline.setInstruments", {"instruments": [123]}, (messageObject) => {
+ ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "InvalidInstrumentInInstrumentsList",
+ test: (resolve, reject) => {
+ InspectorProtocol.sendCommand("Timeline.setInstruments", {"instruments": ["NoSuchInstrument"]}, (messageObject) => {
+ ProtocolTest.expectThat(messageObject.error, `Should be an error: ${messageObject.error ? messageObject.error.message : ""}`);
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "ValidInstrumentInInstrumentsList",
+ test: (resolve, reject) => {
+ InspectorProtocol.sendCommand("Timeline.setInstruments", {"instruments": ["ScriptProfiler", "Heap", "Timeline", "Memory"]}, (messageObject) => {
+ ProtocolTest.expectThat(!messageObject.error, "Should not be an error setting valid instruments.");
+ resolve();
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Tests for error cases with Timeline.setInstruments.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rename Timeline.setAutoCaptureInstruments to Timeline.setInstruments
+ https://bugs.webkit.org/show_bug.cgi?id=158762
+
+ Reviewed by Timothy Hatcher.
+
+ Rename the protocol methods since the backend may use the instruments
+ for purposes other then auto-capture, such as programmatic capture
+ via console.profile.
+
+ * inspector/protocol/Timeline.json:
+
</ins><span class="cx"> 2016-06-14 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Document the native format of JSChar type
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -73,8 +73,8 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "setAutoCaptureInstruments",
- "description": "Instruments to enable when an auto capture starts.",
</del><ins>+ "name": "setInstruments",
+ "description": "Instruments to enable when capture starts on the backend (e.g. auto capture or programmatic capture).",
</ins><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "instruments", "type": "array", "items": { "$ref": "Instrument" }, "description": "Instruments to enable." }
</span><span class="cx"> ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/Source/WebCore/ChangeLog 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rename Timeline.setAutoCaptureInstruments to Timeline.setInstruments
+ https://bugs.webkit.org/show_bug.cgi?id=158762
+
+ Reviewed by Timothy Hatcher.
+
+ Test: inspector/timeline/setInstruments-errors.html
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorTimelineAgent::setInstruments):
+ (WebCore::InspectorTimelineAgent::mainFrameStartedLoading):
+ (WebCore::InspectorTimelineAgent::setAutoCaptureInstruments): Deleted.
+ * inspector/InspectorTimelineAgent.h:
+
</ins><span class="cx"> 2016-06-14 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> decompose4 return value is unchecked, leading to potentially uninitialized data.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> stop(unused);
</span><span class="cx">
</span><span class="cx"> m_autoCaptureEnabled = false;
</span><del>- m_autoCaptureInstruments.clear();
</del><ins>+ m_instruments.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::start(ErrorString&, const int* maxCallStackDepth)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> m_autoCaptureEnabled = enabled;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::setAutoCaptureInstruments(ErrorString& errorString, const InspectorArray& instruments)
</del><ins>+void InspectorTimelineAgent::setInstruments(ErrorString& errorString, const InspectorArray& instruments)
</ins><span class="cx"> {
</span><span class="cx"> Vector<Protocol::Timeline::Instrument> newInstruments;
</span><span class="cx"> newInstruments.reserveCapacity(instruments.length());
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> newInstruments.uncheckedAppend(*instrumentType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_autoCaptureInstruments.swap(newInstruments);
</del><ins>+ m_instruments.swap(newInstruments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::internalStart(const int* maxCallStackDepth)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> if (!m_autoCaptureEnabled)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_autoCaptureInstruments.isEmpty())
</del><ins>+ if (m_instruments.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Pre-emptively disable breakpoints. The frontend must re-enable them.
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> m_frontendDispatcher->autoCaptureStarted();
</span><span class="cx">
</span><span class="cx"> // Enable instruments.
</span><del>- for (auto instrumentType : m_autoCaptureInstruments) {
</del><ins>+ for (auto instrumentType : m_instruments) {
</ins><span class="cx"> switch (instrumentType) {
</span><span class="cx"> case Inspector::Protocol::Timeline::Instrument::ScriptProfiler: {
</span><span class="cx"> if (m_scriptProfilerAgent) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> void start(ErrorString&, const int* maxCallStackDepth = nullptr) final;
</span><span class="cx"> void stop(ErrorString&) final;
</span><span class="cx"> void setAutoCaptureEnabled(ErrorString&, bool) final;
</span><del>- void setAutoCaptureInstruments(ErrorString&, const Inspector::InspectorArray&) final;
</del><ins>+ void setInstruments(ErrorString&, const Inspector::InspectorArray&) final;
</ins><span class="cx">
</span><span class="cx"> int id() const { return m_id; }
</span><span class="cx">
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> bool m_enabledFromFrontend { false };
</span><span class="cx">
</span><span class="cx"> bool m_autoCaptureEnabled { false };
</span><del>- Vector<Inspector::Protocol::Timeline::Instrument> m_autoCaptureInstruments;
</del><ins>+ Vector<Inspector::Protocol::Timeline::Instrument> m_instruments;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> std::unique_ptr<WebCore::RunLoopObserver> m_frameStartObserver;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rename Timeline.setAutoCaptureInstruments to Timeline.setInstruments
+ https://bugs.webkit.org/show_bug.cgi?id=158762
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._updateAutoCaptureInstruments):
+ (WebInspector.TimelineManager):
+
</ins><span class="cx"> 2016-06-14 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the unprefixed version of the pseudo element ::placeholder
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (202071 => 202072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2016-06-14 23:38:32 UTC (rev 202071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2016-06-15 00:42:51 UTC (rev 202072)
</span><span class="lines">@@ -990,7 +990,7 @@
</span><span class="cx"> if (!window.TimelineAgent)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!TimelineAgent.setAutoCaptureInstruments)
</del><ins>+ if (!TimelineAgent.setInstruments)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> let instrumentSet = new Set;
</span><span class="lines">@@ -1015,7 +1015,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TimelineAgent.setAutoCaptureInstruments([...instrumentSet]);
</del><ins>+ TimelineAgent.setInstruments([...instrumentSet]);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>