Changeset 85315 in webkit

Timestamp:

Apr 29, 2011 4:35:58 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-04-28 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: breakpoints set in original and formatted scripts are messed up after navigation.
​https://bugs.webkit.org/show_bug.cgi?id=59476

• http/tests/inspector/inspector-test.js: (initialize_InspectorTest.InspectorTest.navigate): (initialize_InspectorTest.InspectorTest.reloadPage): (initialize_InspectorTest.InspectorTest.pageLoaded): (initialize_InspectorTest.InspectorTest.runWhenPageLoads): ():
• inspector/debugger/script-formatter-expected.txt:
• inspector/debugger/script-formatter.html:

2011-04-28 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: breakpoints set in original and formatted scripts are messed up after navigation.
​https://bugs.webkit.org/show_bug.cgi?id=59476

• inspector/front-end/DebuggerPresentationModel.js: (WebInspector.DebuggerPresentationModel.prototype.toggleFormatSourceFiles): (WebInspector.DebuggerPresentationModel.prototype._removeBreakpointFromDebugger): (WebInspector.PresentationBreakpoint.prototype.serialize):
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect.optionCompare): (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect): (WebInspector.ScriptsPanel.prototype.reset):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/inspector-test.js (modified) (5 diffs)
• LayoutTests/inspector/debugger/script-formatter-expected.txt (modified) (1 diff)
• LayoutTests/inspector/debugger/script-formatter.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-28  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: breakpoints set in original and formatted scripts are messed up after navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=59476
+
+        * http/tests/inspector/inspector-test.js:
+        (initialize_InspectorTest.InspectorTest.navigate):
+        (initialize_InspectorTest.InspectorTest.reloadPage):
+        (initialize_InspectorTest.InspectorTest.pageLoaded):
+        (initialize_InspectorTest.InspectorTest.runWhenPageLoads):
+        ():
+        * inspector/debugger/script-formatter-expected.txt:
+        * inspector/debugger/script-formatter.html:
+
 2011-04-28  Adam Roben  <aroben@apple.com>
 

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

@@ -151 +151 @@
 }
 
+InspectorTest.navigate = function(url, callback)
+{
+    InspectorTest._pageLoadedCallback = InspectorTest.safeWrap(callback);
+
+    if (WebInspector.panels.network)
+        WebInspector.panels.network._reset();
+    InspectorTest.evaluateInConsole("window.location = '" + url + "'");
+}
+
 InspectorTest.reloadPage = function(callback)
 {
-    InspectorTest._reloadPageCallback = InspectorTest.safeWrap(callback);
+    InspectorTest._pageLoadedCallback = InspectorTest.safeWrap(callback);
 
     if (WebInspector.panels.network)
@@ -160 +169 @@
 }
 
-InspectorTest.pageReloaded = function()
+InspectorTest.pageLoaded = function()
 {
     resultsSynchronized = false;
     InspectorTest.addResult("Page reloaded.");
-    if (InspectorTest._reloadPageCallback) {
-        var callback = InspectorTest._reloadPageCallback;
-        delete InspectorTest._reloadPageCallback;
+    if (InspectorTest._pageLoadedCallback) {
+        var callback = InspectorTest._pageLoadedCallback;
+        delete InspectorTest._pageLoadedCallback;
         callback();
     }
@@ -173 +182 @@
 InspectorTest.runWhenPageLoads = function(callback)
 {
-    var oldCallback = InspectorTest._reloadPageCallback;
+    var oldCallback = InspectorTest._pageLoadedCallback;
     function chainedCallback()
     {
@@ -180 +189 @@
         callback();
     }
-    InspectorTest._reloadPageCallback = InspectorTest.safeWrap(chainedCallback);
+    InspectorTest._pageLoadedCallback = InspectorTest.safeWrap(chainedCallback);
 }
 
@@ -342 +351 @@
     {
         if (window.InspectorTest) {
-            InspectorTest.pageReloaded();
+            InspectorTest.pageLoaded();
             return;
         }

trunk/LayoutTests/inspector/debugger/script-formatter-expected.txt

@@ -15 +15 @@
 }
 </script></body></html>
+
+Running: testBreakpointsInOriginalAndFormattedSource
+Script execution paused.
+Call stack:
+    0) f1 (script-formatter.html:12)
+    1)  (script-formatter.html:1)
+Script execution resumed.
+Page reloaded.
+Navigated to test-navigation.html
+Page reloaded.
+Navigated back to test page.
+Script execution paused.
+Call stack:
+    0) f2 (script-formatter.html:17)
+    1)  (script-formatter.html:1)
+Script execution resumed.
 Debugger was disabled.
 

trunk/LayoutTests/inspector/debugger/script-formatter.html

@@ -7 +7 @@
 <script>
 
+function f1()
+{
+    var a=0;var b=1;var c=3;var d=4;var e=5;
+    var f=0;
+    return 0;
+}
+
+function f2()
+{
+    var x = 0;
+    return 0;
+}
+
 var test = function()
 {
+    var panel = WebInspector.panels.scripts;
     var worker = new Worker("ScriptFormatterWorker.js");
 
@@ -85 +99 @@
             var content = "<html><body><script>function f(){}<" + "/script><script>function g(){}<" + "/script></body></html>";
             worker.postMessage({ mimeType: "text/html", content: content });
+        },
+
+        function testBreakpointsInOriginalAndFormattedSource(next)
+        {
+            var root;
+            InspectorTest.showScriptSource("script-formatter.html", didShowScriptSource);
+
+            function didShowScriptSource(sourceFrame)
+            {
+                root = sourceFrame._url.substr(0, sourceFrame._url.lastIndexOf("/") + 1);
+                InspectorTest.setBreakpoint(sourceFrame, 11, "", true);
+                InspectorTest.waitUntilPaused(pausedInF1);
+                InspectorTest.evaluateInPageWithTimeout("f1()");
+            }
+
+            function pausedInF1(callFrames)
+            {
+                InspectorTest.captureStackTrace(callFrames);
+                InspectorTest.resumeExecution(resumed);
+            }
+
+            function resumed()
+            {
+                InspectorTest.navigate(root + "resources/test-navigation.html", didNavigateAnotherPage);
+            }
+
+            function didNavigateAnotherPage()
+            {
+                InspectorTest.addResult("Navigated to test-navigation.html");
+                panel._toggleFormatSourceFiles();
+                InspectorTest.showScriptSource("test-navigation.html", didShowAnotherPage);
+            }
+
+            function didShowAnotherPage(sourceFrame)
+            {
+                InspectorTest.navigate(root + "script-formatter.html", didNavigateBack);
+            }
+
+            function didNavigateBack()
+            {
+                InspectorTest.addResult("Navigated back to test page.");
+                InspectorTest.showScriptSource("script-formatter.html", didShowFormattedScriptSource);
+            }
+
+            function didShowFormattedScriptSource(sourceFrame)
+            {
+                // There should be no breakpoint in f1 since script is pretty-printed now.
+                InspectorTest.evaluateInPageWithTimeout("f1()");
+
+                InspectorTest.setBreakpoint(panel.visibleView, 24, "", true);
+                InspectorTest.waitUntilPaused(pausedInF2);
+                InspectorTest.evaluateInPageWithTimeout("f2()");
+            }
+
+            function pausedInF2(callFrames)
+            {
+                InspectorTest.captureStackTrace(callFrames);
+                next();
+            }
         }
     ]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-28  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: breakpoints set in original and formatted scripts are messed up after navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=59476
+
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel.prototype.toggleFormatSourceFiles):
+        (WebInspector.DebuggerPresentationModel.prototype._removeBreakpointFromDebugger):
+        (WebInspector.PresentationBreakpoint.prototype.serialize):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect.optionCompare):
+        (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):
+        (WebInspector.ScriptsPanel.prototype.reset):
+
 2011-04-29  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

@@ -211 +211 @@
         }
 
+        for (var id in this._breakpointsWithoutSourceFile) {
+            var breakpoints = this._breakpointsWithoutSourceFile[id];
+            for (var i = 0; i < breakpoints.length; ++i)
+                this._removeBreakpointFromDebugger(breakpoints[i]);
+        }
+
         var messages = this._messages;
         this._reset();
@@ -331 +337 @@
     _removeBreakpointFromDebugger: function(breakpoint, callback)
     {
-        if (!("debuggerId" in breakpoint)) {
-            if (callback)
-                callback();
-            return;
-        }
-
-        function didRemoveBreakpoint()
-        {
+        if ("debuggerId" in breakpoint) {
+            WebInspector.debuggerModel.removeBreakpoint(breakpoint.debuggerId);
             this._unbindDebuggerId(breakpoint);
-            if (callback)
-                callback();
-        }
-        WebInspector.debuggerModel.removeBreakpoint(breakpoint.debuggerId, didRemoveBreakpoint.bind(this));
+        }
+
+        if (callback)
+            callback();
     },
 
@@ -632 +632 @@
         serializedBreakpoint.condition = this.condition;
         serializedBreakpoint.enabled = this.enabled;
-        serializedBreakpoint.debuggerId = this.debuggerId;
+        if ("debuggerId" in this)
+            serializedBreakpoint.debuggerId = this.debuggerId;
         return serializedBreakpoint;
     }

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

@@ -296 +296 @@
 
             if (a.isContentScript && !b.isContentScript)
-                return 1; 
+                return 1;
             if (!a.isContentScript && b.isContentScript)
-                return -1; 
+                return -1;
 
             if (a.text === b.text)
@@ -480 +480 @@
         this._updateBackAndForwardButtons();
 
+        for (var id in this._sourceFileIdToSourceFrame) {
+            var sourceFrame = this._sourceFileIdToSourceFrame[id];
+            sourceFrame.removeEventListener(WebInspector.SourceFrame.Events.Loaded, this._sourceFrameLoaded, this);
+        }
+
         this._sourceFileIdToSourceFrame = {};
         this._sourceFileIdToFilesSelectOption = {};