Changeset 209958 in webkit

Timestamp:

Dec 16, 2016 9:05:17 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

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 <Joseph Pecoraro> 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.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/inspector/InjectedScriptSource.js (modified) (3 diffs)
• WebInspectorUI/ChangeLog (modified) (1 diff)
• WebInspectorUI/UserInterface/Base/Main.js (modified) (1 diff)
• WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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.
+
 2016-12-16  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js

@@ -56 +56 @@
 }
 
-function endsWith(str, suffix)
-{
-    var position = str.length - suffix.length;
-    if (position < 0)
-        return false;
-    return str.indexOf(suffix, position) === position;
-}
-
 function isSymbol(obj)
 {
@@ -654 +646 @@
 
                 if (nativeGettersAsValues) {
-                    if (endsWith(String(descriptor.get), "[native code]\n}") || (!descriptor.get && descriptor.hasOwnProperty("get") && !descriptor.set && descriptor.hasOwnProperty("set"))) {
+                    if (String(descriptor.get).endsWith("[native code]\n}") || (!descriptor.get && descriptor.hasOwnProperty("get") && !descriptor.set && descriptor.hasOwnProperty("set"))) {
                         // Developers may create such a descriptor, so we should be resilient:
                         // var x = {}; Object.defineProperty(x, "p", {get:undefined}); Object.getOwnPropertyDescriptor(x, "p")
@@ -816 +808 @@
         // NodeList in JSC is a function, check for array prior to this.
         if (typeof obj === "function")
-            return toString(obj);
+            return obj.toString();
 
         // If Object, try for a better name from the constructor.

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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.
+
 2016-12-16  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -693 +693 @@
 {
     var mainFrame = this.frameResourceManager.mainFrame;
-    console.assert(mainFrame);
+    if (!mainFrame)
+        return;
 
     var urlComponents = mainFrame.mainResource.urlComponents;

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js

@@ -321 +321 @@
         }
 
-        parentFolderTreeElement.representedObject.add(script);
+        if (parentFolderTreeElement)
+            parentFolderTreeElement.representedObject.add(script);
 
         var scriptTreeElement = new WebInspector.ScriptTreeElement(script);