[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 11:10:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d4597b71330c23f1d30dbeea9e0b4d2c3534bbdf
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 14 13:20:30 2010 +0000
2010-07-14 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r63305.
http://trac.webkit.org/changeset/63305
https://bugs.webkit.org/show_bug.cgi?id=42256
"debugger-breakpoints-not-activated-on-reload.html fails on
GTK" (Requested by yurys on #webkit).
* http/tests/inspector/debugger-test.js:
(frontend_completeDebuggerTest):
* inspector/debugger-breakpoints-not-activated-on-reload-expected.txt: Removed.
* inspector/debugger-breakpoints-not-activated-on-reload.html: Removed.
2010-07-14 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r63305.
http://trac.webkit.org/changeset/63305
https://bugs.webkit.org/show_bug.cgi?id=42256
"debugger-breakpoints-not-activated-on-reload.html fails on
GTK" (Requested by yurys on #webkit).
* inspector/front-end/ScriptView.js:
(WebInspector.ScriptView.prototype._addBreakpoint):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel):
(WebInspector.ScriptsPanel.prototype._resourceLoadingFinished):
(WebInspector.ScriptsPanel.prototype._breakpointAdded):
(WebInspector.ScriptsPanel.prototype._scriptOrResourceForURLAndLine):
(WebInspector.ScriptsPanel.prototype._showScriptOrResource):
(WebInspector.ScriptsPanel.prototype._toggleBreakpointsClicked):
* inspector/front-end/SourceView.js:
(WebInspector.SourceView.prototype._addBreakpoint):
2010-07-14 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r63305.
http://trac.webkit.org/changeset/63305
https://bugs.webkit.org/show_bug.cgi?id=42256
"debugger-breakpoints-not-activated-on-reload.html fails on
GTK" (Requested by yurys on #webkit).
* src/js/DebuggerScript.js:
():
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63314 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 17a99d8..bcfc824 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-14 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r63305.
+ http://trac.webkit.org/changeset/63305
+ https://bugs.webkit.org/show_bug.cgi?id=42256
+
+ "debugger-breakpoints-not-activated-on-reload.html fails on
+ GTK" (Requested by yurys on #webkit).
+
+ * http/tests/inspector/debugger-test.js:
+ (frontend_completeDebuggerTest):
+ * inspector/debugger-breakpoints-not-activated-on-reload-expected.txt: Removed.
+ * inspector/debugger-breakpoints-not-activated-on-reload.html: Removed.
+
2010-07-14 Yury Semikhatsky <yurys at chromium.org>
Unreviewed. Update Chromium test expectations.
diff --git a/LayoutTests/http/tests/inspector/debugger-test.js b/LayoutTests/http/tests/inspector/debugger-test.js
index 2743916..650d2b9 100644
--- a/LayoutTests/http/tests/inspector/debugger-test.js
+++ b/LayoutTests/http/tests/inspector/debugger-test.js
@@ -33,69 +33,3 @@ function frontend_completeDebuggerTest(testController)
testController.notifyDone();
});
}
-
-function frontend_scriptsAreParsed(scripts)
-{
- var scriptSelect = document.getElementById("scripts-files");
- var options = scriptSelect.options;
-
- // Check that all the expected scripts are present.
- for (var i = 0; i < scripts.length; i++) {
- var found = false;
- for (var j = 0; j < options.length; j++) {
- if (options[j].text.search(scripts[i]) !== -1) {
- found = true;
- break;
- }
- }
- if (!found)
- return false;
- }
- return true;
-};
-
-function frontend_waitUntilScriptsAreParsed(scripts, callback)
-{
- function waitForAllScripts()
- {
- if (frontend_scriptsAreParsed(scripts))
- callback();
- else
- frontend_addSniffer(WebInspector, "parsedScriptSource", waitForAllScripts);
- }
- waitForAllScripts();
-};
-
-function frontend_ensureSourceFrameLoaded(sourceFrame, callback)
-{
- if (!sourceFrame._loaded)
- frontend_addSniffer(sourceFrame, "setContent", callback);
- else
- callback();
-}
-
-function frontend_showScriptSource(scriptName, callback)
-{
- var scriptSelect = document.getElementById("scripts-files");
- var options = scriptSelect.options;
- var scriptsPanel = WebInspector.panels.scripts;
-
- // Select page's script if it's not current option.
- var scriptResource;
- if (options[scriptSelect.selectedIndex].text === scriptName)
- scriptResource = options[scriptSelect.selectedIndex].representedObject;
- else {
- var pageScriptIndex = -1;
- for (var i = 0; i < options.length; i++) {
- if (options[i].text === scriptName) {
- pageScriptIndex = i;
- break;
- }
- }
- scriptResource = options[pageScriptIndex].representedObject;
- scriptsPanel._showScriptOrResource(scriptResource);
- }
-
- var view = scriptsPanel.visibleView;
- frontend_ensureSourceFrameLoaded(view.sourceFrame, callback.bind(null, view));
-};
diff --git a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload-expected.txt b/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload-expected.txt
deleted file mode 100644
index 9afbb90..0000000
--- a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Tests that breakpoints are not activated on page reload.Bug 41461
-
-Debugger was enabled.
-Scripts were parsed.
-Breakpoints deactivated.
-Disabled debugger.
-
diff --git a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html b/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html
deleted file mode 100644
index c193c7b..0000000
--- a/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<script src="../http/tests/inspector/inspector-test.js"></script>
-<script src="../http/tests/inspector/debugger-test.js"></script>
-<script>
-
-function testFunction()
-{
- return 0;
-}
-
-function doit()
-{
- evaluateInWebInspector("frontend_testBreakpointsNotActivatedOnReload", completeTest);
-}
-
-function frontend_testBreakpointsNotActivatedOnReload(testController)
-{
- var testName = WebInspector.mainResource.url;
- testName = testName.substring(testName.lastIndexOf('/') + 1);
-
- testController.waitUntilDone();
-
- WebInspector.showScriptsPanel();
- frontend_ensureDebuggerEnabled(debuggerWasEnabledCallback);
-
- function debuggerWasEnabledCallback()
- {
- testController.results.push("Debugger was enabled.");
- frontend_waitUntilScriptsAreParsed([testName], waitUntilScriptsAreParsedCallback);
- }
-
- function waitUntilScriptsAreParsedCallback()
- {
- testController.results.push("Scripts were parsed.");
- frontend_showScriptSource(testName, showScriptSourceCallback);
- }
-
- function showScriptSourceCallback(view)
- {
- if (!WebInspector.flag) {
- view._addBreakpoint(8);
- WebInspector.panels.scripts.toggleBreakpointsButton.element.click();
- InspectorBackend.reloadPage();
- WebInspector.flag = true;
- } else {
- if (!WebInspector.panels.scripts.breakpointsActivated)
- testController.results.push("Breakpoints deactivated.");
- else
- testController.results.push("Error: breakpoints activated.");
- frontend_completeDebuggerTest(testController);
- }
- }
-}
-
-</script>
-</head>
-
-<body onload="onload()">
-<p>
-Tests that breakpoints are not activated on page reload.<a href="https://bugs.webkit.org/show_bug.cgi?id=41461">Bug 41461</a>
-</p>
-
-</body>
-</html>
-
-
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d38392a..6428f90 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-07-14 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r63305.
+ http://trac.webkit.org/changeset/63305
+ https://bugs.webkit.org/show_bug.cgi?id=42256
+
+ "debugger-breakpoints-not-activated-on-reload.html fails on
+ GTK" (Requested by yurys on #webkit).
+
+ * inspector/front-end/ScriptView.js:
+ (WebInspector.ScriptView.prototype._addBreakpoint):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel):
+ (WebInspector.ScriptsPanel.prototype._resourceLoadingFinished):
+ (WebInspector.ScriptsPanel.prototype._breakpointAdded):
+ (WebInspector.ScriptsPanel.prototype._scriptOrResourceForURLAndLine):
+ (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
+ (WebInspector.ScriptsPanel.prototype._toggleBreakpointsClicked):
+ * inspector/front-end/SourceView.js:
+ (WebInspector.SourceView.prototype._addBreakpoint):
+
2010-07-14 Steve Block <steveblock at google.com>
Reviewed by Jeremy Orlow.
diff --git a/WebCore/inspector/front-end/ScriptView.js b/WebCore/inspector/front-end/ScriptView.js
index 597fd28..c576510 100644
--- a/WebCore/inspector/front-end/ScriptView.js
+++ b/WebCore/inspector/front-end/ScriptView.js
@@ -97,8 +97,6 @@ WebInspector.ScriptView.prototype = {
_addBreakpoint: function(line)
{
WebInspector.breakpointManager.setBreakpoint(this.script.sourceID, this.script.sourceURL, line, true, "");
- if (!WebInspector.panels.scripts.breakpointsActivated)
- WebInspector.panels.scripts.toggleBreakpointsClicked();
},
_editLineComplete: function(newBody)
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 41396f4..392bb1c 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -104,10 +104,10 @@ WebInspector.ScriptsPanel = function()
this.sidebarButtonsElement.appendChild(this.stepOutButton);
this.toggleBreakpointsButton = new WebInspector.StatusBarButton("", "toggle-breakpoints");
- this.toggleBreakpointsButton.addEventListener("click", this.toggleBreakpointsClicked.bind(this), false);
+ this.toggleBreakpointsButton.addEventListener("click", this._toggleBreakpointsClicked.bind(this), false);
this.sidebarButtonsElement.appendChild(this.toggleBreakpointsButton.element);
// Breakpoints should be activated by default, so emulate a click to toggle on.
- this.toggleBreakpointsClicked();
+ this._toggleBreakpointsClicked();
this.debuggerStatusElement = document.createElement("div");
this.debuggerStatusElement.id = "scripts-debugger-status";
@@ -162,7 +162,7 @@ WebInspector.ScriptsPanel = function()
this._pauseOnExceptionButton = new WebInspector.StatusBarButton("", "scripts-pause-on-exceptions-status-bar-item", 3);
this._pauseOnExceptionButton.addEventListener("click", this._togglePauseOnExceptions.bind(this), false);
this._pauseOnExceptionButton.state = WebInspector.ScriptsPanel.PauseOnExceptionsState.DontPauseOnExceptions;
- this._pauseOnExceptionButton.title = WebInspector.UIString("Don't pause on exceptions.\nClick to Pause on all exceptions.");
+ this._pauseOnExceptionButton.title = WebInspector.UIString("Don't pause on exceptions.\nClick to Pause on all exceptions.");
this._registerShortcuts();
@@ -217,7 +217,7 @@ WebInspector.ScriptsPanel.prototype = {
delete this._attachDebuggerWhenShown;
}
},
-
+
hide: function()
{
if (this.visibleView)
@@ -276,7 +276,7 @@ WebInspector.ScriptsPanel.prototype = {
// Remove script from the files list.
script.filesSelectOption.parentElement.removeChild(script.filesSelectOption);
-
+
// Move breakpoints to the resource's frame.
if (script._scriptView) {
var sourceFrame = script._scriptView.sourceFrame;
@@ -294,6 +294,9 @@ WebInspector.ScriptsPanel.prototype = {
{
var breakpoint = event.data;
+ if (!this.breakpointsActivated)
+ this._toggleBreakpointsClicked();
+
var sourceFrame;
if (breakpoint.url) {
var resource = WebInspector.resourceURLMap[breakpoint.url];
@@ -535,7 +538,7 @@ WebInspector.ScriptsPanel.prototype = {
this._showScriptOrResource(scriptOrResource, {line: line, shouldHighlightLine: true});
},
- _scriptOrResourceForURLAndLine: function(url, line)
+ _scriptOrResourceForURLAndLine: function(url, line)
{
var scriptWithMatchingUrl = null;
for (var sourceID in this._sourceIDMap) {
@@ -607,7 +610,8 @@ WebInspector.ScriptsPanel.prototype = {
_showScriptOrResource: function(scriptOrResource, options)
{
// options = {line:, shouldHighlightLine:, fromBackForwardAction:, initialLoad:}
- options = options || {};
+ if (!options)
+ options = {};
if (!scriptOrResource)
return;
@@ -689,7 +693,7 @@ WebInspector.ScriptsPanel.prototype = {
return;
this._resourceForURLInFilesSelect[script.resource.url] = script.resource;
}
-
+
var displayName = script.sourceURL ? WebInspector.displayNameForURL(script.sourceURL) : WebInspector.UIString("(program)");
var select = this.filesSelectElement;
@@ -808,7 +812,7 @@ WebInspector.ScriptsPanel.prototype = {
this.resize();
},
-
+
updatePauseOnExceptionsState: function(pauseOnExceptionsState)
{
if (pauseOnExceptionsState == WebInspector.ScriptsPanel.PauseOnExceptionsState.DontPauseOnExceptions)
@@ -967,7 +971,7 @@ WebInspector.ScriptsPanel.prototype = {
InspectorBackend.stepOutOfFunction();
},
- toggleBreakpointsClicked: function()
+ _toggleBreakpointsClicked: function()
{
this.toggleBreakpointsButton.toggled = !this.toggleBreakpointsButton.toggled;
if (this.toggleBreakpointsButton.toggled) {
diff --git a/WebCore/inspector/front-end/SourceView.js b/WebCore/inspector/front-end/SourceView.js
index 4d03ecd..1bf8194 100644
--- a/WebCore/inspector/front-end/SourceView.js
+++ b/WebCore/inspector/front-end/SourceView.js
@@ -128,8 +128,6 @@ WebInspector.SourceView.prototype = {
{
var sourceID = this._sourceIDForLine(line);
WebInspector.breakpointManager.setBreakpoint(sourceID, this.resource.url, line, true, "");
- if (!WebInspector.panels.scripts.breakpointsActivated)
- WebInspector.panels.scripts.toggleBreakpointsClicked();
},
_removeBreakpoint: function(breakpoint)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9c7a9eb..9934e61 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-14 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r63305.
+ http://trac.webkit.org/changeset/63305
+ https://bugs.webkit.org/show_bug.cgi?id=42256
+
+ "debugger-breakpoints-not-activated-on-reload.html fails on
+ GTK" (Requested by yurys on #webkit).
+
+ * src/js/DebuggerScript.js:
+ ():
+
2010-07-14 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/src/js/DebuggerScript.js b/WebKit/chromium/src/js/DebuggerScript.js
index 7c7f9d9..70c2fbe 100644
--- a/WebKit/chromium/src/js/DebuggerScript.js
+++ b/WebKit/chromium/src/js/DebuggerScript.js
@@ -32,7 +32,6 @@
var DebuggerScript = {};
DebuggerScript._breakpoints = {};
-DebuggerScript._breakpointsActivated = true;
DebuggerScript.PauseOnExceptionsState = {
DontPauseOnExceptions : 0,
@@ -95,7 +94,7 @@ DebuggerScript.setBreakpoint = function(execState, args)
{
args.lineNumber = DebuggerScript._webkitToV8LineNumber(args.lineNumber);
var breakId = Debug.setScriptBreakPointById(args.scriptId, args.lineNumber, 0 /* column */, args.condition);
- if (!args.enabled || !DebuggerScript._breakpointsActivated)
+ if (!args.enabled)
Debug.disableScriptBreakPoint(breakId);
var actualLineNumber = args.lineNumber; // TODO: replace with real stuff after v8 roll.
@@ -204,7 +203,6 @@ DebuggerScript.setBreakpointsActivated = function(execState, args)
else
Debug.disableScriptBreakPoint(breakId);
}
- DebuggerScript._breakpointsActivated = args.enabled;
}
DebuggerScript._frameMirrorToJSCallFrame = function(frameMirror, callerFrame)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list