<!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>[199031] trunk/Source/WebInspectorUI</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/199031">199031</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-04 17:12:35 -0700 (Mon, 04 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Uncaught exception in CSS with string "constructor" (WebInspector.Color.fromString())
https://bugs.webkit.org/show_bug.cgi?id=156183
<rdar://problem/25539279>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-04-04
Reviewed by Brian Burg.
* UserInterface/Models/Color.js:
(WebInspector.Color.fromString):
Fix the uncaught exception issue. Only look at own properties of
our keyword map to avoid values like "toString" and "constructor".
* UserInterface/Debug/UncaughtExceptionReporter.js:
(handleError):
(handleUncaughtException):
(handleUncaughtExceptionRecord):
Generalize uncaught exception handler error sheet to get
exception records from both uncaught exceptions (window.onerror)
and general Runtime Error objects (TypeError, etc).
* UserInterface/Base/Utilities.js:
(window.promiseLogError.window.promiseLogError):
Add a fallback log exception helper.
* UserInterface/Controllers/AnalyzerManager.js:
(WebInspector.AnalyzerManager.prototype.getAnalyzerMessagesForSourceCode):
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor):
Add catch handlers to Promises to log exceptions.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebInspectorUIUserInterfaceControllersAnalyzerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDebugUncaughtExceptionReporterjs">trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsColorjs">trunk/Source/WebInspectorUI/UserInterface/Models/Color.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199030 => 199031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-04 23:17:59 UTC (rev 199030)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-05 00:12:35 UTC (rev 199031)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-04-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Uncaught exception in CSS with string "constructor" (WebInspector.Color.fromString())
+ https://bugs.webkit.org/show_bug.cgi?id=156183
+ <rdar://problem/25539279>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Models/Color.js:
+ (WebInspector.Color.fromString):
+ Fix the uncaught exception issue. Only look at own properties of
+ our keyword map to avoid values like "toString" and "constructor".
+
+ * UserInterface/Debug/UncaughtExceptionReporter.js:
+ (handleError):
+ (handleUncaughtException):
+ (handleUncaughtExceptionRecord):
+ Generalize uncaught exception handler error sheet to get
+ exception records from both uncaught exceptions (window.onerror)
+ and general Runtime Error objects (TypeError, etc).
+
+ * UserInterface/Base/Utilities.js:
+ (window.promiseLogError.window.promiseLogError):
+ Add a fallback log exception helper.
+
+ * UserInterface/Controllers/AnalyzerManager.js:
+ (WebInspector.AnalyzerManager.prototype.getAnalyzerMessagesForSourceCode):
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor):
+ Add catch handlers to Promises to log exceptions.
+
</ins><span class="cx"> 2016-04-01 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed follow-up to r198968. Remove debug statements.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (199030 => 199031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-04-04 23:17:59 UTC (rev 199030)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-04-05 00:12:35 UTC (rev 199031)
</span><span class="lines">@@ -1244,3 +1244,10 @@
</span><span class="cx"> {
</span><span class="cx"> return window.performance ? performance.now() : Date.now();
</span><span class="cx"> }
</span><ins>+
+if (!window.handlePromiseException) {
+ window.handlePromiseException = function handlePromiseException(error)
+ {
+ console.error("Uncaught exception in Promise", error);
+ };
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersAnalyzerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js (199030 => 199031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js 2016-04-04 23:17:59 UTC (rev 199030)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js 2016-04-05 00:12:35 UTC (rev 199031)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> resolve(analyzerMessages);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- sourceCode.requestContent().then(retrieveAnalyzerMessages.bind(this));
</del><ins>+ sourceCode.requestContent().then(retrieveAnalyzerMessages.bind(this)).catch(handlePromiseException);
</ins><span class="cx"> }.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDebugUncaughtExceptionReporterjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js (199030 => 199031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js 2016-04-04 23:17:59 UTC (rev 199030)
+++ trunk/Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js 2016-04-05 00:12:35 UTC (rev 199031)
</span><span class="lines">@@ -50,14 +50,25 @@
</span><span class="cx"> document.removeEventListener(name, stopEventPropagation, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function handleError(error) {
+ handleUncaughtExceptionRecord({
+ message: error.message,
+ url: parseURL(error.sourceURL).lastPathComponent,
+ lineNumber: error.line,
+ columnNumber: error.column,
+ });
+}
+
</ins><span class="cx"> function handleUncaughtException(event) {
</span><del>- let exceptionRecord = {
</del><ins>+ handleUncaughtExceptionRecord({
</ins><span class="cx"> message: event.message,
</span><span class="cx"> url: parseURL(event.filename).lastPathComponent,
</span><span class="cx"> lineNumber: event.lineno,
</span><del>- columnNumber: event.colno
- };
</del><ins>+ columnNumber: event.colno,
+ });
+}
</ins><span class="cx">
</span><ins>+function handleUncaughtExceptionRecord(exceptionRecord) {
</ins><span class="cx"> if (!window.__uncaughtExceptions)
</span><span class="cx"> window.__uncaughtExceptions = [];
</span><span class="cx">
</span><span class="lines">@@ -199,5 +210,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.addEventListener("error", handleUncaughtException);
</span><ins>+window.handlePromiseException = handleError;
</ins><span class="cx">
</span><span class="cx"> })();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsColorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Color.js (199030 => 199031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Color.js 2016-04-04 23:17:59 UTC (rev 199030)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Color.js 2016-04-05 00:12:35 UTC (rev 199031)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> ]);
</span><span class="cx"> } else if (match[3]) { // keyword
</span><span class="cx"> let keyword = match[3].toLowerCase();
</span><del>- if (!WebInspector.Color.Keywords[keyword])
</del><ins>+ if (!WebInspector.Color.Keywords.hasOwnProperty(keyword))
</ins><span class="cx"> return null;
</span><span class="cx"> let color = new WebInspector.Color(WebInspector.Color.Format.Keyword, WebInspector.Color.Keywords[keyword].concat(1));
</span><span class="cx"> color.keyword = keyword;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (199030 => 199031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-04-04 23:17:59 UTC (rev 199030)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-04-05 00:12:35 UTC (rev 199031)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> else
</span><span class="cx"> this._sourceCode.addEventListener(WebInspector.SourceCode.Event.SourceMapAdded, this._sourceCodeSourceMapAdded, this);
</span><span class="cx">
</span><del>- sourceCode.requestContent().then(this._contentAvailable.bind(this));
</del><ins>+ sourceCode.requestContent().then(this._contentAvailable.bind(this)).catch(handlePromiseException);
</ins><span class="cx">
</span><del>- // FIXME: Cmd+L shorcut doesn't actually work.
</del><ins>+ // FIXME: Cmd+L shortcut doesn't actually work.
</ins><span class="cx"> new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "L", this.showGoToLineDialog.bind(this), this.element);
</span><span class="cx"> new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "G", this.showGoToLineDialog.bind(this), this.element);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>