Changeset 116077 in webkit

Timestamp:

May 4, 2012 2:10:09 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: createRawLocationByURL is too slow if a big number of evals happen.
​https://bugs.webkit.org/show_bug.cgi?id=85477

It iterates through all the _scripts even they have no url.
We can keep a separate map of scripts with url.

Reviewed by Yury Semikhatsky.

Source/WebCore:

• inspector/front-end/DebuggerModel.js:

(WebInspector.DebuggerModel):
(WebInspector.DebuggerModel.prototype._globalObjectCleared):
(WebInspector.DebuggerModel.prototype._resetScriptsMap):
(WebInspector.DebuggerModel.prototype._parsedScriptSource):
(WebInspector.DebuggerModel.prototype.createRawLocationByURL):

LayoutTests:

• http/tests/inspector/compiler-script-mapping.html:
• http/tests/inspector/debugger-test.js:

(initialize_DebuggerTest):

• inspector/debugger/raw-source-code.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/compiler-script-mapping.html (modified) (3 diffs)
• LayoutTests/http/tests/inspector/debugger-test.js (modified) (1 diff)
• LayoutTests/inspector/debugger/raw-source-code.html (modified) (6 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DebuggerModel.js (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-03  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: createRawLocationByURL is too slow if a big number of evals happen.
+        https://bugs.webkit.org/show_bug.cgi?id=85477
+
+        It iterates through all the _scripts even they have no url.
+        We can keep a separate map of scripts with url.
+
+        Reviewed by Yury Semikhatsky.
+
+        * http/tests/inspector/compiler-script-mapping.html:
+        * http/tests/inspector/debugger-test.js:
+        (initialize_DebuggerTest):
+        * inspector/debugger/raw-source-code.html:
+
 2012-05-04  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
 

trunk/LayoutTests/http/tests/inspector/compiler-script-mapping.html

@@ -125 +125 @@
         function testCompilerScriptMapping(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var mapping = new WebInspector.CompilerScriptMapping();
             var script = InspectorTest.createScriptMock("compiled.js", 0, 0, true, "");
@@ -161 +161 @@
         function testInlinedSourceMap(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var mapping = new WebInspector.CompilerScriptMapping();
             var script = InspectorTest.createScriptMock("http://example.com/compiled.js", 0, 0, true, "");
@@ -192 +192 @@
         {
             WebInspector.settings.sourceMapsEnabled.set(true);
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var mainScriptMapping = new WebInspector.MainScriptMapping();
             mainScriptMapping.addEventListener(WebInspector.MainScriptMapping.Events.UISourceCodeListChanged, uiSourceCodeListChanged);

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

@@ -292 +292 @@
     var script = new WebInspector.Script(scriptId, url, startLine, startColumn, endLine, endColumn, isContentScript);
     script.requestContent = function(callback) { callback(source); };
-    WebInspector.debuggerModel._scripts[scriptId] = script;
+    WebInspector.debuggerModel._registerScript(script);
     return script;
 }

trunk/LayoutTests/inspector/debugger/raw-source-code.html

@@ -93 +93 @@
         function testScriptWithoutResource(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var script = InspectorTest.createScriptMock("foo.js", 0, 0, true, "<script source>");
             var rawSourceCode = createRawSourceCode(script, null);
@@ -114 +114 @@
         function testHTMLWithPendingResource(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var script1 = InspectorTest.createScriptMock("index.html", 0, 10, false, "<script source 1>");
             var script2 = InspectorTest.createScriptMock("index.html", 0, 45, false, "<script source 2>");
@@ -148 +148 @@
         function testHTMLWithFinishedResource(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var script1 = InspectorTest.createScriptMock("index.html", 1, 10, false, "<script source 1>");
             var script2 = InspectorTest.createScriptMock("index.html", 5, 45, false, "<script\nsource\n2>");
@@ -177 +177 @@
         function testForceUpdateSourceMapping(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var script1 = InspectorTest.createScriptMock("index.html", 0, 10, false, "<script source 1>");
             var script2 = InspectorTest.createScriptMock("index.html", 0, 45, false, "<script source 2>");
@@ -244 +244 @@
         function testFormattingWithFinishedResource(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var script = InspectorTest.createScriptMock("foo.js", 0, 0, true, "<script source>");
             var request = createFinishedRequestMock("script", "<resource content>");
@@ -303 +303 @@
         function testFormattingWithPendingResource(next)
         {
-            WebInspector.debuggerModel._scripts = [];
+            WebInspector.debuggerModel._reset();
             var script = InspectorTest.createScriptMock("foo.js", 0, 0, true, "<script source>");
             var request = createPendingRequestMock("script", "<resource content>");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-03  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: createRawLocationByURL is too slow if a big number of evals happen.
+        https://bugs.webkit.org/show_bug.cgi?id=85477
+
+        It iterates through all the _scripts even they have no url.
+        We can keep a separate map of scripts with url.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/DebuggerModel.js:
+        (WebInspector.DebuggerModel):
+        (WebInspector.DebuggerModel.prototype._globalObjectCleared):
+        (WebInspector.DebuggerModel.prototype._resetScriptsMap):
+        (WebInspector.DebuggerModel.prototype._parsedScriptSource):
+        (WebInspector.DebuggerModel.prototype.createRawLocationByURL):
+
 2012-05-03  David Barr  <davidbarr@chromium.org>
 

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

@@ -40 +40 @@
      */
     this._scripts = {};
+    this._scriptsBySourceURL = {};
 
     this._canSetScriptSource = false;
@@ -150 +151 @@
         // Adjust column if needed.
         var minColumnNumber = 0;
-        for (var id in this._scripts) {
-            var script = this._scripts[id];
-            if (url === script.sourceURL && lineNumber === script.lineOffset)
+        var scripts = this._scriptsBySourceURL[url] || [];
+        for (var i = 0, l = scripts.length; i < l; ++i) {
+            var script = scripts[i];
+            if (lineNumber === script.lineOffset)
                 minColumnNumber = minColumnNumber ? Math.min(minColumnNumber, script.columnOffset) : script.columnOffset;
         }
@@ -215 +217 @@
     {
         this._setDebuggerPausedDetails(null);
+        this._reset();
+        this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.GlobalObjectCleared);
+    },
+
+    _reset: function()
+    {
         this._scripts = {};
-        this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.GlobalObjectCleared);
+        this._scriptsBySourceURL = {};
     },
 
@@ -323 +331 @@
     {
         var script = new WebInspector.Script(scriptId, sourceURL, startLine, startColumn, endLine, endColumn, isContentScript, sourceMapURL);
-        this._scripts[scriptId] = script;
+        this._registerScript(script);
         this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.ParsedScriptSource, script);
+    },
+
+    /**
+     * @param {WebInspector.Script} script
+     */
+    _registerScript: function(script)
+    {
+        this._scripts[script.scriptId] = script;
+        if (script.sourceURL) {
+            var scripts = this._scriptsBySourceURL[script.sourceURL];
+            if (!scripts) {
+                scripts = [];
+                this._scriptsBySourceURL[script.sourceURL] = scripts;
+            }
+            scripts.push(script);
+        }
     },
 
@@ -362 +386 @@
     {
         var closestScript = null;
-        for (var scriptId in this._scripts) {
-            var script = this._scripts[scriptId];
-            if (script.sourceURL !== sourceURL)
-                continue;
+        var scripts = this._scriptsBySourceURL[sourceURL] || [];
+        for (var i = 0, l = scripts.length; i < l; ++i) {
+            var script = scripts[i];
             if (!closestScript)
                 closestScript = script;