Changeset 249173 in webkit

Timestamp:

Aug 27, 2019, 2:40:11 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: don't attach properties to injectedScript for the CommandLineAPI
​https://bugs.webkit.org/show_bug.cgi?id=201193

Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

For some reason, adding injectedScript._inspectObject inside CommandLineAPIModuleSource.js
causes inspector/debugger/tail-deleted-frames-this-value.html to fail.

We should have a similar approach to adding command line api getters and functions, in that
the CommandLineAPIModuleSource.js calls a function with a callback.

• inspector/InjectedScriptSource.js:

(InjectedScript.prototype.inspectObject):
(InjectedScript.prototype.setInspectObject): Added.
(InjectedScript.prototype._evaluateOn):

Source/WebCore:

For some reason, adding injectedScript._inspectObject inside CommandLineAPIModuleSource.js
causes inspector/debugger/tail-deleted-frames-this-value.html to fail.

We should have a similar approach to adding command line api getters and functions, in that
the CommandLineAPIModuleSource.js calls a function with a callback.

• inspector/CommandLineAPIModuleSource.js:

(injectedScript._inspectObject): Deleted.

LayoutTests:

• http/tests/inspector/dom/cross-domain-inspected-node-access-expected.txt:
• inspector/console/command-line-api-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access-expected.txt (modified) (1 diff)
• LayoutTests/inspector/console/command-line-api-expected.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/InjectedScriptSource.js (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/CommandLineAPIModuleSource.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-27  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: don't attach properties to `injectedScript` for the CommandLineAPI
+        https://bugs.webkit.org/show_bug.cgi?id=201193
+
+        Reviewed by Joseph Pecoraro.
+
+        * http/tests/inspector/dom/cross-domain-inspected-node-access-expected.txt:
+        * inspector/console/command-line-api-expected.txt:
+
 2019-08-27  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/LayoutTests/http/tests/inspector/dom/cross-domain-inspected-node-access-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 8: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 8: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 6: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 6: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
 Test that code evaluated in the main frame cannot access $0 that resolves to a node in a frame from a different domain. Bug 105423.
 

trunk/LayoutTests/inspector/console/command-line-api-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 31: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
+CONSOLE MESSAGE: line 29: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
 Tests that command line api works.
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-27  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: don't attach properties to `injectedScript` for the CommandLineAPI
+        https://bugs.webkit.org/show_bug.cgi?id=201193
+
+        Reviewed by Joseph Pecoraro.
+
+        For some reason, adding `injectedScript._inspectObject` inside CommandLineAPIModuleSource.js
+        causes inspector/debugger/tail-deleted-frames-this-value.html to fail.
+
+        We should have a similar approach to adding command line api getters and functions, in that
+        the CommandLineAPIModuleSource.js calls a function with a callback.
+
+        * inspector/InjectedScriptSource.js:
+        (InjectedScript.prototype.inspectObject):
+        (InjectedScript.prototype.setInspectObject): Added.
+        (InjectedScript.prototype._evaluateOn):
+
 2019-08-27  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js

@@ -388 +388 @@
     }
 
-    inspectObject(object)
-    {
-        if (this._inspectObject)
-            this._inspectObject(object);
-    }
-
     releaseObject(objectId)
     {
@@ -419 +413 @@
 
     // CommandLineAPI
+
+    inspectObject(object)
+    {
+        if (this._inspectObject)
+            this._inspectObject(object);
+    }
+
+    setInspectObject(callback)
+    {
+        this._inspectObject = callback;
+    }
 
     addCommandLineAPIGetter(name, func)
@@ -579 +584 @@
         let commandLineAPI = null;
         if (includeCommandLineAPI)
-            commandLineAPI = new InjectedScript.CommandLineAPI(isEvalOnCallFrame ? object : null)
+            commandLineAPI = new InjectedScript.CommandLineAPI(isEvalOnCallFrame ? object : null);
         return evalFunction.call(object, expression, commandLineAPI);
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-27  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: don't attach properties to `injectedScript` for the CommandLineAPI
+        https://bugs.webkit.org/show_bug.cgi?id=201193
+
+        Reviewed by Joseph Pecoraro.
+
+        For some reason, adding `injectedScript._inspectObject` inside CommandLineAPIModuleSource.js
+        causes inspector/debugger/tail-deleted-frames-this-value.html to fail.
+
+        We should have a similar approach to adding command line api getters and functions, in that
+        the CommandLineAPIModuleSource.js calls a function with a callback.
+
+        * inspector/CommandLineAPIModuleSource.js:
+        (injectedScript._inspectObject): Deleted.
+
 2019-08-27  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js

@@ -33 +33 @@
 // FIXME: <https://webkit.org/b/152294> Web Inspector: Parse InjectedScriptSource as a built-in to get guaranteed non-user-overridden built-ins
 
-injectedScript._inspectObject = function(object) {
+injectedScript.setInspectObject(function(object) {
     if (arguments.length === 0)
         return;
 
-    let objectId = RemoteObject.create(object, "");
+    let objectId = RemoteObject.create(object);
     let hints = {};
 
     switch (RemoteObject.describe(object)) {
     case "Database":
-        let databaseId = CommandLineAPIHost.databaseId(object)
+        var databaseId = CommandLineAPIHost.databaseId(object);
         if (databaseId)
             hints.databaseId = databaseId;
         break;
     case "Storage":
-        let storageId = CommandLineAPIHost.storageId(object)
+        var storageId = CommandLineAPIHost.storageId(object);
         if (storageId)
             hints.domStorageId = InjectedScriptHost.evaluate("(" + storageId + ")");
@@ -54 +54 @@
 
     CommandLineAPIHost.inspect(objectId, hints);
-    return object;
-};
+});
 
 injectedScript.addCommandLineAPIGetter("0", function() {