Changeset 48491 in webkit

Timestamp:

Sep 17, 2009 1:54:57 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-09-17 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Timothy Hatcher.

Wrap primitive values (as objects) in InspectorController::wrap.

​https://bugs.webkit.org/show_bug.cgi?id=28983

• inspector/InspectorController.cpp: (WebCore::InspectorController::wrapObject): objects of any type will be wrapped into proxies, only object proxies will have objectId.
• inspector/front-end/ConsoleView.js: (WebInspector.ConsoleView.prototype.completions): there is InjectedScript.getCompletionsi that accepts an expression and returns possible completions. This way we don't need to wrap and unwrap the completions result into a proxy object.
• inspector/front-end/InjectedScript.js: (InjectedScript.getCompletions): (InjectedScript.evaluate): (InjectedScript._evaluateOn): (InjectedScript.createProxyObject):
• inspector/front-end/InjectedScriptAccess.js:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (2 diffs)
• inspector/front-end/ConsoleView.js (modified) (1 diff)
• inspector/front-end/InjectedScript.js (modified) (3 diffs)
• inspector/front-end/InjectedScriptAccess.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-17  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Wrap primitive values (as objects) in InspectorController::wrap.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28983
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::wrapObject): objects of any type will be wrapped into proxies,
+         only object proxies will have objectId.
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype.completions): there is InjectedScript.getCompletionsi
+         that accepts an expression and returns possible completions. This way we don't need to wrap
+         and unwrap the completions result into a proxy object.
+        * inspector/front-end/InjectedScript.js:
+        (InjectedScript.getCompletions):
+        (InjectedScript.evaluate):
+        (InjectedScript._evaluateOn):
+        (InjectedScript.createProxyObject):
+        * inspector/front-end/InjectedScriptAccess.js:
+
 2009-09-17  Nate Chapin  <japhet@chromium.org>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -1532 +1532 @@
 ScriptValue InspectorController::wrapObject(const ScriptValue& quarantinedObject)
 {
+    ScriptFunctionCall function(m_scriptState, m_injectedScriptObj, "createProxyObject");
+    function.appendArgument(quarantinedObject);
     if (quarantinedObject.isObject()) {
         long id = m_lastBoundObjectId++;
@@ -1537 +1539 @@
         m_idToConsoleObject.set(objectId, quarantinedObject);
 
-        ScriptFunctionCall function(m_scriptState, m_injectedScriptObj, "createProxyObject");
-        function.appendArgument(quarantinedObject);
         function.appendArgument(objectId);
-        ScriptValue wrapper = function.call();
-        return wrapper;
-    }
-    return quarantinedObject;
+    }
+    ScriptValue wrapper = function.call();
+    return wrapper;
 }
 

trunk/WebCore/inspector/front-end/ConsoleView.js

@@ -292 +292 @@
         }
 
-        function parsingCallback(result, isException)
-        {
-            if (!isException)
-                result = JSON.parse(result);
-            reportCompletions(result, isException);
-        }
-
-        this.evalInInspectedWindow(
-            "(function() {" +
-                "var props = {};" +
-                "for (var prop in (" + expressionString + ")) props[prop] = true;" +
-                ((!dotNotation && !bracketNotation) ?
-                "for (var prop in window._inspectorCommandLineAPI)" +
-                    "if (prop.charAt(0) !== '_') props[prop] = true;"
-                : "") +
-                "return JSON.stringify(props);" +
-            "})()",
-            parsingCallback);
+        var includeInspectorCommandLineAPI = (!dotNotation && !bracketNotation);
+        InjectedScriptAccess.getCompletions(expressionString, includeInspectorCommandLineAPI, reportCompletions);
     },
 

trunk/WebCore/inspector/front-end/InjectedScript.js

@@ -499 +499 @@
 }
 
+
+InjectedScript.getCompletions = function(expression, includeInspectorCommandLineAPI)
+{
+    var props = {};
+    try {
+        var expressionResult = InjectedScript._evaluateOn(InjectedScript._window().eval, InjectedScript._window(), expression);
+        for (var prop in expressionResult)
+            props[prop] = true;
+        if (includeInspectorCommandLineAPI)
+            for (var prop in InjectedScript._window()._inspectorCommandLineAPI)
+                if (prop.charAt(0) !== '_')
+                    props[prop] = true;
+    } catch(e) {
+    }
+    return props;
+}
+
+
 InjectedScript.evaluate = function(expression)
 {
-    return InjectedScript._evaluateOn(InjectedScript._window().eval, InjectedScript._window(), expression);
-}
-
-InjectedScript._evaluateOn = function(evalFunction, object, expression)
-{
-    InjectedScript._ensureCommandLineAPIInstalled();
-    // Surround the expression in with statements to inject our command line API so that
-    // the window object properties still take more precedent than our API functions.
-    expression = "with (window._inspectorCommandLineAPI) { with (window) { " + expression + " } }";
-
     var result = {};
     try {
-        var value = evalFunction.call(object, expression);
+        var value = InjectedScript._evaluateOn(InjectedScript._window().eval, InjectedScript._window(), expression);
         if (value === null)
             return { value: null };
@@ -534 +542 @@
     }
     return result;
+}
+
+InjectedScript._evaluateOn = function(evalFunction, object, expression)
+{
+    InjectedScript._ensureCommandLineAPIInstalled();
+    // Surround the expression in with statements to inject our command line API so that
+    // the window object properties still take more precedent than our API functions.
+    expression = "with (window._inspectorCommandLineAPI) { with (window) { " + expression + " } }";
+    return evalFunction.call(object, expression);
 }
 
@@ -951 +968 @@
 
     var type = typeof object;
-    if (type === "object" || type === "function") {
+    if ((type === "object" && object !== null) || type === "function") {
         for (var subPropertyName in object) {
             result.hasChildren = true;

trunk/WebCore/inspector/front-end/InjectedScriptAccess.js

@@ -64 +64 @@
 InjectedScriptAccess._installHandler("getProperties");
 InjectedScriptAccess._installHandler("setPropertyValue");
+InjectedScriptAccess._installHandler("getCompletions");
 InjectedScriptAccess._installHandler("evaluate");
 InjectedScriptAccess._installHandler("addInspectedNode");