1 files changed, 8 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js b/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js
index ab6ac55..59e7374 100644
--- a/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js
+++ b/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js
@@ -214,13 +214,18 @@ WebInspector.ObjectPropertyTreeElement.prototype = {
         this.editingEnded(context);
     },
 
-    evaluateExpression: function(expression)
+    evaluateExpression: function(expression, callback)
     {
         // Evaluate in the currently selected call frame if the debugger is paused.
         // Otherwise evaluate in against the inspected window.
         if (WebInspector.panels.scripts && WebInspector.panels.scripts.paused && this.treeOutline.section.editInSelectedCallFrameWhenPaused)
-            return WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression, false);
-        return InspectorController.inspectedWindow().eval(expression);
+            return WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression, false, callback);
+        try {
+            var result = InspectorController.inspectedWindow().eval(expression);
+            callback(result);
+        } catch (e) {
+            callback(e, true);
+        }
     },
 
     applyExpression: function(expression, updateInterface)