Changeset 56532 in webkit

Timestamp:

Mar 25, 2010 5:19:35 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-03-25 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Expect console object wrapping to fail.

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

• inspector/front-end/InjectedScript.js: (injectedScriptConstructor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScript.cpp (modified) (1 diff)
• inspector/front-end/InjectedScript.js (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-25  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Expect console object wrapping to fail.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36587
+
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor):
+
 2010-03-25  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
 

trunk/WebCore/inspector/InjectedScript.cpp

@@ -75 +75 @@
     wrapFunction.appendArgument(value);
     wrapFunction.appendArgument("console");
-    ScriptValue r = wrapFunction.call();
+    bool hadException = false;
+    ScriptValue r = wrapFunction.call(hadException);
+    if (hadException)
+        return SerializedScriptValue::create("<exception>");
     return r.serialize(m_injectedScriptObject.scriptState());
 }

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

@@ -36 +36 @@
 InjectedScript.wrapObject = function(object, objectGroupName)
 {
-    var objectId;
-    if (typeof object === "object" || typeof object === "function" ||
-        (typeof object === "undefined" && object instanceof inspectedWindow.HTMLAllCollection)) { // FIXME(33716)
-        var id = InjectedScript.lastBoundObjectId++;
-        objectId = "object#" + id;
-        InjectedScript.idToWrappedObject[objectId] = object;
-
-        var group = InjectedScript.objectGroups[objectGroupName];
-        if (!group) {
-            group = [];
-            InjectedScript.objectGroups[objectGroupName] = group;
-        }
-        group.push(objectId);
+    try {
+        var objectId;
+        if (typeof object === "object" || typeof object === "function" || InjectedScript._isHTMLAllCollection(object)) {
+            var id = InjectedScript.lastBoundObjectId++;
+            objectId = "object#" + id;
+            InjectedScript.idToWrappedObject[objectId] = object;
+
+            var group = InjectedScript.objectGroups[objectGroupName];
+            if (!group) {
+                group = [];
+                InjectedScript.objectGroups[objectGroupName] = group;
+            }
+            group.push(objectId);
+        }
+        return InjectedScript.createProxyObject(object, objectId);
+    } catch (e) {
+        return InjectedScript.createProxyObject("[ Exception: " + e.toString() + " ]");
     }
     return InjectedScript.createProxyObject(object, objectId);
@@ -874 +878 @@
 InjectedScript._isDefined = function(object)
 {
-    return object || object instanceof inspectedWindow.HTMLAllCollection;
+    return object || InjectedScript._isHTMLAllCollection(object);
+}
+
+InjectedScript._isHTMLAllCollection = function(object)
+{
+    // document.all is reported as undefined, but we still want to process it.
+    return (typeof object === "undefined") && inspectedWindow.HTMLAllCollection && object instanceof inspectedWindow.HTMLAllCollection;
 }
 
@@ -883 +893 @@
 
     // FIXME(33716): typeof document.all is always 'undefined'.
-    if (obj instanceof inspectedWindow.HTMLAllCollection)
+    if (InjectedScript._isHTMLAllCollection(obj))
         return "array";
 
@@ -908 +918 @@
     if (obj instanceof win.NodeList)
         return "array";
-    if (obj instanceof win.HTMLCollection || obj instanceof win.HTMLAllCollection)
+    if (obj instanceof win.HTMLCollection)
         return "array";
     if (obj instanceof win.Error)