<!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>[171489] 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/171489">171489</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-07-23 14:16:33 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: InspectorBackend's promise-based agent API does not support multiple return values
https://bugs.webkit.org/show_bug.cgi?id=135207
Reviewed by Joseph Pecoraro.
Source/WebInspectorUI:
The promise wrapper implementation assumed that the protocol callback supplies a single 'payload'
return value, but InspectorBackend will actually unpack multiple return values as multiple
callback arguments. Set a special flag so it will not try to apply multiple return values.
It would read better if multiple return values could be spread to the resolve callback, but
multiple argument support are not required by the Promises specification, so we won't use them.
* UserInterface/Controllers/ReplayManager.js: Fix uses of promise return values.
(WebInspector.ReplayManager):
* UserInterface/Models/ReplaySession.js:
* UserInterface/Models/ReplaySessionSegment.js:
(WebInspector.ReplaySessionSegment):
* UserInterface/Protocol/InspectorBackend.js:
(InspectorBackend.Command.prototype.promise):
LayoutTests:
* http/tests/inspector/replay/replay-test.js: fix uses of promise API return values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorreplayreplaytestjs">trunk/LayoutTests/http/tests/inspector/replay/replay-test.js</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersReplayManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionjs">trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionSegmentjs">trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171488 => 171489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-23 20:59:40 UTC (rev 171488)
+++ trunk/LayoutTests/ChangeLog 2014-07-23 21:16:33 UTC (rev 171489)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-07-23 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: InspectorBackend's promise-based agent API does not support multiple return values
+ https://bugs.webkit.org/show_bug.cgi?id=135207
+
+ Reviewed by Joseph Pecoraro.
+
+ * http/tests/inspector/replay/replay-test.js: fix uses of promise API return values.
+
</ins><span class="cx"> 2014-07-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r171455.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorreplayreplaytestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/replay/replay-test.js (171488 => 171489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/replay/replay-test.js 2014-07-23 20:59:40 UTC (rev 171488)
+++ trunk/LayoutTests/http/tests/inspector/replay/replay-test.js 2014-07-23 21:16:33 UTC (rev 171489)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> return RuntimeAgent.evaluate.promise("dumpNondeterministicState()");
</span><span class="cx"> })
</span><span class="cx"> .then(function(payload) {
</span><del>- stateDuringCapturing = payload.value;
</del><ins>+ stateDuringCapturing = payload.result.value;
</ins><span class="cx"> return new Promise(function stopCapturing(resolve, reject) {
</span><span class="cx"> WebInspector.replayManager.stopCapturing();
</span><span class="cx"> WebInspector.replayManager.addEventListener(WebInspector.ReplayManager.Event.CaptureStopped, resolve);
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> return RuntimeAgent.evaluate.promise("dumpNondeterministicState()");
</span><span class="cx"> })
</span><span class="cx"> .then(function(payload) {
</span><del>- stateDuringReplaying = payload.value;
</del><ins>+ stateDuringReplaying = payload.result.value;
</ins><span class="cx"> return new Promise(function waitForReplayingToFinish(resolve, reject) {
</span><span class="cx"> WebInspector.replayManager.addEventListener(WebInspector.ReplayManager.Event.PlaybackFinished, resolve);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (171488 => 171489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-07-23 20:59:40 UTC (rev 171488)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-07-23 21:16:33 UTC (rev 171489)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-23 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: InspectorBackend's promise-based agent API does not support multiple return values
+ https://bugs.webkit.org/show_bug.cgi?id=135207
+
+ Reviewed by Joseph Pecoraro.
+
+ The promise wrapper implementation assumed that the protocol callback supplies a single 'payload'
+ return value, but InspectorBackend will actually unpack multiple return values as multiple
+ callback arguments. Set a special flag so it will not try to apply multiple return values.
+
+ It would read better if multiple return values could be spread to the resolve callback, but
+ multiple argument support are not required by the Promises specification, so we won't use them.
+
+ * UserInterface/Controllers/ReplayManager.js: Fix uses of promise return values.
+ (WebInspector.ReplayManager):
+ * UserInterface/Models/ReplaySession.js:
+ * UserInterface/Models/ReplaySessionSegment.js:
+ (WebInspector.ReplaySessionSegment):
+ * UserInterface/Protocol/InspectorBackend.js:
+ (InspectorBackend.Command.prototype.promise):
+
</ins><span class="cx"> 2014-07-21 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add esprima to the WebInspector.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersReplayManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js (171488 => 171489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js 2014-07-23 20:59:40 UTC (rev 171488)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ReplayManager.js 2014-07-23 21:16:33 UTC (rev 171489)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ReplayAgent.getAvailableSessions.promise()
</span><del>- .then(function(sessionIds) {
- for (var sessionId of sessionIds)
</del><ins>+ .then(function(payload) {
+ for (var sessionId of payload.ids)
</ins><span class="cx"> WebInspector.replayManager.sessionCreated(sessionId);
</span><span class="cx"> });
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js (171488 => 171489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js 2014-07-23 20:59:40 UTC (rev 171488)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySession.js 2014-07-23 21:16:33 UTC (rev 171489)
</span><span class="lines">@@ -63,9 +63,10 @@
</span><span class="cx">
</span><span class="cx"> _updateFromPayload: function(payload)
</span><span class="cx"> {
</span><del>- console.assert(payload.id === this.identifier);
</del><ins>+ var session = payload.session;
+ console.assert(session.id === this.identifier);
</ins><span class="cx">
</span><del>- var segmentIds = payload.segments;
</del><ins>+ var segmentIds = session.segments;
</ins><span class="cx"> var oldSegments = this._segments;
</span><span class="cx"> var pendingSegments = [];
</span><span class="cx"> for (var segmentId of segmentIds)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsReplaySessionSegmentjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js (171488 => 171489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js 2014-07-23 20:59:40 UTC (rev 171488)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ReplaySessionSegment.js 2014-07-23 21:16:33 UTC (rev 171489)
</span><span class="lines">@@ -47,14 +47,13 @@
</span><span class="cx"> {
</span><span class="cx"> WebInspector.Object.call(this);
</span><span class="cx">
</span><del>- console.assert(identifier === payload.id);
</del><ins>+ var segment = payload.segment;
+ console.assert(identifier === segment.id);
</ins><span class="cx">
</span><span class="cx"> this.identifier = identifier;
</span><del>- this._timestamp = payload.timestamp;
</del><ins>+ this._timestamp = segment.timestamp;
</ins><span class="cx">
</span><del>- this._queues = payload.queues;
-
- // XXX: make objects for the queues and inputs?
</del><ins>+ this._queues = segment.queues;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ReplaySessionSegment.prototype = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (171488 => 171489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2014-07-23 20:59:40 UTC (rev 171488)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2014-07-23 21:16:33 UTC (rev 171489)
</span><span class="lines">@@ -373,6 +373,10 @@
</span><span class="cx"> function convertToPromiseCallback(error, payload) {
</span><span class="cx"> return error ? reject(error) : resolve(payload);
</span><span class="cx"> }
</span><ins>+ // FIXME: this should be indicated by invoking the command differently, rather
+ // than by setting a magical property on the callback. <webkit.org/b/132386>
+ convertToPromiseCallback.expectsResultObject = true;
+
</ins><span class="cx"> promiseArguments.push(convertToPromiseCallback);
</span><span class="cx"> instance._invokeWithArguments.apply(instance, promiseArguments);
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>