Changeset 63305 in webkit

Timestamp:

Jul 14, 2010 3:17:54 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-07-14 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: do not activate all breakpoints on page reload
​https://bugs.webkit.org/show_bug.cgi?id=41461

• http/tests/inspector/debugger-test.js: (frontend_scriptsAreParsed): (frontend_waitUntilScriptsAreParsed.waitForAllScripts): (frontend_waitUntilScriptsAreParsed): (frontend_ensureSourceFrameLoaded): (frontend_showScriptSource):
• inspector/debugger-breakpoints-not-activated-on-reload-expected.txt: Added.
• inspector/debugger-breakpoints-not-activated-on-reload.html: Added.

2010-07-14 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: do not activate all breakpoints on page reload
​https://bugs.webkit.org/show_bug.cgi?id=41461

Test: inspector/debugger-breakpoints-not-activated-on-reload.html

• inspector/front-end/ScriptView.js: (WebInspector.ScriptView.prototype._addBreakpoint):
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel): (WebInspector.ScriptsPanel.prototype._breakpointAdded): (WebInspector.ScriptsPanel.prototype.toggleBreakpointsClicked):
• inspector/front-end/SourceView.js: (WebInspector.SourceView.prototype._addBreakpoint):

2010-07-14 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: if breakpoints were deactivated, add new breakpoints as disabled.
​https://bugs.webkit.org/show_bug.cgi?id=41461

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/debugger-test.js (modified) (1 diff)
• LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload-expected.txt (added)
• LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html (added)
• 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-14  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: do not activate all breakpoints on page reload
+        https://bugs.webkit.org/show_bug.cgi?id=41461
+
+        * http/tests/inspector/debugger-test.js:
+        (frontend_scriptsAreParsed):
+        (frontend_waitUntilScriptsAreParsed.waitForAllScripts):
+        (frontend_waitUntilScriptsAreParsed):
+        (frontend_ensureSourceFrameLoaded):
+        (frontend_showScriptSource):
+        * inspector/debugger-breakpoints-not-activated-on-reload-expected.txt: Added.
+        * inspector/debugger-breakpoints-not-activated-on-reload.html: Added.
+
 2010-07-14  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/LayoutTests/http/tests/inspector/debugger-test.js

@@ -34 +34 @@
     });
 }
+
+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));
+};

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-14  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: do not activate all breakpoints on page reload
+        https://bugs.webkit.org/show_bug.cgi?id=41461
+
+        Test: inspector/debugger-breakpoints-not-activated-on-reload.html
+
+        * inspector/front-end/ScriptView.js:
+        (WebInspector.ScriptView.prototype._addBreakpoint):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel):
+        (WebInspector.ScriptsPanel.prototype._breakpointAdded):
+        (WebInspector.ScriptsPanel.prototype.toggleBreakpointsClicked):
+        * inspector/front-end/SourceView.js:
+        (WebInspector.SourceView.prototype._addBreakpoint):
+
 2010-07-14  Yury Semikhatsky  <yurys@chromium.org>
 

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;
@@ -539 +536 @@
     },
 
-    _scriptOrResourceForURLAndLine: function(url, line) 
+    _scriptOrResourceForURLAndLine: function(url, line)
     {
         var scriptWithMatchingUrl = null;
@@ -611 +608 @@
     {
         // options = {line:, shouldHighlightLine:, fromBackForwardAction:, initialLoad:}
-        if (!options) 
-            options = {};
+        options = options || {};
 
         if (!scriptOrResource)
@@ -694 +690 @@
             this._resourceForURLInFilesSelect[script.resource.url] = script.resource;
         }
- 
+
         var displayName = script.sourceURL ? WebInspector.displayNameForURL(script.sourceURL) : WebInspector.UIString("(program)");
 
@@ -813 +809 @@
         this.resize();
     },
-    
+
     updatePauseOnExceptionsState: function(pauseOnExceptionsState)
     {
@@ -972 +968 @@
     },
 
-    _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-14  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: if breakpoints were deactivated, add new breakpoints as disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=41461
+
+        * src/js/DebuggerScript.js:
+        ():
+
 2010-07-14  Kent Tamura  <tkent@chromium.org>
 

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

@@ -33 +33 @@
 var DebuggerScript = {};
 DebuggerScript._breakpoints = {};
+DebuggerScript._breakpointsActivated = true;
 
 DebuggerScript.PauseOnExceptionsState = {
@@ -95 +96 @@
     args.lineNumber = DebuggerScript._webkitToV8LineNumber(args.lineNumber);
     var breakId = Debug.setScriptBreakPointById(args.scriptId, args.lineNumber, 0 /* column */, args.condition);
-    if (!args.enabled)
+    if (!args.enabled || !DebuggerScript._breakpointsActivated)
         Debug.disableScriptBreakPoint(breakId);
 
@@ -204 +205 @@
             Debug.disableScriptBreakPoint(breakId);
     }
+    DebuggerScript._breakpointsActivated = args.enabled;
 }