<!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>[209958] trunk/Source</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/209958">209958</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-16 21:05:17 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSContext Inspector: Avoid some possible exceptions inspecting a JSContext
https://bugs.webkit.org/show_bug.cgi?id=165986
<rdar://problem/29551379>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-12-16
Reviewed by Matt Baker.
Source/JavaScriptCore:
* inspector/InjectedScriptSource.js:
(InjectedScript.prototype.processProperties):
Prefer String.prototype.endsWith now that it is available.
(InjectedScript.prototype._describe):
Prefer Function.prototype.toString for converting functions to String.
Previously we were doing String(f) which would to Symbol.toPrimitive
conversion which seems unnecessary here.
Source/WebInspectorUI:
* UserInterface/Base/Main.js:
There will not be a main frame if we are debugging a JSContext.
In those cases do not change the title.
* UserInterface/Views/ResourceSidebarPanel.js:
(WebInspector.ResourceSidebarPanel.prototype._scriptWasAdded):
There may not be a parent folder in JavaScript inspection. In that case
ScriptTreeElements are added to the Top Level, not folders.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209957 => 209958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-17 04:04:08 UTC (rev 209957)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-17 05:05:17 UTC (rev 209958)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ JSContext Inspector: Avoid some possible exceptions inspecting a JSContext
+ https://bugs.webkit.org/show_bug.cgi?id=165986
+ <rdar://problem/29551379>
+
+ Reviewed by Matt Baker.
+
+ * inspector/InjectedScriptSource.js:
+ (InjectedScript.prototype.processProperties):
+ Prefer String.prototype.endsWith now that it is available.
+
+ (InjectedScript.prototype._describe):
+ Prefer Function.prototype.toString for converting functions to String.
+ Previously we were doing String(f) which would to Symbol.toPrimitive
+ conversion which seems unnecessary here.
+
</ins><span class="cx"> 2016-12-16 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix GCC 6 build failure after r209952
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (209957 => 209958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-12-17 04:04:08 UTC (rev 209957)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2016-12-17 05:05:17 UTC (rev 209958)
</span><span class="lines">@@ -55,14 +55,6 @@
</span><span class="cx"> return "" + (obj >>> 0) === obj;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function endsWith(str, suffix)
-{
- var position = str.length - suffix.length;
- if (position < 0)
- return false;
- return str.indexOf(suffix, position) === position;
-}
-
</del><span class="cx"> function isSymbol(obj)
</span><span class="cx"> {
</span><span class="cx"> return typeof obj === "symbol";
</span><span class="lines">@@ -653,7 +645,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (nativeGettersAsValues) {
</span><del>- if (endsWith(String(descriptor.get), "[native code]\n}") || (!descriptor.get && descriptor.hasOwnProperty("get") && !descriptor.set && descriptor.hasOwnProperty("set"))) {
</del><ins>+ if (String(descriptor.get).endsWith("[native code]\n}") || (!descriptor.get && descriptor.hasOwnProperty("get") && !descriptor.set && descriptor.hasOwnProperty("set"))) {
</ins><span class="cx"> // Developers may create such a descriptor, so we should be resilient:
</span><span class="cx"> // var x = {}; Object.defineProperty(x, "p", {get:undefined}); Object.getOwnPropertyDescriptor(x, "p")
</span><span class="cx"> var fakeDescriptor = createFakeValueDescriptor(name, symbol, descriptor, isOwnProperty, true);
</span><span class="lines">@@ -815,7 +807,7 @@
</span><span class="cx">
</span><span class="cx"> // NodeList in JSC is a function, check for array prior to this.
</span><span class="cx"> if (typeof obj === "function")
</span><del>- return toString(obj);
</del><ins>+ return obj.toString();
</ins><span class="cx">
</span><span class="cx"> // If Object, try for a better name from the constructor.
</span><span class="cx"> if (className === "Object") {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (209957 => 209958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-17 04:04:08 UTC (rev 209957)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-17 05:05:17 UTC (rev 209958)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ JSContext Inspector: Avoid some possible exceptions inspecting a JSContext
+ https://bugs.webkit.org/show_bug.cgi?id=165986
+ <rdar://problem/29551379>
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Base/Main.js:
+ There will not be a main frame if we are debugging a JSContext.
+ In those cases do not change the title.
+
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype._scriptWasAdded):
+ There may not be a parent folder in JavaScript inspection. In that case
+ ScriptTreeElements are added to the Top Level, not folders.
+
</ins><span class="cx"> 2016-12-16 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: REGRESSION (r209882): Opening find banner in editor causes UI to hang
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (209957 => 209958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-12-17 04:04:08 UTC (rev 209957)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-12-17 05:05:17 UTC (rev 209958)
</span><span class="lines">@@ -692,7 +692,8 @@
</span><span class="cx"> WebInspector.updateWindowTitle = function()
</span><span class="cx"> {
</span><span class="cx"> var mainFrame = this.frameResourceManager.mainFrame;
</span><del>- console.assert(mainFrame);
</del><ins>+ if (!mainFrame)
+ return;
</ins><span class="cx">
</span><span class="cx"> var urlComponents = mainFrame.mainResource.urlComponents;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (209957 => 209958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2016-12-17 04:04:08 UTC (rev 209957)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2016-12-17 05:05:17 UTC (rev 209958)
</span><span class="lines">@@ -320,7 +320,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- parentFolderTreeElement.representedObject.add(script);
</del><ins>+ if (parentFolderTreeElement)
+ parentFolderTreeElement.representedObject.add(script);
</ins><span class="cx">
</span><span class="cx"> var scriptTreeElement = new WebInspector.ScriptTreeElement(script);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>