Index: Source/devtools/front_end/console/ConsoleView.js |
diff --git a/Source/devtools/front_end/console/ConsoleView.js b/Source/devtools/front_end/console/ConsoleView.js |
index 84d93269e9442a5ce00064f15bda5c4b122e8c83..e21ed248a0d81befd77791d873c65db92da5f075 100644 |
--- a/Source/devtools/front_end/console/ConsoleView.js |
+++ b/Source/devtools/front_end/console/ConsoleView.js |
@@ -285,10 +285,10 @@ WebInspector.ConsoleView.prototype = { |
if (WebInspector.targetManager.targets().length > 1 && WebInspector.targetManager.mainTarget().isPage()) |
this._showAllMessagesCheckbox.element.classList.toggle("hidden", false); |
- |
// Start Dart specific code. |
- target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this); |
-target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this); |
+ var debuggerModel = WebInspector.DebuggerModel.fromTarget(target); |
+ debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this); |
+ debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this); |
// End Dart specific code. |
@@ -303,8 +303,9 @@ target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.Debugger |
// Begin Dart specific code. |
- target.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this); |
- target.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this); |
+ var debuggerModel = WebInspector.DebuggerModel.fromTarget(target); |
+ debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this); |
+ debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerResumed, this._debuggerResumed, this); |
// End Dart specific code. |
@@ -366,6 +367,42 @@ target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.Debugger |
return this._promptElement; |
}, |
+// START DART SPECIFIC CODE |
+ /** |
+ * @param {!WebInspector.Event} event |
+ */ |
+ _debuggerPaused: function(event) |
+ { |
+ this._isPaused = true; |
+ this._evaluateOnStackContainer.classList.remove("hidden"); |
+ this._updateExecutionContextSelectorState(); |
+ }, |
+ |
+ /** |
+ * @param {!WebInspector.Event} event |
+ */ |
+ _debuggerResumed: function(event) |
+ { |
+ this._isPaused = false; |
+ this._evaluateOnStackContainer.classList.add("hidden"); |
+ this._updateExecutionContextSelectorState(); |
+ }, |
+ |
+ _onEvaluateOnStackClick: function(event) |
+ { |
+ var target = WebInspector.context.flavor(WebInspector.Target); |
+ var debuggerModel = WebInspector.DebuggerModel.fromTarget(target); |
+ |
+ debuggerModel.setEvaluateOnCallFrameMode(this._evaluateOnStackCheckBox.checked); |
+ this._updateExecutionContextSelectorState(); |
+ }, |
+ |
+ _updateExecutionContextSelectorState: function() |
+ { |
+ this._executionContextSelector.setEnabled(!this._isPaused || !this._evaluateOnStackCheckBox.checked); |
+ }, |
+// END DART SPECIFIC CODE |
+ |
_executionContextChanged: function() |
{ |
this._prompt.clearAutoComplete(true); |