Changeset 55241 in webkit

Timestamp:

Feb 25, 2010 9:55:45 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-02-25 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Dimitri Glazkov.

Web Inspector: make script lines count calculation lazy.

​https://bugs.webkit.org/show_bug.cgi?id=35392

• inspector/front-end/Script.js: (WebInspector.Script): (WebInspector.Script.prototype.get linesCount):
• inspector/front-end/ScriptsPanel.js:
• inspector/front-end/SourceView.js: (WebInspector.SourceView.prototype._addBreakpoint):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/front-end/Script.js (modified) (2 diffs)
• WebCore/inspector/front-end/ScriptsPanel.js (modified) (1 diff)
• WebCore/inspector/front-end/SourceView.js (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/js/Tests.js (modified) (13 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-25  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Web Inspector: make script lines count calculation lazy.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35392
+
+        * inspector/front-end/Script.js:
+        (WebInspector.Script):
+        (WebInspector.Script.prototype.get linesCount):
+        * inspector/front-end/ScriptsPanel.js:
+        * inspector/front-end/SourceView.js:
+        (WebInspector.SourceView.prototype._addBreakpoint):
+
 2010-02-25  James Choi  <jchoi42@pha.jhu.edu>
 

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

@@ -33 +33 @@
     this.errorMessage = errorMessage;
 
-    this.linesCount = 0;
-    var lastIndex = source.indexOf("\n");
-    while (lastIndex !== -1) {
-        lastIndex = source.indexOf("\n", lastIndex + 1) 
-        this.linesCount++;
-    }
-
     // if no URL, look for "//@ sourceURL=" decorator
     // note that this sourceURL comment decorator is behavior that FireBug added
@@ -55 +48 @@
 
 WebInspector.Script.prototype = {
+    get linesCount()
+    {
+        if (!this.source)
+            return 0;
+        this._linesCount = 0;
+        var lastIndex = this.source.indexOf("\n");
+        while (lastIndex !== -1) {
+            lastIndex = this.source.indexOf("\n", lastIndex + 1)
+            this._linesCount++;
+        }
+    }
 }

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

@@ -678 +678 @@
         option.url = displayName;
         option.startingLine = script.startingLine;
-        option.text = script.resource ? displayName : String.sprintf("%s (%d - %d)", displayName, script.startingLine, script.startingLine + script.linesCount);
+        option.text = script.resource ? displayName : String.sprintf("%s:%d", displayName, script.startingLine);
 
         function optionCompare(a, b)

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

@@ -93 +93 @@
     {
         var sourceID = null;
+        var closestStartingLine = 0;
         var scripts = this.resource.scripts;
         for (var i = 0; i < scripts.length; ++i) {
             var script = scripts[i];
-            if (script.startingLine <= line && script.startingLine + script.linesCount > line) {
+            if (script.startingLine <= line && script.startingLine >= closestStartingLine) {
+                closestStartingLine = script.startingLine;
                 sourceID = script.sourceID;
-                break;
             }
         }

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-25  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Web Inspector: make script lines count calculation lazy.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35392
+
+        * src/js/Tests.js:
+        (.TestSuite.prototype.testScriptsTabIsPopulatedOnInspectedPageRefresh.waitUntilScriptIsParsed):
+        (.TestSuite.prototype.testScriptsTabIsPopulatedOnInspectedPageRefresh.checkScriptsPanel):
+        (.TestSuite.prototype.testScriptsTabIsPopulatedOnInspectedPageRefresh):
+        (.TestSuite.prototype.testNoScriptDuplicatesOnPanelSwitch.checkScriptsPanel):
+        (.TestSuite.prototype.testAutoContinueOnSyntaxError.checkScriptsList):
+        (.TestSuite.prototype._executeFunctionForStepTest):
+
 2010-02-24  Darin Fisher  <darin@chromium.org>
 

trunk/WebKit/chromium/src/js/Tests.js

@@ -296 +296 @@
             if (!resource || !resource.url)
                 return;
-            if (resource.url.search("image.html$") !== -1) {
+            if (resource.url.search("image.html") !== -1) {
               var expectedLength = 87;
               test.assertTrue(
@@ -471 +471 @@
     var test = this;
     // There should be at least main page script.
-    this._waitUntilScriptsAreParsed(["debugger_test_page.html$"],
+    this._waitUntilScriptsAreParsed(["debugger_test_page.html"],
         function() {
             test.releaseControl();
@@ -503 +503 @@
         for (var id in parsed) {
             var url = parsed[id].getUrl();
-            if (url && url.search("debugger_test_page.html$") !== -1) {
+            if (url && url.search("debugger_test_page.html") !== -1) {
                 checkScriptsPanel();
                 return;
@@ -513 +513 @@
     function checkScriptsPanel() {
         test.showPanel("scripts");
-        test.assertTrue(test._scriptsAreParsed(["debugger_test_page.html$"]), "Inspected script not found in the scripts list");
+        test.assertTrue(test._scriptsAreParsed(["debugger_test_page.html"]), "Inspected script not found in the scripts list");
         test.releaseControl();
     }
@@ -531 +531 @@
 
     test._waitUntilScriptsAreParsed(
-        ["page_with_content_script.html$", "simple_content_script.js$"],
+        ["page_with_content_script.html", "simple_content_script.js"],
         function() {
           test.releaseControl();
@@ -569 +569 @@
     function checkScriptsPanel() {
         test.assertTrue(!!WebInspector.panels.scripts.visibleView, "No visible script view.");
-        test.assertTrue(test._scriptsAreParsed(["debugger_test_page.html$"]), "Some scripts are missing.");
+        test.assertTrue(test._scriptsAreParsed(["debugger_test_page.html"]), "Some scripts are missing.");
         checkNoDuplicates();
         test.releaseControl();
@@ -585 +585 @@
 
     test._waitUntilScriptsAreParsed(
-        ["debugger_test_page.html$"],
+        ["debugger_test_page.html"],
         function() {
             checkNoDuplicates();
@@ -644 +644 @@
     }
 
-    this._executeCodeWhenScriptsAreParsed("handleClick()", ["pause_on_exception.html$"]);
+    this._executeCodeWhenScriptsAreParsed("handleClick()", ["pause_on_exception.html"]);
 
     this._waitForScriptPause(
@@ -914 +914 @@
     this.showPanel("scripts");
     var test = this;
-    this._executeCodeWhenScriptsAreParsed("handleClick()", ["completion_on_pause.html$"]);
+    this._executeCodeWhenScriptsAreParsed("handleClick()", ["completion_on_pause.html"]);
 
     this._waitForScriptPause(
@@ -975 +975 @@
         // contains a syntax error.
         for (var i = 0 ; i < options.length; i++) {
-            if (options[i].text.search("script_syntax_error.html$") !== -1)
+            if (options[i].text.search("script_syntax_error.html") !== -1)
                 test.fail("Script with syntax error should not be in the list of parsed scripts.");
         }
@@ -1174 +1174 @@
 TestSuite.prototype._executeFunctionForStepTest = function()
 {
-    this._executeCodeWhenScriptsAreParsed("a()", ["debugger_step.html$", "debugger_step.js$"]);
+    this._executeCodeWhenScriptsAreParsed("a()", ["debugger_step.html", "debugger_step.js"]);
 };
 
@@ -1438 +1438 @@
     var test = this;
 
-    this._executeCodeWhenScriptsAreParsed("handleClick()", ["debugger_closure.html$"]);
+    this._executeCodeWhenScriptsAreParsed("handleClick()", ["debugger_closure.html"]);
 
     this._waitForScriptPause(
@@ -1552 +1552 @@
     var test = this;
 
-    this._executeCodeWhenScriptsAreParsed("handleClick()", ["debugger_intrinsic_properties.html$"]);
+    this._executeCodeWhenScriptsAreParsed("handleClick()", ["debugger_intrinsic_properties.html"]);
 
     this._waitForScriptPause(