Changeset 109561 in webkit

Timestamp:

Mar 2, 2012 5:22:12 AM (12 years ago)

Author:

podivilov@chromium.org

Message:

Web Inspector: limit RawSourceCode usages to DebuggerPresentationModel.
​https://bugs.webkit.org/show_bug.cgi?id=80146

Reviewed by Vsevolod Vlasov.

• inspector/front-end/DebuggerPresentationModel.js:

(WebInspector.DebuggerPresentationModel.prototype.uiLocationToRawLocation):
(WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyLocation):
(WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyRawLocation):

• inspector/front-end/ObjectPopoverHelper.js:

(WebInspector.ObjectPopoverHelper.prototype._showObjectPopover.showObjectPopover.):
(WebInspector.ObjectPopoverHelper.prototype._showObjectPopover):

• inspector/front-end/ScriptsSearchScope.js:

(WebInspector.ScriptsSearchResultsPane.prototype.createAnchor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DebuggerPresentationModel.js (modified) (2 diffs)
• inspector/front-end/ObjectPopoverHelper.js (modified) (1 diff)
• inspector/front-end/ScriptsSearchScope.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Pavel Podivilov  <podivilov@chromium.org>
+
+        Web Inspector: limit RawSourceCode usages to DebuggerPresentationModel.
+        https://bugs.webkit.org/show_bug.cgi?id=80146
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel.prototype.uiLocationToRawLocation):
+        (WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyLocation):
+        (WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyRawLocation):
+        * inspector/front-end/ObjectPopoverHelper.js:
+        (WebInspector.ObjectPopoverHelper.prototype._showObjectPopover.showObjectPopover.):
+        (WebInspector.ObjectPopoverHelper.prototype._showObjectPopover):
+        * inspector/front-end/ScriptsSearchScope.js:
+        (WebInspector.ScriptsSearchResultsPane.prototype.createAnchor):
+
 2012-03-02  Pavel Podivilov  <podivilov@chromium.org>
 

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

@@ -106 +106 @@
 
     /**
+     * @param {WebInspector.UISourceCode} uiSourceCode
+     * @param {number} lineNumber
+     * @param {number} columnNumber
+     * @return {DebuggerAgent.Location}
+     */
+    uiLocationToRawLocation: function(uiSourceCode, lineNumber, columnNumber)
+    {
+        return uiSourceCode.rawSourceCode.uiLocationToRawLocation(uiSourceCode, lineNumber, columnNumber);
+    },
+
+    /**
      * @param {WebInspector.Event} event
      */
@@ -977 +988 @@
     linkifyLocation: function(sourceURL, lineNumber, columnNumber, classes)
     {
-        var rawSourceCode = this._model._rawSourceCodeForScriptWithURL(sourceURL);
-        if (!rawSourceCode)
+        var script = this._model._scriptForURLAndLocation(sourceURL, lineNumber, columnNumber);
+        if (!script)
             return WebInspector.linkifyResourceAsNode(sourceURL, lineNumber, classes);
-
-        return this.linkifyRawSourceCode(rawSourceCode, lineNumber, columnNumber, classes);
-    },
-
-    /**
-     * @param {WebInspector.RawSourceCode} rawSourceCode
-     * @param {number=} lineNumber
-     * @param {number=} columnNumber
+        var rawLocation = new WebInspector.DebuggerModel.Location(lineNumber, columnNumber);
+        rawLocation.scriptId = script.scriptId;
+        return this.linkifyRawLocation(rawLocation, classes);
+    },
+
+    /**
+     * @param {WebInspector.DebuggerModel.Location} rawLocation
      * @param {string=} classes
      */
-    linkifyRawSourceCode: function(rawSourceCode, lineNumber, columnNumber, classes)
-    {
-        var anchor = WebInspector.linkifyURLAsNode(rawSourceCode.url, "", classes, false);
-        var rawLocation = { lineNumber: lineNumber, columnNumber: columnNumber };
+    linkifyRawLocation: function(rawLocation, classes)
+    {
+        var anchor = WebInspector.linkifyURLAsNode("", "", classes, false);
+        var script = WebInspector.debuggerModel.scriptForSourceID(rawLocation.scriptId);
+        var rawSourceCode = this._model._rawSourceCodeForScript(script);
         var liveLocation = rawSourceCode.createLiveLocation(rawLocation, this._updateAnchor.bind(this, anchor));
         liveLocation.init();
         this._liveLocations.push(liveLocation);
         return anchor;
-    },
-
-    linkifyFunctionLocation: function(functionLocation, classes)
-    {
-        var rawSourceCode = this._model._rawSourceCodeForScriptId[functionLocation.scriptId];
-        if (!rawSourceCode)
-            return undefined;
-        return this.linkifyRawSourceCode(rawSourceCode, functionLocation.lineNumber, functionLocation.columnNumber, classes);
     },
 

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

@@ -74 +74 @@
 
                         this._linkifier = WebInspector.debuggerPresentationModel.createLinkifier();
-                        var link = this._linkifier.linkifyFunctionLocation(response.location, "function-location-link");
+                        var link = this._linkifier.linkifyRawLocation(response.location, "function-location-link");
                         if (link)
                             title.appendChild(link);

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

@@ -145 +145 @@
     createAnchor: function(file, lineNumber, columnNumber)
     {
-        
         var uiSourceCode = file;
-        var rawSourceCode = uiSourceCode.rawSourceCode;
-        var rawLocation = rawSourceCode.uiLocationToRawLocation(uiSourceCode, lineNumber, columnNumber);
-        var anchor = this._linkifier.linkifyRawSourceCode(uiSourceCode.rawSourceCode, rawLocation.lineNumber, rawLocation.columnNumber);
+        var rawLocation = WebInspector.debuggerPresentationModel.uiLocationToRawLocation(uiSourceCode, lineNumber, columnNumber);
+        var anchor = this._linkifier.linkifyRawLocation(rawLocation);
         anchor.removeChildren();
         return anchor;