Title: [218708] trunk/Source/_javascript_Core
Revision
218708
Author
[email protected]
Date
2017-06-22 11:35:17 -0700 (Thu, 22 Jun 2017)

Log Message

Web Inspector: Remove stale "rawScopes" concept that was never available in JSC
https://bugs.webkit.org/show_bug.cgi?id=173686

Reviewed by Mark Lam.

* inspector/InjectedScript.cpp:
(Inspector::InjectedScript::functionDetails):
* inspector/InjectedScriptSource.js:
(InjectedScript.prototype.functionDetails):
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::functionDetails):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (218707 => 218708)


--- trunk/Source/_javascript_Core/ChangeLog	2017-06-22 18:32:18 UTC (rev 218707)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-06-22 18:35:17 UTC (rev 218708)
@@ -1,3 +1,17 @@
+2017-06-22  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Remove stale "rawScopes" concept that was never available in JSC
+        https://bugs.webkit.org/show_bug.cgi?id=173686
+
+        Reviewed by Mark Lam.
+
+        * inspector/InjectedScript.cpp:
+        (Inspector::InjectedScript::functionDetails):
+        * inspector/InjectedScriptSource.js:
+        (InjectedScript.prototype.functionDetails):
+        * inspector/JSInjectedScriptHost.cpp:
+        (Inspector::JSInjectedScriptHost::functionDetails):
+
 2017-06-22  Yusuke Suzuki  <[email protected]>
 
         [JSC] Object.values should be implemented in C++

Modified: trunk/Source/_javascript_Core/inspector/InjectedScript.cpp (218707 => 218708)


--- trunk/Source/_javascript_Core/inspector/InjectedScript.cpp	2017-06-22 18:32:18 UTC (rev 218707)
+++ trunk/Source/_javascript_Core/inspector/InjectedScript.cpp	2017-06-22 18:35:17 UTC (rev 218708)
@@ -113,7 +113,6 @@
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("functionDetails"), inspectorEnvironment()->functionCallHandler());
     function.appendArgument(value);
-    function.appendArgument(true); // Preview only.
 
     RefPtr<InspectorValue> resultValue;
     makeCall(function, &resultValue);

Modified: trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js (218707 => 218708)


--- trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js	2017-06-22 18:32:18 UTC (rev 218707)
+++ trunk/Source/_javascript_Core/inspector/InjectedScriptSource.js	2017-06-22 18:35:17 UTC (rev 218708)
@@ -103,28 +103,12 @@
         return InjectedScript.RemoteObject.createObjectPreviewForValue(value, true);
     },
 
-    functionDetails: function(func, previewOnly)
+    functionDetails: function(func)
     {
         var details = InjectedScriptHost.functionDetails(func);
         if (!details)
             return "Cannot resolve function details.";
 
-        // FIXME: provide function scope data in "scopesRaw" property when JSC supports it.
-        // <https://webkit.org/b/87192> [JSC] expose function (closure) inner context to debugger
-        if ("rawScopes" in details) {
-            if (previewOnly)
-                delete details.rawScopes;
-            else {
-                var objectGroupName = this._idToObjectGroupName[parsedFunctionId.id];
-                var rawScopes = details.rawScopes;
-                var scopes = [];
-                delete details.rawScopes;
-                for (var i = 0; i < rawScopes.length; i++)
-                    scopes.push(InjectedScript.CallFrameProxy._createScopeJson(rawScopes[i].type, rawScopes[i].object, objectGroupName));
-                details.scopeChain = scopes;
-            }
-        }
-
         return details;
     },
 

Modified: trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp (218707 => 218708)


--- trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp	2017-06-22 18:32:18 UTC (rev 218707)
+++ trunk/Source/_javascript_Core/inspector/JSInjectedScriptHost.cpp	2017-06-22 18:35:17 UTC (rev 218708)
@@ -214,6 +214,8 @@
     if (!value.asCell()->inherits(vm, JSFunction::info()))
         return jsUndefined();
 
+    // FIXME: <https://webkit.org/b/87192> Web Inspector: Expose function scope / closure data
+
     // FIXME: This should provide better details for JSBoundFunctions.
 
     JSFunction* function = jsCast<JSFunction*>(value);
@@ -246,9 +248,6 @@
     if (!displayName.isEmpty())
         result->putDirect(vm, Identifier::fromString(exec, "displayName"), jsString(exec, displayName));
 
-    // FIXME: provide function scope data in "scopesRaw" property when JSC supports it.
-    // <https://webkit.org/b/87192> [JSC] expose function (closure) inner context to debugger
-
     return result;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to