1 files changed, 4 insertions, 59 deletions

diff --git a/Source/WebCore/inspector/front-end/ScriptFormatter.js b/Source/WebCore/inspector/front-end/ScriptFormatter.js
index f70d6c6..2e166f4 100644
--- a/Source/WebCore/inspector/front-end/ScriptFormatter.js
+++ b/Source/WebCore/inspector/front-end/ScriptFormatter.js
@@ -69,25 +69,15 @@ WebInspector.ScriptFormatter.findScriptRanges = function(lineEndings, scripts)
 }
 
 WebInspector.ScriptFormatter.prototype = {
-    formatContent: function(content, callback)
+    formatContent: function(text, scripts, callback)
     {
-        var chunks = this._splitContentIntoChunks(content.text, content.scriptRanges);
+        var scriptRanges = WebInspector.ScriptFormatter.findScriptRanges(text.lineEndings(), scripts);
+        var chunks = this._splitContentIntoChunks(text, scriptRanges);
 
         function didFormatChunks()
         {
             var result = this._buildContentFromChunks(chunks);
-
-            var sourceMapping = new WebInspector.SourceMappingForFormattedScript(content.text.lineEndings(), result.text.lineEndings(), result.mapping);
-            var formattedScriptRanges = [];
-            for (var i = 0; i < content.scriptRanges.length; ++i) {
-                var scriptRange = content.scriptRanges[i];
-                formattedScriptRange = {};
-                formattedScriptRange.start = sourceMapping.originalPositionToFormattedLocation(scriptRange.start.position);
-                formattedScriptRange.end = sourceMapping.originalPositionToFormattedLocation(scriptRange.end.position);
-                formattedScriptRange.sourceID = scriptRange.sourceID;
-                formattedScriptRanges.push(formattedScriptRange);
-            }
-            callback(new WebInspector.SourceFrameContent(result.text, sourceMapping, formattedScriptRanges));
+            callback(result.text, result.mapping);
         }
         this._formatChunks(chunks, 0, didFormatChunks.bind(this));
     },
@@ -186,48 +176,3 @@ WebInspector.ScriptFormatter.prototype = {
         task.callback(task.source, { original: [], formatted: [] });
     }
 }
-
-
-WebInspector.SourceMappingForFormattedScript = function(originalLineEndings, formattedLineEndings, mapping)
-{
-    WebInspector.SourceMapping.call(this);
-    this._originalLineEndings = originalLineEndings;
-    this._formattedLineEndings = formattedLineEndings;
-    this._mapping = mapping;
-}
-
-WebInspector.SourceMappingForFormattedScript.prototype = {
-    actualLocationToSourceLocation: function(lineNumber, columnNumber)
-    {
-        var position = WebInspector.ScriptFormatter.locationToPosition(this._originalLineEndings, lineNumber, columnNumber);
-        return this.originalPositionToFormattedLocation(position);
-    },
-
-    sourceLocationToActualLocation: function(lineNumber, columnNumber)
-    {
-        var formattedPosition = WebInspector.ScriptFormatter.locationToPosition(this._formattedLineEndings, lineNumber, columnNumber);
-        var position = this._convertPosition(this._mapping.formatted, this._mapping.original, formattedPosition);
-        return WebInspector.ScriptFormatter.positionToLocation(this._originalLineEndings, position);
-    },
-
-    originalPositionToFormattedLocation: function(position)
-    {
-        var formattedPosition = this._convertPosition(this._mapping.original, this._mapping.formatted, position);
-        var location = WebInspector.ScriptFormatter.positionToLocation(this._formattedLineEndings, formattedPosition);
-        location.position = formattedPosition;
-        return location;
-    },
-
-    _convertPosition: function(positions1, positions2, position)
-    {
-        var index = positions1.upperBound(position);
-        var range1 = positions1[index] - positions1[index - 1];
-        var range2 = positions2[index] - positions2[index - 1];
-        var position2 = positions2[index - 1];
-        if (range1)
-            position2 += Math.round((position - positions1[index - 1]) * range2 / range1);
-        return position2;
-    }
-}
-
-WebInspector.SourceMappingForFormattedScript.prototype.__proto__ = WebInspector.SourceMapping.prototype;