Changeset 109577 in webkit

Timestamp:

Mar 2, 2012 8:21:24 AM (12 years ago)

Author:

podivilov@chromium.org

Message:

Web Inspector: fix fronted compilation.
​https://bugs.webkit.org/show_bug.cgi?id=80154

Reviewed by Yury Semikhatsky.

• inspector/front-end/DebuggerModel.js:

(WebInspector.DebuggerModel.prototype.scriptForSourceID):

• inspector/front-end/DebuggerPresentationModel.js:

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

• inspector/front-end/ScriptsSearchScope.js:

(WebInspector.ScriptsSearchResultsPane.prototype.createAnchor):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Pavel Podivilov  <podivilov@chromium.org>
+
+        Web Inspector: fix fronted compilation.
+        https://bugs.webkit.org/show_bug.cgi?id=80154
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/DebuggerModel.js:
+        (WebInspector.DebuggerModel.prototype.scriptForSourceID):
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyLocation):
+        * inspector/front-end/ScriptsSearchScope.js:
+        (WebInspector.ScriptsSearchResultsPane.prototype.createAnchor):
+
 2012-03-02  Kaustubh Atrawalkar  <kaustubh@motorola.com>
 

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

@@ -235 +235 @@
     /**
      * @param {DebuggerAgent.ScriptId} scriptId
-     * @return {WebInspector.Script|undefined}
+     * @return {WebInspector.Script}
      */
     scriptForSourceID: function(scriptId)
     {
-        return this._scripts[scriptId];
+        return this._scripts[scriptId] || null;
     },
 

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

@@ -678 +678 @@
      * @param {string} url
      * @param {DebuggerAgent.Location} rawLocation
+     * @return {WebInspector.Script}
      */
     _scriptForURLAndLocation: function(url, rawLocation)
@@ -988 +989 @@
     linkifyLocation: function(sourceURL, lineNumber, columnNumber, classes)
     {
-        var script = this._model._scriptForURLAndLocation(sourceURL, lineNumber, columnNumber);
+        var rawLocation = new WebInspector.DebuggerModel.Location(lineNumber, columnNumber || 0);
+        var script = this._model._scriptForURLAndLocation(sourceURL, rawLocation);
         if (!script)
             return WebInspector.linkifyResourceAsNode(sourceURL, lineNumber, classes);
-        var rawLocation = new WebInspector.DebuggerModel.Location(lineNumber, columnNumber);
         rawLocation.scriptId = script.scriptId;
         return this.linkifyRawLocation(rawLocation, classes);

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

@@ -145 +145 @@
     createAnchor: function(file, lineNumber, columnNumber)
     {
-        var uiSourceCode = file;
+        var uiSourceCode = /** @type {WebInspector.UISourceCode} */ file;
         var rawLocation = WebInspector.debuggerPresentationModel.uiLocationToRawLocation(uiSourceCode, lineNumber, columnNumber);
         var anchor = this._linkifier.linkifyRawLocation(rawLocation);