Changeset 62651 in webkit

Timestamp:

Jul 7, 2010 4:27:02 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-07 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r62645.
​http://trac.webkit.org/changeset/62645
​https://bugs.webkit.org/show_bug.cgi?id=41757

"Broken inspector tests on several platforms" (Requested by
eseidel on #webkit).

• inspector/debugger-breakpoints-not-activated-on-reload-expected.txt: Removed.
• inspector/debugger-breakpoints-not-activated-on-reload.html: Removed.

2010-07-07 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r62645.
​http://trac.webkit.org/changeset/62645
​https://bugs.webkit.org/show_bug.cgi?id=41757

"Broken inspector tests on several platforms" (Requested by
eseidel 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-07 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r62645.
​http://trac.webkit.org/changeset/62645
​https://bugs.webkit.org/show_bug.cgi?id=41757

"Broken inspector tests on several platforms" (Requested by
eseidel on #webkit).

• src/js/DebuggerScript.js: ():

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload-expected.txt (deleted)
• LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/front-end/ScriptView.js (modified) (1 diff)
• WebCore/inspector/front-end/ScriptsPanel.js (modified) (10 diffs)
• WebCore/inspector/front-end/SourceView.js (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/js/DebuggerScript.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r62645.
+        http://trac.webkit.org/changeset/62645
+        https://bugs.webkit.org/show_bug.cgi?id=41757
+
+        "Broken inspector tests on several platforms" (Requested by
+        eseidel on #webkit).
+
+        * inspector/debugger-breakpoints-not-activated-on-reload-expected.txt: Removed.
+        * inspector/debugger-breakpoints-not-activated-on-reload.html: Removed.
+
 2010-07-07  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r62645.
+        http://trac.webkit.org/changeset/62645
+        https://bugs.webkit.org/show_bug.cgi?id=41757
+
+        "Broken inspector tests on several platforms" (Requested by
+        eseidel 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-07  Steve Block  <steveblock@google.com>
 

trunk/WebCore/inspector/front-end/ScriptView.js

@@ -98 +98 @@
     {
         WebInspector.breakpointManager.setBreakpoint(this.script.sourceID, this.script.sourceURL, line, true, "");
-        if (!WebInspector.panels.scripts.breakpointsActivated)
-            WebInspector.panels.scripts.toggleBreakpointsClicked();
     },
 

trunk/WebCore/inspector/front-end/ScriptsPanel.js

@@ -105 +105 @@
 
     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");
@@ -163 +163 @@
     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();
@@ -218 +218 @@
         }
     },
-
+    
     hide: function()
     {
@@ -277 +277 @@
             // Remove script from the files list.
             script.filesSelectOption.parentElement.removeChild(script.filesSelectOption);
-
+            
             // Move breakpoints to the resource's frame.
             if (script._scriptView) {
@@ -294 +294 @@
     {
         var breakpoint = event.data;
+
+        if (!this.breakpointsActivated)
+            this._toggleBreakpointsClicked();
 
         var sourceFrame;
@@ -536 +539 @@
     },
 
-    _scriptOrResourceForURLAndLine: function(url, line)
+    _scriptOrResourceForURLAndLine: function(url, line) 
     {
         var scriptWithMatchingUrl = null;
@@ -608 +611 @@
     {
         // options = {line:, shouldHighlightLine:, fromBackForwardAction:, initialLoad:}
-        options = options || {};
+        if (!options) 
+            options = {};
 
         if (!scriptOrResource)
@@ -690 +694 @@
             this._resourceForURLInFilesSelect[script.resource.url] = script.resource;
         }
-
+ 
         var displayName = script.sourceURL ? WebInspector.displayNameForURL(script.sourceURL) : WebInspector.UIString("(program)");
 
@@ -809 +813 @@
         this.resize();
     },
-
+    
     updatePauseOnExceptionsState: function(pauseOnExceptionsState)
     {
@@ -968 +972 @@
     },
 
-    toggleBreakpointsClicked: function()
+    _toggleBreakpointsClicked: function()
     {
         this.toggleBreakpointsButton.toggled = !this.toggleBreakpointsButton.toggled;

trunk/WebCore/inspector/front-end/SourceView.js

@@ -129 +129 @@
         var sourceID = this._sourceIDForLine(line);
         WebInspector.breakpointManager.setBreakpoint(sourceID, this.resource.url, line, true, "");
-        if (!WebInspector.panels.scripts.breakpointsActivated)
-            WebInspector.panels.scripts.toggleBreakpointsClicked();
     },
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r62645.
+        http://trac.webkit.org/changeset/62645
+        https://bugs.webkit.org/show_bug.cgi?id=41757
+
+        "Broken inspector tests on several platforms" (Requested by
+        eseidel on #webkit).
+
+        * src/js/DebuggerScript.js:
+        ():
+
 2010-07-07  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/WebKit/chromium/src/js/DebuggerScript.js

@@ -33 +33 @@
 var DebuggerScript = {};
 DebuggerScript._breakpoints = {};
-DebuggerScript._breakpointsActivated = true;
 
 DebuggerScript.PauseOnExceptionsState = {
@@ -96 +95 @@
     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);
 
@@ -205 +204 @@
             Debug.disableScriptBreakPoint(breakId);
     }
-    DebuggerScript._breakpointsActivated = args.enabled;
 }