Changeset 47696 in webkit

Timestamp:

Aug 23, 2009 2:42:09 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-23 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Timothy Hatcher.

Inspector: Throws an Error on "null"
​https://bugs.webkit.org/show_bug.cgi?id=28665

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

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ConsoleView.js (modified) (1 diff)
• inspector/front-end/InjectedScript.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-23  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Inspector: Throws an Error on "null"
+        https://bugs.webkit.org/show_bug.cgi?id=28665
+
+        * inspector/front-end/InjectedScript.js:
+        (InjectedScript.evaluate):
+
 2009-08-23  Pavel Feldman  <pfeldman@chromium.org>
 

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

@@ -385 +385 @@
     _format: function(output, forceObjectFormat)
     {
-        var isProxy = typeof output === "object";
+        var isProxy = (output != null && typeof output === "object");
 
         if (forceObjectFormat)

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

@@ -499 +499 @@
     try {
         var value = InjectedScript._window().eval(expression);
+        if (value === null)
+            return { value: null };
         var wrapper = InspectorController.wrapObject(value);
         if (typeof wrapper === "object" && wrapper.exception)