Diff
Modified: trunk/LayoutTests/ChangeLog (113557 => 113558)
--- trunk/LayoutTests/ChangeLog 2012-04-09 07:48:08 UTC (rev 113557)
+++ trunk/LayoutTests/ChangeLog 2012-04-09 07:50:42 UTC (rev 113558)
@@ -1,3 +1,13 @@
+2012-04-06 Pavel Feldman <[email protected]>
+
+ Web Inspector: move breakpoints active state from scripts panel to debugger presentation model.
+ https://bugs.webkit.org/show_bug.cgi?id=83374
+
+ Reviewed by Yury Semikhatsky.
+
+ * http/tests/inspector/debugger-test.js:
+ * inspector/debugger/debugger-breakpoints-not-activated-on-reload.html:
+
2012-04-07 Andrew Scherkus <[email protected]>
[Chromium] Unreviewed, checking in baselines for video-frame-size-change.html.
Modified: trunk/LayoutTests/http/tests/inspector/debugger-test.js (113557 => 113558)
--- trunk/LayoutTests/http/tests/inspector/debugger-test.js 2012-04-09 07:48:08 UTC (rev 113557)
+++ trunk/LayoutTests/http/tests/inspector/debugger-test.js 2012-04-09 07:50:42 UTC (rev 113558)
@@ -26,7 +26,7 @@
{
var scriptsPanel = WebInspector.panels.scripts;
- scriptsPanel.activateBreakpoints();
+ WebInspector.debuggerPresentationModel.setBreakpointsActive(true);
InspectorTest.resumeExecution(disableDebugger);
function disableDebugger()
Modified: trunk/LayoutTests/inspector/debugger/debugger-breakpoints-not-activated-on-reload.html (113557 => 113558)
--- trunk/LayoutTests/inspector/debugger/debugger-breakpoints-not-activated-on-reload.html 2012-04-09 07:48:08 UTC (rev 113557)
+++ trunk/LayoutTests/inspector/debugger/debugger-breakpoints-not-activated-on-reload.html 2012-04-09 07:50:42 UTC (rev 113558)
@@ -25,7 +25,7 @@
{
InspectorTest.addResult("Main resource was shown.");
InspectorTest.setBreakpoint(sourceFrame, 8, "", true);
- WebInspector.panels.scripts.toggleBreakpointsButton.element.click();
+ WebInspector.panels.scripts._toggleBreakpointsButton.element.click();
InspectorTest.reloadPage(step4);
}
@@ -37,7 +37,7 @@
function step4()
{
InspectorTest.addResult("Main resource was shown.");
- if (!WebInspector.panels.scripts.breakpointsActivated())
+ if (!WebInspector.debuggerPresentationModel.breakpointsActive())
InspectorTest.addResult("Breakpoints are deactivated.");
else
InspectorTest.addResult("Error: breakpoints are activated.");
Modified: trunk/Source/WebCore/ChangeLog (113557 => 113558)
--- trunk/Source/WebCore/ChangeLog 2012-04-09 07:48:08 UTC (rev 113557)
+++ trunk/Source/WebCore/ChangeLog 2012-04-09 07:50:42 UTC (rev 113558)
@@ -1,3 +1,26 @@
+2012-04-06 Pavel Feldman <[email protected]>
+
+ Web Inspector: move breakpoints active state from scripts panel to debugger presentation model.
+ https://bugs.webkit.org/show_bug.cgi?id=83374
+
+ Reviewed by Yury Semikhatsky.
+
+ Just moves the state and adds event to propagate it. This is needed to abstract
+ _javascript_SourceFrame from the ScriptsPanel.
+
+ * inspector/front-end/DebuggerPresentationModel.js:
+ (WebInspector.DebuggerPresentationModel):
+ (WebInspector.DebuggerPresentationModel.prototype.setBreakpoint):
+ (WebInspector.DebuggerPresentationModel.prototype._debuggerReset):
+ (WebInspector.DebuggerPresentationModel.prototype.setBreakpointsActive):
+ (WebInspector.DebuggerPresentationModel.prototype.breakpointsActive):
+ * inspector/front-end/_javascript_SourceFrame.js:
+ (WebInspector._javascript_SourceFrame.prototype._setBreakpoint):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._toggleBreakpointsClicked):
+ (WebInspector.ScriptsPanel.prototype._breakpointsActiveStateChanged):
+ (WebInspector.ScriptsPanel.prototype._createDebugToolbar):
+
2012-04-08 Takashi Sakamoto <[email protected]>
<content> in <meter> is not rendered correctly.
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (113557 => 113558)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2012-04-09 07:48:08 UTC (rev 113557)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2012-04-09 07:50:42 UTC (rev 113558)
@@ -40,6 +40,7 @@
this._presentationCallFrames = [];
this._breakpointManager = new WebInspector.BreakpointManager(WebInspector.settings.breakpoints, WebInspector.debuggerModel, this._scriptMapping);
+ this._breakpointsActive = true;
this._pendingConsoleMessages = {};
this._consoleMessageLiveLocations = [];
@@ -65,7 +66,8 @@
DebuggerReset: "debugger-reset",
CallFrameSelected: "call-frame-selected",
ConsoleCommandEvaluatedInSelectedCallFrame: "console-command-evaluated-in-selected-call-frame",
- ExecutionLineChanged: "execution-line-changed"
+ ExecutionLineChanged: "execution-line-changed",
+ BreakpointsActiveStateChanged: "breakpoints-active-state-changed"
}
WebInspector.DebuggerPresentationModel.prototype = {
@@ -349,6 +351,7 @@
setBreakpoint: function(uiSourceCode, lineNumber, condition, enabled)
{
this._breakpointManager.setBreakpoint(uiSourceCode, lineNumber, condition, enabled);
+ this.setBreakpointsActive(true);
},
/**
@@ -516,6 +519,26 @@
this._pendingConsoleMessages = {};
this._consoleMessageLiveLocations = [];
this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.DebuggerReset);
+ },
+
+ /**
+ * @param {boolean} active
+ */
+ setBreakpointsActive: function(active)
+ {
+ if (this._breakpointsActive === active)
+ return;
+ this._breakpointsActive = active;
+ DebuggerAgent.setBreakpointsActive(active);
+ this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.BreakpointsActiveStateChanged, active);
+ },
+
+ /**
+ * @return {boolean}
+ */
+ breakpointsActive: function()
+ {
+ return this._breakpointsActive;
}
}
Modified: trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js (113557 => 113558)
--- trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-04-09 07:48:08 UTC (rev 113557)
+++ trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-04-09 07:50:42 UTC (rev 113558)
@@ -345,7 +345,6 @@
_setBreakpoint: function(lineNumber, condition, enabled)
{
this._model.setBreakpoint(this._uiSourceCode, lineNumber, condition, enabled);
- this._scriptsPanel.activateBreakpoints();
},
_onMouseDown: function(event)
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (113557 => 113558)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-04-09 07:48:08 UTC (rev 113557)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-04-09 07:50:42 UTC (rev 113558)
@@ -182,6 +182,7 @@
this._presentationModel.addEventListener(WebInspector.DebuggerPresentationModel.Events.ConsoleCommandEvaluatedInSelectedCallFrame, this._consoleCommandEvaluatedInSelectedCallFrame, this);
this._presentationModel.addEventListener(WebInspector.DebuggerPresentationModel.Events.ExecutionLineChanged, this._executionLineChanged, this);
this._presentationModel.addEventListener(WebInspector.DebuggerPresentationModel.Events.DebuggerReset, this._reset.bind(this, false));
+ this._presentationModel.addEventListener(WebInspector.DebuggerPresentationModel.Events.BreakpointsActiveStateChanged, this._breakpointsActiveStateChanged, this);
var enableDebugger = !Capabilities.debuggerCausesRecompilation || WebInspector.settings.debuggerEnabled.get();
if (enableDebugger)
@@ -228,17 +229,6 @@
window.setTimeout(this._maybeShowNavigatorOverlay.bind(this), 0);
},
- breakpointsActivated: function()
- {
- return this.toggleBreakpointsButton.toggled;
- },
-
- activateBreakpoints: function()
- {
- if (!this.breakpointsActivated)
- this._toggleBreakpointsClicked();
- },
-
_didBuildOutlineChunk: function(event)
{
WebInspector._javascript_OutlineDialog.didAddChunk(event.data);
@@ -844,16 +834,20 @@
DebuggerAgent.stepOut();
},
- _toggleBreakpointsClicked: function()
+ _toggleBreakpointsClicked: function(event)
{
- this.toggleBreakpointsButton.toggled = !this.toggleBreakpointsButton.toggled;
- if (this.toggleBreakpointsButton.toggled) {
- DebuggerAgent.setBreakpointsActive(true);
- this.toggleBreakpointsButton.title = WebInspector.UIString("Deactivate all breakpoints.");
+ this._presentationModel.setBreakpointsActive(!this._presentationModel.breakpointsActive());
+ },
+
+ _breakpointsActiveStateChanged: function(event)
+ {
+ var active = event.data;
+ this._toggleBreakpointsButton.toggled = active;
+ if (active) {
+ this._toggleBreakpointsButton.title = WebInspector.UIString("Deactivate all breakpoints.");
WebInspector.inspectorView.element.removeStyleClass("breakpoints-deactivated");
} else {
- DebuggerAgent.setBreakpointsActive(false);
- this.toggleBreakpointsButton.title = WebInspector.UIString("Activate all breakpoints.");
+ this._toggleBreakpointsButton.title = WebInspector.UIString("Activate all breakpoints.");
WebInspector.inspectorView.element.addStyleClass("breakpoints-deactivated");
}
},
@@ -910,10 +904,10 @@
this.stepOutButton = this._createButtonAndRegisterShortcuts("scripts-step-out", title, handler, shortcuts, WebInspector.UIString("Step out"));
debugToolbar.appendChild(this.stepOutButton);
- this.toggleBreakpointsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Deactivate all breakpoints."), "toggle-breakpoints");
- this.toggleBreakpointsButton.toggled = true;
- this.toggleBreakpointsButton.addEventListener("click", this._toggleBreakpointsClicked, this);
- debugToolbar.appendChild(this.toggleBreakpointsButton.element);
+ this._toggleBreakpointsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Deactivate all breakpoints."), "toggle-breakpoints");
+ this._toggleBreakpointsButton.toggled = true;
+ this._toggleBreakpointsButton.addEventListener("click", this._toggleBreakpointsClicked, this);
+ debugToolbar.appendChild(this._toggleBreakpointsButton.element);
this.debuggerStatusElement = document.createElement("div");
this.debuggerStatusElement.id = "scripts-debugger-status";
