Changeset 79873 in webkit

Timestamp:

Feb 28, 2011 9:29:51 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

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

Reviewed by Pavel Feldman.

Web Inspector: [REGRESSION] source frame is recreated for each inlined script in document.
​https://bugs.webkit.org/show_bug.cgi?id=55377

• inspector/debugger/scripts-panel-expected.txt:
• inspector/debugger/scripts-panel.html:

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

Reviewed by Pavel Feldman.

Web Inspector: [REGRESSION] source frame is recreated for each inlined script in document.
​https://bugs.webkit.org/show_bug.cgi?id=55377

• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype._resourceLoadingFinished): (WebInspector.ScriptsPanel.prototype._sourceFrameForSourceName): (WebInspector.ScriptsPanel.prototype._createSourceFrame): (WebInspector.ScriptsPanel.prototype._recreateSourceFrame):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/scripts-panel-expected.txt (modified) (1 diff)
• LayoutTests/inspector/debugger/scripts-panel.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-28  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [REGRESSION] source frame is recreated for each inlined script in document.
+        https://bugs.webkit.org/show_bug.cgi?id=55377
+
+        * inspector/debugger/scripts-panel-expected.txt:
+        * inspector/debugger/scripts-panel.html:
+
 2011-02-28  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt

@@ -6 +6 @@
 
 Running: testHistory
+
+Running: testSourceFramesCount
+Page reloaded.
 Debugger was disabled.
 

trunk/LayoutTests/inspector/debugger/scripts-panel.html

@@ -98 +98 @@
 
             next();
+        },
+
+        function testSourceFramesCount(next)
+        {
+            var sourceFrameCount = 0;
+
+            InspectorTest.showScriptSource("scripts-panel.html", didShowScriptSource);
+
+            function didShowScriptSource()
+            {
+                function didCreateSourceFrame()
+                {
+                    sourceFrameCount += 1;
+                }
+                InspectorTest.addSniffer(panel, "_createSourceFrame", didCreateSourceFrame, true);
+                InspectorTest.reloadPage(didReload);
+            }
+
+            function didReload()
+            {
+                InspectorTest.assertEquals("scripts-panel.html", select[select.selectedIndex].text);
+                // There should be maximum 2 source frames: first one is the first shown, second one is the last viewed ("scripts-panel.html").
+                InspectorTest.assertEquals(true, sourceFrameCount <= 2, "too many source frames created after page reload");
+                next();
+            }
         }
     ]);
 };
 
+</script>
+
+<script>
+function secondInlinedScriptInPage()
+{
+    return 0;
+}
+</script>
+
+<script>
+function thirdInlinedScriptInPage()
+{
+    return 0;
+}
+</script>
+
+<script>
+function fourthInlinedScriptInPage()
+{
+    return 0;
+}
 </script>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [REGRESSION] source frame is recreated for each inlined script in document.
+        https://bugs.webkit.org/show_bug.cgi?id=55377
+
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._resourceLoadingFinished):
+        (WebInspector.ScriptsPanel.prototype._sourceFrameForSourceName):
+        (WebInspector.ScriptsPanel.prototype._createSourceFrame):
+        (WebInspector.ScriptsPanel.prototype._recreateSourceFrame):
+
 2011-02-28  Patrick Gansterer  <paroga@webkit.org>
 

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

@@ -285 +285 @@
             if (resource.finished) {
                 // Resource is finished, bind the script right away.
-                resource._scriptsPendingResourceLoad = [script];
-                this._resourceLoadingFinished({ target: resource });
+                script.resource = resource;
+
+                // Add resource url to files select if not already added while debugging inlined scripts.
+                if (!(resource.url in this._sourceNameToFilesSelectOption))
+                    this._addOptionToFilesSelectAndShowSourceFrameIfNeeded(resource.url);
             } else {
                 // Resource is not finished, bind the script later.
@@ -584 +587 @@
     {
         var sourceFrame = this._sourceNameToSourceFrame[sourceName];
-        if (sourceFrame)
-            return sourceFrame;
-
+        return sourceFrame || this._createSourceFrame(sourceName);
+    },
+
+    _createSourceFrame: function(sourceName)
+    {
         var script = this._scriptForSourceName(sourceName);
         var contentProvider;
@@ -615 +620 @@
             return;
 
-        var newSourceFrame = this._sourceFrameForSourceName(sourceName)
+        var newSourceFrame = this._createSourceFrame(sourceName)
         newSourceFrame.scrollTop = oldSourceFrame.scrollTop;
         this.visibleView = newSourceFrame;