<!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>[210261] 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/210261">210261</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2017-01-03 17:32:13 -0800 (Tue, 03 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: WrappedPromise constructor should behave like the Promise constructor
https://bugs.webkit.org/show_bug.cgi?id=166523
Reviewed by Joseph Pecoraro.
Source/WebInspectorUI:
* UserInterface/Models/WrappedPromise.js:
(WebInspector.WrappedPromise):
- Return the result of 'work' from the inner promise
so WrappedPromise.promise can be chained.
- Provide shim resolve, reject callbacks as parameters.
(WebInspector.WrappedPromise.prototype.get settled): Added.
Tells whether we already resolved or rejected the promise.
(WebInspector.WrappedPromise.prototype.resolve):
(WebInspector.WrappedPromise.prototype.reject):
Throw an error if already settled and update the flag.
LayoutTests:
* inspector/unit-tests/wrapped-promise-expected.txt: Added.
* inspector/unit-tests/wrapped-promise.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsWrappedPromisejs">trunk/Source/WebInspectorUI/UserInterface/Models/WrappedPromise.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorunittestswrappedpromiseexpectedtxt">trunk/LayoutTests/inspector/unit-tests/wrapped-promise-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestswrappedpromisehtml">trunk/LayoutTests/inspector/unit-tests/wrapped-promise.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210260 => 210261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-04 01:26:58 UTC (rev 210260)
+++ trunk/LayoutTests/ChangeLog 2017-01-04 01:32:13 UTC (rev 210261)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-03 Brian Burg <bburg@apple.com>
+
+ Web Inspector: WrappedPromise constructor should behave like the Promise constructor
+ https://bugs.webkit.org/show_bug.cgi?id=166523
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/unit-tests/wrapped-promise-expected.txt: Added.
+ * inspector/unit-tests/wrapped-promise.html: Added.
+
</ins><span class="cx"> 2017-01-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Address failures under LayoutTests/inspector/debugger/stepping
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestswrappedpromiseexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/wrapped-promise-expected.txt (0 => 210261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/wrapped-promise-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/wrapped-promise-expected.txt 2017-01-04 01:32:13 UTC (rev 210261)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Testing methods of WrappedPromise.
+
+
+== Running test suite: WrappedPromise
+-- Running test case: WrappedPromise.constructor resolve
+-- Running test case: WrappedPromise.constructor reject
+-- Running test case: WrappedPromise.prototype.resolve
+-- Running test case: WrappedPromise.prototype.reject
+-- Running test case: WrappedPromise.prototype.get settled
+PASS: Should not be settled yet.
+PASS: Should be settled now.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestswrappedpromisehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/wrapped-promise.html (0 => 210261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/wrapped-promise.html (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/wrapped-promise.html 2017-01-04 01:32:13 UTC (rev 210261)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("WrappedPromise");
+
+ suite.addTestCase({
+ name: "WrappedPromise.constructor resolve",
+ description: "Should be able to resolve the promise using the 'resolve' callback argument.",
+ test(resolve, reject) {
+ let result = new WebInspector.WrappedPromise((resolve, reject) => {
+ resolve();
+ });
+
+ result.promise.then(resolve, reject);
+ }
+ });
+
+ suite.addTestCase({
+ name: "WrappedPromise.constructor reject",
+ description: "Should be able to reject the promise using the 'reject' callback argument.",
+ test(resolve, reject) {
+ let result = new WebInspector.WrappedPromise((resolve, reject) => {
+ reject();
+ });
+
+ result.promise.then(reject, resolve);
+ }
+ });
+
+ suite.addTestCase({
+ name: "WrappedPromise.prototype.resolve",
+ description: "Should be able to resolve the promise using resolve().",
+ test(resolve, reject) {
+ let result = new WebInspector.WrappedPromise;
+ result.promise.then(resolve, reject);
+
+ result.resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "WrappedPromise.prototype.reject",
+ description: "Should be able to reject the promise using reject().",
+ test(resolve, reject) {
+ let result = new WebInspector.WrappedPromise;
+ result.promise.then(reject, resolve);
+
+ result.reject();
+ }
+ });
+
+ suite.addTestCase({
+ name: "WrappedPromise.prototype.get settled",
+ description: "Should be able to see that the promise is settled.",
+ test(resolve, reject) {
+ let result = new WebInspector.WrappedPromise;
+ InspectorTest.expectFalse(result.settled, "Should not be settled yet.");
+
+ result.promise.then(() => {
+ InspectorTest.expectThat(result.settled, "Should be settled now.");
+ resolve();
+ })
+ .catch(reject);
+
+ result.resolve();
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Testing methods of WrappedPromise.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (210260 => 210261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-01-04 01:26:58 UTC (rev 210260)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-01-04 01:32:13 UTC (rev 210261)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-03 Brian Burg <bburg@apple.com>
+
+ Web Inspector: WrappedPromise constructor should behave like the Promise constructor
+ https://bugs.webkit.org/show_bug.cgi?id=166523
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Models/WrappedPromise.js:
+ (WebInspector.WrappedPromise):
+ - Return the result of 'work' from the inner promise
+ so WrappedPromise.promise can be chained.
+ - Provide shim resolve, reject callbacks as parameters.
+
+ (WebInspector.WrappedPromise.prototype.get settled): Added.
+ Tells whether we already resolved or rejected the promise.
+
+ (WebInspector.WrappedPromise.prototype.resolve):
+ (WebInspector.WrappedPromise.prototype.reject):
+ Throw an error if already settled and update the flag.
+
</ins><span class="cx"> 2017-01-03 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: color picker should feature an editable CSS value
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsWrappedPromisejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/WrappedPromise.js (210260 => 210261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/WrappedPromise.js 2017-01-04 01:26:58 UTC (rev 210260)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/WrappedPromise.js 2017-01-04 01:32:13 UTC (rev 210261)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,17 +27,25 @@
</span><span class="cx"> {
</span><span class="cx"> constructor(work)
</span><span class="cx"> {
</span><ins>+ this._settled = false;
</ins><span class="cx"> this._promise = new Promise((resolve, reject) => {
</span><del>- this._resolve = resolve;
- this._reject = reject;
</del><ins>+ this._resolveCallback = resolve;
+ this._rejectCallback = reject;
</ins><span class="cx">
</span><ins>+ // Allow work to resolve or reject the promise by shimming our
+ // internal callbacks. This ensures that this._settled gets set properly.
</ins><span class="cx"> if (work && typeof work === "function")
</span><del>- work();
</del><ins>+ return work(this.resolve.bind(this), this.reject.bind(this));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><ins>+ get settled()
+ {
+ return this._settled;
+ }
+
</ins><span class="cx"> get promise()
</span><span class="cx"> {
</span><span class="cx"> return this._promise;
</span><span class="lines">@@ -45,11 +53,19 @@
</span><span class="cx">
</span><span class="cx"> resolve(value)
</span><span class="cx"> {
</span><del>- this._resolve(value);
</del><ins>+ if (this._settled)
+ throw new Error("Promise is already settled, cannot call resolve().");
+
+ this._settled = true;
+ this._resolveCallback(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> reject(value)
</span><span class="cx"> {
</span><del>- this._reject(value);
</del><ins>+ if (this._settled)
+ throw new Error("Promise is already settled, cannot call reject().");
+
+ this._settled = true;
+ this._rejectCallback(value);
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>