Changeset 80224 in webkit

Timestamp:

Mar 3, 2011 3:03:32 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

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

Reviewed by Pavel Feldman.

Web Inspector: rename "sourceName" to "sourceFileId" in ScriptsPanel.js.
​https://bugs.webkit.org/show_bug.cgi?id=55569

• inspector/debugger/scripts-panel.html:

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

Reviewed by Pavel Feldman.

Web Inspector: rename "sourceName" to "sourceFileId" in ScriptsPanel.js.
​https://bugs.webkit.org/show_bug.cgi?id=55569

sourceFileId better reflects the intention to have unique identifier for each source that is shown in scripts panel.

• inspector/front-end/DebuggerPresentationModel.js:
• inspector/front-end/ScriptsPanel.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/scripts-panel.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (modified) (5 diffs)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (22 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-03  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: rename "sourceName" to "sourceFileId" in ScriptsPanel.js.
+        https://bugs.webkit.org/show_bug.cgi?id=55569
+
+        * inspector/debugger/scripts-panel.html:
+
 2011-03-03  Jeremy Moskovich  <jeremy@chromium.org>
 

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

@@ -35 +35 @@
 
                 var sourceFrameCount = 0;
-                for (var sourceName in panel._sourceNameToSourceFrame)
+                for (var sourceFileId in panel._sourceFileIdToSourceFrame)
                     sourceFrameCount += 1;
                 InspectorTest.assertEquals(1, sourceFrameCount, "wrong number of source frames created during initial load");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-03  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: rename "sourceName" to "sourceFileId" in ScriptsPanel.js.
+        https://bugs.webkit.org/show_bug.cgi?id=55569
+
+        sourceFileId better reflects the intention to have unique identifier for each source that is shown in scripts panel.
+
+        * inspector/front-end/DebuggerPresentationModel.js:
+        * inspector/front-end/ScriptsPanel.js:
+
 2011-03-03  Steve Block  <steveblock@google.com>
 

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

@@ -45 +45 @@
 
 WebInspector.DebuggerPresentationModel.prototype = {
-    breakpointsForSourceName: function(sourceName)
+    breakpointsForSourceFileId: function(sourceFileId)
     {
         var breakpoints = [];
         for (var id in this._breakpoints) {
             var breakpoint = this._breakpoints[id];
-            if (breakpoint.sourceName === sourceName)
+            if (breakpoint.sourceFileId === sourceFileId)
                 breakpoints.push(breakpoint);
         }
@@ -62 +62 @@
         var sourceLocation = this._actualLocationToSourceLocation(breakpoint.url || breakpoint.sourceID, location.lineNumber, location.columnNumber);
 
-        var encodedSourceLocation = this._encodeSourceLocation(sourceLocation.sourceName, sourceLocation.lineNumber);
+        var encodedSourceLocation = this._encodeSourceLocation(sourceLocation.sourceFileId, sourceLocation.lineNumber);
         if (encodedSourceLocation in this._sourceLocationToBreakpointId) {
             // We can't show more than one breakpoint on a single source frame line. Remove newly added breakpoint.
@@ -70 +70 @@
 
         var presentationBreakpoint = {
-            sourceName: sourceLocation.sourceName,
+            sourceFileId: sourceLocation.sourceFileId,
             lineNumber: sourceLocation.lineNumber,
             url: breakpoint.url,
@@ -88 +88 @@
         var breakpointId = event.data;
         var breakpoint = this._breakpoints[breakpointId];
-        var encodedSourceLocation = this._encodeSourceLocation(breakpoint.sourceName, breakpoint.lineNumber);
+        var encodedSourceLocation = this._encodeSourceLocation(breakpoint.sourceFileId, breakpoint.lineNumber);
         delete this._breakpoints[breakpointId];
         delete this._sourceLocationToBreakpointId[encodedSourceLocation];
@@ -101 +101 @@
     },
 
-    _encodeSourceLocation: function(sourceName, lineNumber)
+    _encodeSourceLocation: function(sourceFileId, lineNumber)
     {
-        return sourceName + ":" + lineNumber;
+        return sourceFileId + ":" + lineNumber;
     },
 
-    _actualLocationToSourceLocation: function(sourceName, lineNumber, columnNumber)
+    _actualLocationToSourceLocation: function(sourceID, lineNumber, columnNumber)
     {
         // TODO: use source mapping to obtain source location.
-        return { sourceName: sourceName, lineNumber: lineNumber, columnNumber: columnNumber };
+        return { sourceFileId: sourceID, lineNumber: lineNumber, columnNumber: columnNumber };
     }
 }

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

@@ -266 +266 @@
         }
 
-        var sourceName = this._sourceNameForScript(script);
-        this._recreateSourceFrame(sourceName);
+        var sourceFileId = this._sourceFileIdForScript(script);
+        this._recreateSourceFrame(sourceFileId);
 
         var callFrames = WebInspector.debuggerModel.callFrames;
@@ -288 +288 @@
 
                 // Add resource url to files select if not already added while debugging inlined scripts.
-                if (!(resource.url in this._sourceNameToFilesSelectOption))
+                if (!(resource.url in this._sourceFileIdToFilesSelectOption))
                     this._addOptionToFilesSelectAndShowSourceFrameIfNeeded(resource.url);
             } else {
@@ -301 +301 @@
                 this._recreateSourceFrame(script.sourceURL);
             }
-        } else if (!(script.sourceURL in this._sourceNameToFilesSelectOption)) {
+        } else if (!(script.sourceURL in this._sourceFileIdToFilesSelectOption)) {
             // This is a dynamic script with "//@ sourceURL=" comment.
             this._addOptionToFilesSelectAndShowSourceFrameIfNeeded(script.sourceURL);
@@ -327 +327 @@
 
         // Add resource url to files select if not already added while debugging inlined scripts.
-        if (!(resource.url in this._sourceNameToFilesSelectOption))
+        if (!(resource.url in this._sourceFileIdToFilesSelectOption))
             this._addOptionToFilesSelectAndShowSourceFrameIfNeeded(resource.url);
     },
@@ -347 +347 @@
     },
 
-    _addOptionToFilesSelect: function(sourceName)
-    {
-        var script = this._scriptForSourceName(sourceName);
+    _addOptionToFilesSelect: function(sourceFileId)
+    {
+        var script = this._scriptForSourceFileId(sourceFileId);
         var select = this._filesSelectElement;
         var option = document.createElement("option");
@@ -367 +367 @@
             select.insertBefore(option, select.childNodes.item(insertionIndex));
 
-        option._sourceName = sourceName;
-        this._sourceNameToFilesSelectOption[sourceName] = option;
+        option._sourceFileId = sourceFileId;
+        this._sourceFileIdToFilesSelectOption[sourceFileId] = option;
     },
 
@@ -374 +374 @@
     {
         this._messages.push(message);
-        var sourceFrame = this._sourceNameToSourceFrame[message.url];
+        var sourceFrame = this._sourceFileIdToSourceFrame[message.url];
         if (sourceFrame)
             sourceFrame.addMessage(message);
@@ -382 +382 @@
     {
         this._messages = [];
-        for (var url in this._sourceNameToSourceFrame)
-            this._sourceNameToSourceFrame[url].clearMessages();
+        for (var url in this._sourceFileIdToSourceFrame)
+            this._sourceFileIdToSourceFrame[url].clearMessages();
     },
 
@@ -390 +390 @@
         var breakpoint = event.data;
 
-        var sourceFrame = this._sourceNameToSourceFrame[breakpoint.sourceName];
+        var sourceFrame = this._sourceFileIdToSourceFrame[breakpoint.sourceFileId];
         if (sourceFrame && sourceFrame.loaded)
             sourceFrame.addBreakpoint(breakpoint.lineNumber, breakpoint.resolved, breakpoint.condition, breakpoint.enabled);
@@ -399 +399 @@
         var breakpoint = event.data;
 
-        var sourceFrame = this._sourceNameToSourceFrame[breakpoint.sourceName];
+        var sourceFrame = this._sourceFileIdToSourceFrame[breakpoint.sourceFileId];
         if (sourceFrame && sourceFrame.loaded)
             sourceFrame.removeBreakpoint(breakpoint.lineNumber);
@@ -492 +492 @@
         this._updateBackAndForwardButtons();
 
-        this._sourceNameToSourceFrame = {};
-        this._sourceNameToFilesSelectOption = {};
+        this._sourceFileIdToSourceFrame = {};
+        this._sourceFileIdToFilesSelectOption = {};
         this._messages = [];
         this._filesSelectElement.removeChildren();
@@ -525 +525 @@
     canShowSourceLine: function(url, line)
     {
-        return this._debuggerEnabled && (url in this._sourceNameToFilesSelectOption);
+        return this._debuggerEnabled && (url in this._sourceFileIdToFilesSelectOption);
     },
 
     showSourceLine: function(url, line)
     {
-        if (!(url in this._sourceNameToFilesSelectOption))
+        if (!(url in this._sourceFileIdToFilesSelectOption))
             return;
         var sourceFrame = this._showSourceFrameAndAddToHistory(url);
@@ -547 +547 @@
     },
 
-    _showSourceFrameAndAddToHistory: function(sourceName)
-    {
-        var sourceFrame = this._showSourceFrame(sourceName);
+    _showSourceFrameAndAddToHistory: function(sourceFileId)
+    {
+        var sourceFrame = this._showSourceFrame(sourceFileId);
 
         var oldIndex = this._currentBackForwardIndex;
@@ -557 +557 @@
         // Check for a previous entry of the same object in _backForwardList.
         // If one is found, remove it.
-        var previousEntryIndex = this._backForwardList.indexOf(sourceName);
+        var previousEntryIndex = this._backForwardList.indexOf(sourceFileId);
         if (previousEntryIndex !== -1)
             this._backForwardList.splice(previousEntryIndex, 1);
 
-        this._backForwardList.push(sourceName);
+        this._backForwardList.push(sourceFileId);
         this._currentBackForwardIndex = this._backForwardList.length - 1;
 
@@ -569 +569 @@
     },
 
-    _showSourceFrame: function(sourceName)
-    {
-        var index = this._sourceNameToFilesSelectOption[sourceName].index;
+    _showSourceFrame: function(sourceFileId)
+    {
+        var index = this._sourceFileIdToFilesSelectOption[sourceFileId].index;
         this._filesSelectElement.selectedIndex = index;
 
-        var sourceFrame = this._sourceFrameForSourceName(sourceName);
+        var sourceFrame = this._sourceFrameForSourceFileId(sourceFileId);
         this.visibleView = sourceFrame;
 
-        var script = this._scriptForSourceName(sourceName);
+        var script = this._scriptForSourceFileId(sourceFileId);
         if (script.sourceURL)
             WebInspector.settings.lastViewedScriptFile = script.sourceURL;
@@ -584 +584 @@
     },
 
-    _sourceFrameForSourceName: function(sourceName)
-    {
-        var sourceFrame = this._sourceNameToSourceFrame[sourceName];
-        return sourceFrame || this._createSourceFrame(sourceName);
-    },
-
-    _createSourceFrame: function(sourceName)
-    {
-        var script = this._scriptForSourceName(sourceName);
+    _sourceFrameForSourceFileId: function(sourceFileId)
+    {
+        var sourceFrame = this._sourceFileIdToSourceFrame[sourceFileId];
+        return sourceFrame || this._createSourceFrame(sourceFileId);
+    },
+
+    _createSourceFrame: function(sourceFileId)
+    {
+        var script = this._scriptForSourceFileId(sourceFileId);
         var contentProvider;
         var isScript;
@@ -603 +603 @@
         }
         sourceFrame = new WebInspector.SourceFrame(contentProvider, script.sourceURL, isScript);
-        sourceFrame._sourceName = sourceName;
+        sourceFrame._sourceFileId = sourceFileId;
         sourceFrame.addEventListener(WebInspector.SourceFrame.Events.Loaded, this._sourceFrameLoaded, this);
-        this._sourceNameToSourceFrame[sourceName] = sourceFrame;
+        this._sourceFileIdToSourceFrame[sourceFileId] = sourceFrame;
         return sourceFrame;
     },
 
-    _recreateSourceFrame: function(sourceName)
-    {
-        var oldSourceFrame = this._sourceNameToSourceFrame[sourceName];
+    _recreateSourceFrame: function(sourceFileId)
+    {
+        var oldSourceFrame = this._sourceFileIdToSourceFrame[sourceFileId];
         if (!oldSourceFrame)
             return;
         oldSourceFrame.removeEventListener(WebInspector.SourceFrame.Events.Loaded, this._sourceFrameLoaded, this);
-        delete this._sourceNameToSourceFrame[sourceName];
+        delete this._sourceFileIdToSourceFrame[sourceFileId];
         oldSourceFrame.removeEventListener(WebInspector.SourceFrame.Events.Loaded, this._sourceFrameLoaded, this);
         if (this.visibleView !== oldSourceFrame)
             return;
 
-        var newSourceFrame = this._createSourceFrame(sourceName)
+        var newSourceFrame = this._createSourceFrame(sourceFileId)
         newSourceFrame.scrollTop = oldSourceFrame.scrollTop;
         this.visibleView = newSourceFrame;
@@ -628 +628 @@
     {
         var sourceFrame = event.target;
-        var sourceName = sourceFrame._sourceName;
+        var sourceFileId = sourceFrame._sourceFileId;
 
         for (var i = 0; i < this._messages.length; ++i) {
             var message = this._messages[i];
-            if (message.url === sourceName)
+            if (message.url === sourceFileId)
                 sourceFrame.addMessage(message);
         }
 
-        var breakpoints = this._presentationModel.breakpointsForSourceName(sourceName);
+        var breakpoints = this._presentationModel.breakpointsForSourceFileId(sourceFileId);
         for (var i = 0; i < breakpoints.length; ++i) {
             var breakpoint = breakpoints[i];
@@ -645 +645 @@
         if (selectedCallFrame) {
             var script = WebInspector.debuggerModel.scriptForSourceID(selectedCallFrame.sourceID);
-            if (this._sourceNameForScript(script) === sourceName) {
+            if (this._sourceFileIdForScript(script) === sourceFileId) {
                 sourceFrame.setExecutionLine(selectedCallFrame.line);
                 this._executionSourceFrame = sourceFrame;
@@ -652 +652 @@
     },
 
-    _sourceNameForScript: function(script)
+    _sourceFileIdForScript: function(script)
     {
         return script.sourceURL || script.sourceID;
     },
 
-    _scriptForSourceName: function(sourceName)
+    _scriptForSourceFileId: function(sourceFileId)
     {
         function filter(script)
         {
-            return (script.sourceURL || script.sourceID) === sourceName;
+            return (script.sourceURL || script.sourceID) === sourceFileId;
         }
         return WebInspector.debuggerModel.queryScripts(filter)[0];
@@ -686 +686 @@
 
         var script = WebInspector.debuggerModel.scriptForSourceID(currentFrame.sourceID);
-        var sourceName = this._sourceNameForScript(script);
-        if (!(sourceName in this._sourceNameToFilesSelectOption)) {
+        var sourceFileId = this._sourceFileIdForScript(script);
+        if (!(sourceFileId in this._sourceFileIdToFilesSelectOption)) {
             // This happens in two cases:
             // 1) Current call frame function is defined in anonymous script (anonymous scripts aren't added to files select by default)
             // 2) We are debugging synchronously executed inlined script and there is no resource so far
-            this._addOptionToFilesSelect(sourceName);
-        }
-        var sourceFrame = this._showSourceFrameAndAddToHistory(sourceName);
+            this._addOptionToFilesSelect(sourceFileId);
+        }
+        var sourceFrame = this._showSourceFrameAndAddToHistory(sourceFileId);
         if (sourceFrame.loaded) {
             sourceFrame.setExecutionLine(currentFrame.line);
@@ -702 +702 @@
     _filesSelectChanged: function()
     {
-        var sourceName = this._filesSelectElement[this._filesSelectElement.selectedIndex]._sourceName;
-        this._showSourceFrameAndAddToHistory(sourceName);
+        var sourceFileId = this._filesSelectElement[this._filesSelectElement.selectedIndex]._sourceFileId;
+        this._showSourceFrameAndAddToHistory(sourceFileId);
     },