Fix devtools js merge errors.
BUG=
Review URL: https://codereview.chromium.org/1659003002 .
git-svn-id: https://src.chromium.org/blink/branches/dart/2454_1@202763 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/Source/devtools/front_end/console/ConsoleView.js b/Source/devtools/front_end/console/ConsoleView.js
index 84d9326..e21ed24 100644
--- a/Source/devtools/front_end/console/ConsoleView.js
+++ b/Source/devtools/front_end/console/ConsoleView.js
@@ -285,10 +285,10 @@
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 @@
// 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 @@
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);
diff --git a/Source/devtools/front_end/sdk/RuntimeModel.js b/Source/devtools/front_end/sdk/RuntimeModel.js
index 8606c1e..ed4de50 100644
--- a/Source/devtools/front_end/sdk/RuntimeModel.js
+++ b/Source/devtools/front_end/sdk/RuntimeModel.js
@@ -82,8 +82,7 @@
if (context.name == WebInspector.RuntimeModel._privateScript && !context.origin && !Runtime.experiments.isEnabled("privateScriptInspection")) {
return;
}
- var executionContext = new WebInspector.ExecutionContext(this.target(), context.id, context.name, context.origin, !context.type, context.frameId, contex
- t.language, context.libraryId);
+ var executionContext = new WebInspector.ExecutionContext(this.target(), context.id, context.name, context.origin, !context.type, context.frameId, context.language, context.libraryId);
this._executionContextById[executionContext.id] = executionContext;
this.dispatchEventToListeners(WebInspector.RuntimeModel.Events.ExecutionContextCreated, executionContext);
},
