Changeset 248595 in webkit

Timestamp:

Aug 13, 2019 8:34:29 AM (5 years ago)

Author:

Joseph Pecoraro

Message:

JSContext Inspector: Basic CommandLineAPI doesn't work
​https://bugs.webkit.org/show_bug.cgi?id=200659
<rdar://problem/54245476>

Reviewed by Brian Burg.

• inspector/InjectedScriptSource.js:

(BasicCommandLineAPI):
Use method directly since it already has been setup nicely and doesn't
need to be bound. Technically this allows someone to add properties to
the CommandLineAPI methods in basic mode (dir.property = 1) but that
seems harmless.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptSource.js (modified) (11 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-13  Joseph Pecoraro  <pecoraro@apple.com>
+
+        JSContext Inspector: Basic CommandLineAPI doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=200659
+        <rdar://problem/54245476>
+
+        Reviewed by Brian Burg.
+
+        * inspector/InjectedScriptSource.js:
+        (BasicCommandLineAPI):
+        Use `method` directly since it already has been setup nicely and doesn't
+        need to be bound. Technically this allows someone to add properties to
+        the CommandLineAPI methods in basic mode (`dir.property = 1`) but that
+        seems harmless.
+
 2019-08-12  Sam Weinig  <weinig@apple.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js

@@ -291 +291 @@
             let value = this._resolveCallArgument(callArgument);
             this._saveResult(value);
-        } catch (e) {}
+        } catch { }
 
         return this._savedResultIndex;
@@ -515 +515 @@
         try {
             remoteObject.description = toStringDescription(value);
-        } catch (e) {}
+        } catch { }
         return {
             wasThrown: true,
@@ -745 +745 @@
         try {
             isArrayLike = RemoteObject.subtype(object) === "array" && isFinite(object.length) && object.length > 0;
-        } catch(e) {}
+        } catch { }
 
         for (let o = object; isDefined(o); o = Object.getPrototypeOf(o)) {
@@ -766 +766 @@
             if (object.__proto__)
                 descriptors.push({name: "__proto__", value: object.__proto__, writable: true, configurable: true, enumerable: false, isOwn: true});
-        } catch (e) {}
+        } catch { }
 
         return descriptors;
@@ -867 +867 @@
         return this._savedResults[index];
     }
-}
+};
 
 InjectedScript.CollectionMode = {
@@ -981 +981 @@
             if (typeof value.splice === "function" && isFinite(value.length))
                 return "array";
-        } catch (e) {}
+        } catch { }
 
         return null;
@@ -1135 +1135 @@
             if (propertiesThreshold.indexes < 0 || propertiesThreshold.properties < 0)
                 return preview;
-        } catch (e) {
+        } catch {
             preview.lossless = false;
         }
@@ -1387 +1387 @@
         return string.substr(0, maxLength) + "\u2026";
     }
-}
+};
 
 // -------
@@ -1399 +1399 @@
     this.this = RemoteObject.create(callFrame.thisObject, "backtrace");
     this.isTailDeleted = callFrame.isTailDeleted;
-}
+};
 
 InjectedScript.CallFrameProxy.prototype = {
@@ -1412 +1412 @@
         return scopeChainProxy;
     }
-}
+};
 
 InjectedScript.CallFrameProxy._scopeTypeNames = {
@@ -1483 +1483 @@
     for (let i = 0; i < BasicCommandLineAPI.methods.length; ++i) {
         let method = BasicCommandLineAPI.methods[i];
-        this[method] = bind(commandLineAPIImpl[method], commandLineAPIImpl);
-        this[method].toString = function() { return "function " + method + "() { [Command Line API] }" };
+        this[method.name] = method;
     }
 }