Changeset 95522 in webkit

Timestamp:

Sep 20, 2011 2:28:50 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

Web Inspector: extract RawSourceCode source mapping logic to helper classes.
​https://bugs.webkit.org/show_bug.cgi?id=67789

Reviewed by Pavel Feldman.

• inspector/front-end/SourceFile.js:

(WebInspector.RawSourceCode.prototype.get uiSourceCode):
(WebInspector.RawSourceCode.prototype.rawLocationToUILocation):
(WebInspector.RawSourceCode.prototype.uiLocationToRawLocation):
(WebInspector.RawSourceCode.prototype._createSourceMapping.didRequestContent.didFormatContent):
(WebInspector.RawSourceCode.prototype._createSourceMapping.didRequestContent):
(WebInspector.RawSourceCode.prototype._createSourceMapping):
(WebInspector.RawSourceCode.prototype._saveSourceMapping):
(WebInspector.RawSourceCode.PlainSourceMapping):
(WebInspector.RawSourceCode.PlainSourceMapping.prototype.rawLocationToUILocation):
(WebInspector.RawSourceCode.PlainSourceMapping.prototype.uiLocationToRawLocation):
(WebInspector.RawSourceCode.PlainSourceMapping.prototype.get uiSourceCode):
(WebInspector.RawSourceCode.FormattedSourceMapping):
(WebInspector.RawSourceCode.FormattedSourceMapping.prototype.rawLocationToUILocation):
(WebInspector.RawSourceCode.FormattedSourceMapping.prototype.uiLocationToRawLocation):
(WebInspector.RawSourceCode.FormattedSourceMapping.prototype.get uiSourceCode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/SourceFile.js (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-08  Pavel Podivilov  <podivilov@chromium.org>
+
+        Web Inspector: extract RawSourceCode source mapping logic to helper classes.
+        https://bugs.webkit.org/show_bug.cgi?id=67789
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/SourceFile.js:
+        (WebInspector.RawSourceCode.prototype.get uiSourceCode):
+        (WebInspector.RawSourceCode.prototype.rawLocationToUILocation):
+        (WebInspector.RawSourceCode.prototype.uiLocationToRawLocation):
+        (WebInspector.RawSourceCode.prototype._createSourceMapping.didRequestContent.didFormatContent):
+        (WebInspector.RawSourceCode.prototype._createSourceMapping.didRequestContent):
+        (WebInspector.RawSourceCode.prototype._createSourceMapping):
+        (WebInspector.RawSourceCode.prototype._saveSourceMapping):
+        (WebInspector.RawSourceCode.PlainSourceMapping):
+        (WebInspector.RawSourceCode.PlainSourceMapping.prototype.rawLocationToUILocation):
+        (WebInspector.RawSourceCode.PlainSourceMapping.prototype.uiLocationToRawLocation):
+        (WebInspector.RawSourceCode.PlainSourceMapping.prototype.get uiSourceCode):
+        (WebInspector.RawSourceCode.FormattedSourceMapping):
+        (WebInspector.RawSourceCode.FormattedSourceMapping.prototype.rawLocationToUILocation):
+        (WebInspector.RawSourceCode.FormattedSourceMapping.prototype.uiLocationToRawLocation):
+        (WebInspector.RawSourceCode.FormattedSourceMapping.prototype.get uiSourceCode):
+
 2011-09-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -68 +68 @@
     get uiSourceCode()
     {
-        return this._uiSourceCode;
+        // FIXME: clients should use sourceMapping directly.
+        return this._sourceMapping && this._sourceMapping.uiSourceCode;
     },
 
@@ -92 +93 @@
     rawLocationToUILocation: function(rawLocation)
     {
-        var location = this._mapping ? this._mapping.originalToFormatted(rawLocation) : rawLocation;
-        return new WebInspector.UILocation(this.uiSourceCode, location.lineNumber, location.columnNumber);
+        // FIXME: clients should use sourceMapping directly.
+        return this._sourceMapping.rawLocationToUILocation(rawLocation);
     },
 
     uiLocationToRawLocation: function(lineNumber, columnNumber)
     {
-        var rawLocation = { lineNumber: lineNumber, columnNumber: columnNumber };
-        if (this._mapping)
-            rawLocation = this._mapping.formattedToOriginal(rawLocation);
-        rawLocation.scriptId = this._scriptForRawLocation(rawLocation.lineNumber, rawLocation.columnNumber).scriptId;
-        return rawLocation;
+        // FIXME: clients should use sourceMapping directly.
+        return this._sourceMapping.uiLocationToRawLocation(lineNumber, columnNumber);
     },
 
@@ -161 +159 @@
     {
         if (!this._formatted) {
-            callback(originalContentProvider, null);
+            var uiSourceCode = new WebInspector.UISourceCode(this.id, this.url, this.isContentScript, this, originalContentProvider);
+            var sourceMapping = new WebInspector.RawSourceCode.PlainSourceMapping(this, uiSourceCode);
+            callback(sourceMapping);
             return;
         }
@@ -170 +170 @@
             {
                 var contentProvider = new WebInspector.StaticContentProvider(mimeType, formattedContent)
-                callback(contentProvider, mapping);
+                var uiSourceCode = new WebInspector.UISourceCode("deobfuscated:" + this.id, this.url, this.isContentScript, this, contentProvider);
+                var sourceMapping = new WebInspector.RawSourceCode.FormattedSourceMapping(this, uiSourceCode, mapping);
+                callback(sourceMapping);
             }
             this._formatter.formatContent(mimeType, content, didFormatContent.bind(this));
@@ -177 +179 @@
     },
 
-    _saveSourceMapping: function(contentProvider, mapping)
-    {
-        var oldUISourceCode = this._uiSourceCode;
-        var uiSourceCodeId = (this._formatted ? "deobfuscated:" : "") + (this._scripts[0].sourceURL || this._scripts[0].scriptId);
-        this._uiSourceCode = new WebInspector.UISourceCode(uiSourceCodeId, this.url, this.isContentScript, this, contentProvider);
-        this._mapping = mapping;
+    _saveSourceMapping: function(sourceMapping)
+    {
+        var oldUISourceCode;
+        if (this._sourceMapping)
+            oldUISourceCode = this._sourceMapping.uiSourceCode;
+        this._sourceMapping = sourceMapping;
         this.dispatchEventToListeners(WebInspector.RawSourceCode.Events.SourceMappingUpdated, { oldUISourceCode: oldUISourceCode });
     }
@@ -188 +190 @@
 
 WebInspector.RawSourceCode.prototype.__proto__ = WebInspector.Object.prototype;
+
+
+/**
+ * @constructor
+ */
+WebInspector.RawSourceCode.PlainSourceMapping = function(rawSourceCode, uiSourceCode)
+{
+    this._rawSourceCode = rawSourceCode;
+    this._uiSourceCode = uiSourceCode;
+}
+
+WebInspector.RawSourceCode.PlainSourceMapping.prototype = {
+    rawLocationToUILocation: function(rawLocation)
+    {
+        return new WebInspector.UILocation(this._uiSourceCode, rawLocation.lineNumber, rawLocation.columnNumber);
+    },
+
+    uiLocationToRawLocation: function(lineNumber, columnNumber)
+    {
+        var rawLocation = { lineNumber: lineNumber, columnNumber: columnNumber };
+        rawLocation.scriptId = this._rawSourceCode._scriptForRawLocation(rawLocation.lineNumber, rawLocation.columnNumber).scriptId;
+        return rawLocation;
+    },
+
+    get uiSourceCode()
+    {
+        return this._uiSourceCode;
+    }
+}
+
+/**
+ * @constructor
+ */
+WebInspector.RawSourceCode.FormattedSourceMapping = function(rawSourceCode, uiSourceCode, mapping)
+{
+    this._rawSourceCode = rawSourceCode;
+    this._uiSourceCode = uiSourceCode;
+    this._mapping = mapping;
+}
+
+WebInspector.RawSourceCode.FormattedSourceMapping.prototype = {
+    rawLocationToUILocation: function(rawLocation)
+    {
+        var location = this._mapping.originalToFormatted(rawLocation);
+        return new WebInspector.UILocation(this._uiSourceCode, location.lineNumber, location.columnNumber);
+    },
+
+    uiLocationToRawLocation: function(lineNumber, columnNumber)
+    {
+        var rawLocation = this._mapping.formattedToOriginal({ lineNumber: lineNumber, columnNumber: columnNumber });
+        rawLocation.scriptId = this._rawSourceCode._scriptForRawLocation(rawLocation.lineNumber, rawLocation.columnNumber).scriptId;
+        return rawLocation;
+    },
+
+    get uiSourceCode()
+    {
+        return this._uiSourceCode;
+    }
+}