<!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>[199789] 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/199789">199789</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 14:58:44 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Make debounce use an ES6 Proxy
https://bugs.webkit.org/show_bug.cgi?id=156756
rdar://problem/25809771
Reviewed by Joseph Pecoraro.
Source/WebInspectorUI:
* UserInterface/Base/Utilities.js:
(Object.prototype.soon): Added.
(Object.prototype.debounce): Added.
(Function.prototype.debounce): Deleted.
(Function.prototype.cancelDebounce): Added.
* UserInterface/Views/BezierEditor.js:
(WebInspector.BezierEditor.createBezierInput): Use new debounce proxy.
* UserInterface/Views/VisualStyleBackgroundPicker.js:
(WebInspector.VisualStyleBackgroundPicker): Ditto.
* UserInterface/Views/VisualStyleURLInput.js:
(WebInspector.VisualStyleURLInput): Ditto.
LayoutTests:
* inspector/unit-tests/debounce-expected.txt: Added.
* inspector/unit-tests/debounce.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="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsBezierEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleBackgroundPickerjs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleBackgroundPicker.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleURLInputjs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleURLInput.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorunittestsdebounceexpectedtxt">trunk/LayoutTests/inspector/unit-tests/debounce-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsdebouncehtml">trunk/LayoutTests/inspector/unit-tests/debounce.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199788 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-20 21:54:09 UTC (rev 199788)
+++ trunk/LayoutTests/ChangeLog 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-19 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Make debounce use an ES6 Proxy
+
+ https://bugs.webkit.org/show_bug.cgi?id=156756
+ rdar://problem/25809771
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/unit-tests/debounce-expected.txt: Added.
+ * inspector/unit-tests/debounce.html: Added.
+
</ins><span class="cx"> 2016-04-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline tests for iOS simulator.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsdebounceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/debounce-expected.txt (0 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/debounce-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/debounce-expected.txt 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+Testing debounce proxy support.
+
+
+== Running test suite: Debouce
+-- Running test case: Basic Debounce
+PASS: Debounced successfully.
+PASS: Call delayed at least 100ms.
+PASS: `this` is the right object.
+PASS: Arguments length is 2.
+PASS: First argument is 4.
+PASS: Second argument is 'abc'.
+
+-- Running test case: Multiple Debounce Delays
+PASS: Debounced successfully.
+PASS: Call delayed at least 400ms.
+PASS: `this` is the right object.
+PASS: Arguments length is 2.
+PASS: First argument is 4.
+PASS: Second argument is 'abc'.
+
+-- Running test case: Soon Debounce
+PASS: Debounced successfully.
+PASS: `this` is the right object.
+PASS: Arguments length is 2.
+PASS: First argument is 4.
+PASS: Second argument is 'abc'.
+
+-- Running test case: Cancel Debounce
+PASS: Debounced function canceled.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsdebouncehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/debounce.html (0 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/debounce.html (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/debounce.html 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -0,0 +1,152 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Debouce");
+
+ suite.addTestCase({
+ name: "Basic Debounce",
+ test: function(resolve, reject) {
+ let callCount = 0;
+ let startTime = performance.now();
+
+ let object = {
+ test(foo, bar) {
+ if (++callCount === 1)
+ InspectorTest.pass("Debounced successfully.");
+ else
+ InspectorTest.fail("Debounced function called multiple times.");
+
+ InspectorTest.expectThat(performance.now() - startTime >= 100, "Call delayed at least 100ms.");
+
+ InspectorTest.expectThat(this === object, "`this` is the right object.");
+ InspectorTest.expectThat(arguments.length === 2, "Arguments length is 2.");
+ InspectorTest.expectThat(foo === 4, "First argument is 4.");
+ InspectorTest.expectThat(bar === "abc", "Second argument is 'abc'.");
+
+ resolve();
+ }
+ };
+
+ let debounceProxy = object.debounce(100);
+ debounceProxy.test(1, 'xyz');
+ debounceProxy.test(2, 'fgh');
+ debounceProxy.test(3, 'ert');
+ debounceProxy.test(4, 'abc');
+
+ if (!callCount)
+ return;
+
+ InspectorTest.fail("Debounced function called immediately.");
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "Multiple Debounce Delays",
+ test: function(resolve, reject) {
+ let callCount = 0;
+ let startTime = performance.now();
+
+ let object = {
+ test(foo, bar) {
+ if (++callCount === 1)
+ InspectorTest.pass("Debounced successfully.");
+ else
+ InspectorTest.fail("Debounced function called multiple times.");
+
+ InspectorTest.expectThat(performance.now() - startTime >= 400, "Call delayed at least 400ms.");
+
+ InspectorTest.expectThat(this === object, "`this` is the right object.");
+ InspectorTest.expectThat(arguments.length === 2, "Arguments length is 2.");
+ InspectorTest.expectThat(foo === 4, "First argument is 4.");
+ InspectorTest.expectThat(bar === "abc", "Second argument is 'abc'.");
+
+ resolve();
+ }
+ };
+
+ object.debounce(100).test(1, 'xyz');
+ object.debounce(200).test(2, 'fgh');
+ object.debounce(300).test(3, 'ert');
+ object.debounce(400).test(4, 'abc');
+
+ if (!callCount)
+ return;
+
+ InspectorTest.fail("Debounced function called immediately.");
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "Soon Debounce",
+ test: function(resolve, reject) {
+ let callCount = 0;
+
+ let object = {
+ test(foo, bar) {
+ if (++callCount === 1)
+ InspectorTest.pass("Debounced successfully.");
+ else
+ InspectorTest.fail("Debounced function called multiple times.");
+
+ InspectorTest.expectThat(this === object, "`this` is the right object.");
+ InspectorTest.expectThat(arguments.length === 2, "Arguments length is 2.");
+ InspectorTest.expectThat(foo === 4, "First argument is 4.");
+ InspectorTest.expectThat(bar === "abc", "Second argument is 'abc'.");
+
+ resolve();
+ }
+ };
+
+ object.soon.test(1, 'xyz');
+ object.soon.test(2, 'fgh');
+ object.soon.test(3, 'ert');
+ object.soon.test(4, 'abc');
+
+ if (!callCount)
+ return;
+
+ InspectorTest.fail("Debounced function called immediately.");
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "Cancel Debounce",
+ test: function(resolve, reject) {
+ let callCount = 0;
+ let startTime = performance.now();
+
+ let object = {
+ test(foo, bar) {
+ InspectorTest.fail("Debounced function call should have been canceled.");
+ resolve();
+ }
+ };
+
+ object.debounce(100).test(1, 'xyz');
+ object.test.cancelDebounce();
+
+ setTimeout(() => { InspectorTest.pass("Debounced function canceled."); resolve(); }, 200);
+
+ if (!callCount)
+ return;
+
+ InspectorTest.fail("Debounced function called immediately.");
+ resolve();
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Testing debounce proxy support.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199788 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-20 21:54:09 UTC (rev 199788)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-04-19 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Make debounce use an ES6 Proxy
+
+ https://bugs.webkit.org/show_bug.cgi?id=156756
+ rdar://problem/25809771
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Utilities.js:
+ (Object.prototype.soon): Added.
+ (Object.prototype.debounce): Added.
+ (Function.prototype.debounce): Deleted.
+ (Function.prototype.cancelDebounce): Added.
+
+ * UserInterface/Views/BezierEditor.js:
+ (WebInspector.BezierEditor.createBezierInput): Use new debounce proxy.
+ * UserInterface/Views/VisualStyleBackgroundPicker.js:
+ (WebInspector.VisualStyleBackgroundPicker): Ditto.
+ * UserInterface/Views/VisualStyleURLInput.js:
+ (WebInspector.VisualStyleURLInput): Ditto.
+
</ins><span class="cx"> 2016-04-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Picking Snapshot from navigation bar popup does to switch views
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (199788 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-04-20 21:54:09 UTC (rev 199788)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -1194,27 +1194,64 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> (function() {
</span><del>- // The `debounce` function lets you call a function with a delay and
- // if the function keeps getting called, the delay gets reset.
- // Note: The last call's arguments end being the ones that get used.
- // Use: foo.bar.debounce(200, foo)("Argument 1", "Argument 2")
</del><ins>+ // The `debounce` function lets you call any function on an object with a delay
+ // and if the function keeps getting called, the delay gets reset. Since `debounce`
+ // returns a Proxy, you can cache it and call multiple functions with the same delay.
</ins><span class="cx">
</span><del>- const debounceSymbol = Symbol("function-debounce-timeout");
</del><ins>+ // Use: object.debounce(200).foo("Argument 1", "Argument 2")
+ // Note: The last call's arguments get used for the delayed call.
</ins><span class="cx">
</span><del>- Object.defineProperty(Function.prototype, "debounce",
</del><ins>+ const debounceTimeoutSymbol = Symbol("debounce-timeout");
+ const debounceSoonProxySymbol = Symbol("debounce-soon-proxy");
+
+ Object.defineProperty(Object.prototype, "soon",
</ins><span class="cx"> {
</span><del>- value: function(delay, thisObject)
</del><ins>+ get: function()
</ins><span class="cx"> {
</span><del>- return () => {
- clearTimeout(this[debounceSymbol]);
</del><ins>+ if (!this[debounceSoonProxySymbol])
+ this[debounceSoonProxySymbol] = this.debounce(0);
+ return this[debounceSoonProxySymbol];
+ }
+ });
</ins><span class="cx">
</span><del>- let args = arguments;
- this[debounceSymbol] = setTimeout(() => {
- this.apply(thisObject, args);
- }, delay);
- };
</del><ins>+ Object.defineProperty(Object.prototype, "debounce",
+ {
+ value: function(delay)
+ {
+ console.assert(delay >= 0);
+
+ return new Proxy(this, {
+ get(target, property, receiver) {
+ return (...args) => {
+ let original = target[property];
+ console.assert(typeof original === "function");
+
+ if (original[debounceTimeoutSymbol])
+ clearTimeout(original[debounceTimeoutSymbol]);
+
+ let performWork = () => {
+ original[debounceTimeoutSymbol] = undefined;
+ original.apply(target, args);
+ };
+
+ original[debounceTimeoutSymbol] = setTimeout(performWork, delay);
+ };
+ }
+ });
</ins><span class="cx"> }
</span><span class="cx"> });
</span><ins>+
+ Object.defineProperty(Function.prototype, "cancelDebounce",
+ {
+ value: function()
+ {
+ if (!this[debounceTimeoutSymbol])
+ return;
+
+ clearTimeout(this[debounceTimeoutSymbol]);
+ this[debounceTimeoutSymbol] = undefined;
+ }
+ });
</ins><span class="cx"> })();
</span><span class="cx">
</span><span class="cx"> function appendWebInspectorSourceURL(string)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsBezierEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js (199788 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js 2016-04-20 21:54:09 UTC (rev 199788)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BezierEditor.js 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> {
</span><span class="cx"> let key = "_bezier" + id + "Input";
</span><span class="cx"> this[key] = this._numberInputContainer.createChild("input", className);
</span><del>- this[key].addEventListener("input", this._handleNumberInputInput.debounce(250, this));
</del><ins>+ this[key].addEventListener("input", this.debounce(250)._handleNumberInputInput);
</ins><span class="cx"> this[key].addEventListener("keydown", this._handleNumberInputKeydown.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleBackgroundPickerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleBackgroundPicker.js (199788 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleBackgroundPicker.js 2016-04-20 21:54:09 UTC (rev 199788)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleBackgroundPicker.js 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> this._valueInputElement.classList.add("value-input");
</span><span class="cx"> this._valueInputElement.type = "url";
</span><span class="cx"> this._valueInputElement.placeholder = WebInspector.UIString("Enter a URL");
</span><del>- this._valueInputElement.addEventListener("input", this._valueInputValueChanged.debounce(250, this));
</del><ins>+ this._valueInputElement.addEventListener("input", this.debounce(250)._valueInputValueChanged);
</ins><span class="cx"> this.contentElement.appendChild(this._valueInputElement);
</span><span class="cx">
</span><span class="cx"> this._valueTypePickerElement = document.createElement("select");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleURLInputjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleURLInput.js (199788 => 199789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleURLInput.js 2016-04-20 21:54:09 UTC (rev 199788)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleURLInput.js 2016-04-20 21:58:44 UTC (rev 199789)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> this._urlInputElement = document.createElement("input");
</span><span class="cx"> this._urlInputElement.type = "url";
</span><span class="cx"> this._urlInputElement.placeholder = WebInspector.UIString("Enter a URL");
</span><del>- this._urlInputElement.addEventListener("keyup", this._valueDidChange.debounce(250, this));
</del><ins>+ this._urlInputElement.addEventListener("keyup", this.debounce(250)._valueDidChange);
</ins><span class="cx"> this.contentElement.appendChild(this._urlInputElement);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>