<!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>[205402] 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/205402">205402</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-03 07:40:36 -0700 (Sat, 03 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Address ESLint undefined variable errors
https://bugs.webkit.org/show_bug.cgi?id=161563
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-09-03
Reviewed by Darin Adler.
Source/WebInspectorUI:
* UserInterface/Controllers/CSSStyleManager.js:
(WebInspector.CSSStyleManager.protocolMediaSourceToEnum):
* UserInterface/Models/IssueMessage.js:
(WebInspector.IssueMessage):
* UserInterface/Protocol/InspectorBackend.js:
LayoutTests:
* inspector/protocol/inspector-backend-invocation-return-value-expected.txt:
* inspector/protocol/inspector-backend-invocation-return-value.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolinspectorbackendinvocationreturnvalueexpectedtxt">trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolinspectorbackendinvocationreturnvaluehtml">trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsIssueMessagejs">trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.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 (205401 => 205402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-03 14:38:38 UTC (rev 205401)
+++ trunk/LayoutTests/ChangeLog 2016-09-03 14:40:36 UTC (rev 205402)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-03 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Address ESLint undefined variable errors
+ https://bugs.webkit.org/show_bug.cgi?id=161563
+
+ Reviewed by Darin Adler.
+
+ * inspector/protocol/inspector-backend-invocation-return-value-expected.txt:
+ * inspector/protocol/inspector-backend-invocation-return-value.html:
+
</ins><span class="cx"> 2016-09-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Align meta element http-equiv="refresh" parsing with the HTML specification
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolinspectorbackendinvocationreturnvalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value-expected.txt (205401 => 205402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value-expected.txt 2016-09-03 14:38:38 UTC (rev 205401)
+++ trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value-expected.txt 2016-09-03 14:40:36 UTC (rev 205402)
</span><span class="lines">@@ -16,6 +16,11 @@
</span><span class="cx"> PASS: A backend command should return a Promise when invoked without a callback.
</span><span class="cx"> PASS: An invalid command invocation's promise should be rejected.
</span><span class="cx">
</span><ins>+-- Running test case: RejectCommandPromiseWithExtraArgumentThatIsNotCallback
+ERROR: Protocol Error: Protocol Error: Optional callback argument for command 'Runtime.enable' call must be a function but its type is 'number'.
+PASS: A backend command should return a Promise when invoked without a callback.
+PASS: An invalid command invocation's promise should be rejected.
+
</ins><span class="cx"> -- Running test case: ReturnNothingIfCallback
</span><span class="cx"> PASS: A backend command should not have a return value when invoked with a callback.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolinspectorbackendinvocationreturnvaluehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value.html (205401 => 205402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value.html 2016-09-03 14:38:38 UTC (rev 205401)
+++ trunk/LayoutTests/inspector/protocol/inspector-backend-invocation-return-value.html 2016-09-03 14:40:36 UTC (rev 205402)
</span><span class="lines">@@ -73,6 +73,27 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ suite.addTestCase({
+ name: "RejectCommandPromiseWithExtraArgumentThatIsNotCallback",
+ description: "Backend command's returned promise should be rejected if the command has an extra argument that is not a callback.",
+ test: (resolve, reject) => {
+ let result = RuntimeAgent.enable(1);
+
+ InspectorTest.expectThat(result instanceof Promise, "A backend command should return a Promise when invoked without a callback.");
+ // If a promise wasn't returned, we can't test the rest so just die.
+ if (!(result instanceof Promise))
+ reject();
+
+ result.then(function resolved(result) {
+ InspectorTest.log("FAIL: An invalid command invocation's promise should be rejected.");
+ reject();
+ }, function rejected(result) {
+ InspectorTest.log("PASS: An invalid command invocation's promise should be rejected.");
+ resolve();
+ });
+ }
+ });
+
</ins><span class="cx"> // Test behavior for function-based callbacks.
</span><span class="cx">
</span><span class="cx"> suite.addTestCase({
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (205401 => 205402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-03 14:38:38 UTC (rev 205401)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-03 14:40:36 UTC (rev 205402)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-09-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Address ESLint undefined variable errors
+ https://bugs.webkit.org/show_bug.cgi?id=161563
+
+ Reviewed by Darin Adler.
+
+ * UserInterface/Controllers/CSSStyleManager.js:
+ (WebInspector.CSSStyleManager.protocolMediaSourceToEnum):
+ * UserInterface/Models/IssueMessage.js:
+ (WebInspector.IssueMessage):
+ * UserInterface/Protocol/InspectorBackend.js:
+
+2016-09-03 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Address ESLint undefined variable errors in UserInterface/Views
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161565
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js (205401 => 205402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2016-09-03 14:38:38 UTC (rev 205401)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2016-09-03 14:40:36 UTC (rev 205402)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> case CSSAgent.CSSMediaSource.InlineSheet:
</span><span class="cx"> return WebInspector.CSSMedia.Type.InlineStyleSheet;
</span><span class="cx"> default:
</span><del>- console.assert(false, "Unknown CSS.CSSMediaSource", origin);
</del><ins>+ console.assert(false, "Unknown CSS.CSSMediaSource", source);
</ins><span class="cx"> return WebInspector.CSSMedia.Type.MediaRule;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsIssueMessagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js (205401 => 205402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js 2016-09-03 14:38:38 UTC (rev 205401)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/IssueMessage.js 2016-09-03 14:40:36 UTC (rev 205402)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- console.error("Unknown issue source:", source);
</del><ins>+ console.error("Unknown issue source:", this._consoleMessage.source);
</ins><span class="cx"> this._type = WebInspector.IssueMessage.Type.OtherIssue;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorBackendjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (205401 => 205402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2016-09-03 14:38:38 UTC (rev 205401)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2016-09-03 14:40:36 UTC (rev 205402)
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!callback && commandArguments.length === 1 && commandArguments[0] !== undefined)
</span><del>- return deliverFailure(`Protocol Error: Optional callback argument for command '${instance.qualifiedName}' call must be a function but its type is '${typeof args[0]}'.`);
</del><ins>+ return deliverFailure(`Protocol Error: Optional callback argument for command '${instance.qualifiedName}' call must be a function but its type is '${typeof commandArguments[0]}'.`);
</ins><span class="cx">
</span><span class="cx"> if (callback)
</span><span class="cx"> instance._backend._sendCommandToBackendWithCallback(instance, parameters, callback);
</span></span></pre>
</div>
</div>
</body>
</html>