Diff
Modified: trunk/LayoutTests/ChangeLog (96096 => 96097)
--- trunk/LayoutTests/ChangeLog 2011-09-27 11:20:34 UTC (rev 96096)
+++ trunk/LayoutTests/ChangeLog 2011-09-27 12:06:28 UTC (rev 96097)
@@ -1,3 +1,13 @@
+2011-09-21 Pavel Podivilov <[email protected]>
+
+ Web Inspector: migrate RawSourceCode clients to SourceMapping class.
+ https://bugs.webkit.org/show_bug.cgi?id=68524
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/debugger/breakpoint-manager.html:
+ * inspector/debugger/raw-source-code.html:
+
2011-09-27 Vineet Chaudhary <[email protected]>
wrap attribute of textarea element cannot be accessed by _javascript_.
Modified: trunk/LayoutTests/inspector/debugger/breakpoint-manager.html (96096 => 96097)
--- trunk/LayoutTests/inspector/debugger/breakpoint-manager.html 2011-09-27 11:20:34 UTC (rev 96096)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-manager.html 2011-09-27 12:06:28 UTC (rev 96097)
@@ -58,23 +58,22 @@
serializedBreakpoints.push(createBreakpoint("a.js", 20, "", false));
serializedBreakpoints.push(createBreakpoint("b.js", 3, "", true));
- var uiSourceCodeA = {
- id: "a.js",
- url: "a.js",
- rawSourceCode: {
- rawLocationToUILocation: function(rawLocation) { return rawLocation; },
- uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "a.js", lineNumber: lineNumber, columnNumber: columnNumber }; }
- }
- };
- var uiSourceCodeB = {
- id: "b.js",
- url: "b.js",
- rawSourceCode: {
- rawLocationToUILocation: function(rawLocation) { return rawLocation; },
- uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "b.js", lineNumber: lineNumber, columnNumber: columnNumber }; }
- }
+ function createUISourceCode(id, url, rawLocationToUILocation, uiLocationToRawLocation)
+ {
+ return {
+ id: id,
+ url: url,
+ rawSourceCode: { sourceMapping : { rawLocationToUILocation: rawLocationToUILocation, uiLocationToRawLocation: uiLocationToRawLocation } }
+ };
}
+ var uiSourceCodeA = createUISourceCode("a.js", "a.js",
+ function(rawLocation) { return rawLocation; },
+ function(lineNumber, columnNumber) { return { scriptId: "a.js", lineNumber: lineNumber, columnNumber: columnNumber }; });
+ var uiSourceCodeB = createUISourceCode("b.js", "b.js",
+ function(rawLocation) { return rawLocation; },
+ function(lineNumber, columnNumber) { return { scriptId: "b.js", lineNumber: lineNumber, columnNumber: columnNumber }; });
+
function createBreakpointManager(breakpoints)
{
breakpointStorage.set(breakpoints);
@@ -204,24 +203,13 @@
function testFormatting(next)
{
var breakpointManager = createBreakpointManager([createBreakpoint("c.js", 4, "", true)]);
+ var uiSourceCodeC = createUISourceCode("c.js", "c.js",
+ function(rawLocation) { return rawLocation; },
+ function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: lineNumber, columnNumber: columnNumber }; });
+ var uiSourceCodeCFormatted = createUISourceCode("deobfuscated:c.js", "c.js",
+ function(rawLocation) { return { lineNumber: rawLocation.lineNumber * 2, columnNumber: rawLocation.columnNumber * 2 }; },
+ function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: Math.floor(lineNumber / 2), columnNumber: Math.floor(columnNumber / 2) }; });
- var uiSourceCodeC = {
- id: "c.js",
- url: "c.js",
- rawSourceCode: {
- rawLocationToUILocation: function(rawLocation) { return rawLocation; },
- uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: lineNumber, columnNumber: columnNumber }; }
- }
- };
- var uiSourceCodeCFormatted = {
- id: "deobfuscated:c.js",
- url: "c.js",
- rawSourceCode: {
- rawLocationToUILocation: function(rawLocation) { return { lineNumber: rawLocation.lineNumber * 2, columnNumber: rawLocation.columnNumber * 2 }; },
- uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: Math.floor(lineNumber / 2), columnNumber: Math.floor(columnNumber / 2) }; }
- }
- }
-
breakpointManager.uiSourceCodeAdded(uiSourceCodeC);
setTimeout(format, 0);
Modified: trunk/LayoutTests/inspector/debugger/raw-source-code.html (96096 => 96097)
--- trunk/LayoutTests/inspector/debugger/raw-source-code.html 2011-09-27 11:20:34 UTC (rev 96096)
+++ trunk/LayoutTests/inspector/debugger/raw-source-code.html 2011-09-27 12:06:28 UTC (rev 96097)
@@ -105,13 +105,13 @@
var script = createScriptMock("foo.js", 0, 0, true, "<script source>");
var rawSourceCode = createRawSourceCode(script, null);
- InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
- var uiSourceCode = rawSourceCode.uiSourceCode;
+ var sourceMapping = rawSourceCode.sourceMapping;
+ var uiSourceCode = sourceMapping.uiSourceCode;
InspectorTest.assertEquals("foo.js", uiSourceCode.url);
InspectorTest.assertEquals(true, uiSourceCode.isContentScript);
InspectorTest.assertEquals(rawSourceCode, uiSourceCode.rawSourceCode);
- checkUILocation(uiSourceCode, 0, 5, rawSourceCode.rawLocationToUILocation(createRawLocation(0, 5)));
- checkRawLocation(script, 0, 10, rawSourceCode.uiLocationToRawLocation(0, 10));
+ checkUILocation(uiSourceCode, 0, 5, sourceMapping.rawLocationToUILocation(createRawLocation(0, 5)));
+ checkRawLocation(script, 0, 10, sourceMapping.uiLocationToRawLocation(0, 10));
uiSourceCode.requestContent(didRequestContent);
function didRequestContent(mimeType, content)
@@ -129,14 +129,14 @@
var resource = createPendingResourceMock("document", "<resource content>");
var rawSourceCode = createRawSourceCode(script1, resource);
- InspectorTest.assertTrue(!rawSourceCode.uiSourceCode);
+ InspectorTest.assertTrue(!rawSourceCode.sourceMapping);
waitForSourceMappingEvent(rawSourceCode, mappingReady);
resource.finish();
function mappingReady(event)
{
InspectorTest.assertTrue(!event.data.oldSourceCode);
- var uiSourceCode = rawSourceCode.uiSourceCode;
+ var uiSourceCode = rawSourceCode.sourceMapping.uiSourceCode;
InspectorTest.assertEquals("index.html", uiSourceCode.url);
InspectorTest.assertEquals(false, uiSourceCode.isContentScript);
uiSourceCode.requestContent(didRequestContent);
@@ -160,8 +160,8 @@
var resource = createFinishedResourceMock("document", "<resource content>");
var rawSourceCode = createRawSourceCode(script1, resource);
- InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
- var uiSourceCode = rawSourceCode.uiSourceCode;
+ var sourceMapping = rawSourceCode.sourceMapping;
+ var uiSourceCode = sourceMapping.uiSourceCode;
InspectorTest.assertEquals("index.html", uiSourceCode.url);
InspectorTest.assertEquals(false, uiSourceCode.isContentScript);
uiSourceCode.requestContent(didRequestContent);
@@ -173,9 +173,9 @@
rawSourceCode.addScript(script2);
rawSourceCode.forceUpdateSourceMapping();
- checkUILocation(uiSourceCode, 1, 20, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 20)));
- checkRawLocation(script1, 1, 20, rawSourceCode.uiLocationToRawLocation(1, 20));
- checkRawLocation(script2, 6, 2, rawSourceCode.uiLocationToRawLocation(6, 2));
+ checkUILocation(uiSourceCode, 1, 20, sourceMapping.rawLocationToUILocation(createRawLocation(1, 20)));
+ checkRawLocation(script1, 1, 20, sourceMapping.uiLocationToRawLocation(1, 20));
+ checkRawLocation(script2, 6, 2, sourceMapping.uiLocationToRawLocation(6, 2));
next();
}
@@ -187,8 +187,9 @@
var resource = createFinishedResourceMock("script", "<resource content>");
var rawSourceCode = createRawSourceCode(script, resource);
- InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
- rawSourceCode.uiSourceCode.requestContent(didRequestContent);
+ var sourceMapping = rawSourceCode.sourceMapping;
+ var uiSourceCode = sourceMapping.uiSourceCode;
+ uiSourceCode.requestContent(didRequestContent);
function didRequestContent(mimeType, content)
{
@@ -202,7 +203,7 @@
function mappingReadyAfterEdit()
{
- rawSourceCode.uiSourceCode.requestContent(didRequestContentAfterEdit);
+ rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentAfterEdit);
}
function didRequestContentAfterEdit(mimeType, content)
@@ -221,13 +222,13 @@
var resource = createPendingResourceMock("document", "<resource content>");
var rawSourceCode = createRawSourceCode(script1, resource);
- InspectorTest.assertTrue(!rawSourceCode.uiSourceCode);
+ InspectorTest.assertTrue(!rawSourceCode.sourceMapping);
waitForSourceMappingEvent(rawSourceCode, requestContent);
rawSourceCode.forceUpdateSourceMapping();
function requestContent()
{
- rawSourceCode.uiSourceCode.requestContent(didRequestContentOneScript);
+ rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentOneScript);
}
function didRequestContentOneScript(mimeType, content)
@@ -243,7 +244,7 @@
function requestContentTwoScripts()
{
- rawSourceCode.uiSourceCode.requestContent(didRequestContentTwoScripts);
+ rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentTwoScripts);
}
function didRequestContentTwoScripts(mimeType, content)
@@ -258,7 +259,7 @@
function requestContentResource()
{
- rawSourceCode.uiSourceCode.requestContent(didRequestContentResource);
+ rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentResource);
}
function didRequestContentResource(mimeType, content)
@@ -279,10 +280,10 @@
var resource = createFinishedResourceMock("script", "<resource content>");
var rawSourceCode = createRawSourceCode(script, resource, false);
- InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
- var uiSourceCode = rawSourceCode.uiSourceCode;
- checkUILocation(uiSourceCode, 1, 2, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
- checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(1, 2));
+ var sourceMapping = rawSourceCode.sourceMapping;
+ var uiSourceCode = sourceMapping.uiSourceCode;
+ checkUILocation(uiSourceCode, 1, 2, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
+ checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(1, 2));
uiSourceCode.requestContent(didRequestContent);
function didRequestContent(mimeType, content)
@@ -297,9 +298,10 @@
function requestFormattedContent()
{
- var uiSourceCode = rawSourceCode.uiSourceCode;
- checkUILocation(uiSourceCode, 2, 4, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
- checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(2, 4));
+ var sourceMapping = rawSourceCode.sourceMapping;
+ var uiSourceCode = sourceMapping.uiSourceCode;
+ checkUILocation(uiSourceCode, 2, 4, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
+ checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(2, 4));
uiSourceCode.requestContent(didRequestFormattedContent);
}
@@ -314,9 +316,10 @@
function requestNotFormattedContent()
{
- var uiSourceCode = rawSourceCode.uiSourceCode;
- checkUILocation(uiSourceCode, 1, 2, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
- checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(1, 2));
+ var sourceMapping = rawSourceCode.sourceMapping;
+ var uiSourceCode = sourceMapping.uiSourceCode;
+ checkUILocation(uiSourceCode, 1, 2, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
+ checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(1, 2));
uiSourceCode.requestContent(didRequestNotFormattedContent);
}
@@ -335,16 +338,17 @@
var resource = createPendingResourceMock("script", "<resource content>");
var rawSourceCode = createRawSourceCode(script, resource, true);
- InspectorTest.assertTrue(!rawSourceCode.uiSourceCode);
+ InspectorTest.assertTrue(!rawSourceCode.sourceMapping);
resource.finish();
waitForSourceMappingEvent(rawSourceCode, checkMapping);
rawSourceCode._formatter.finish();
function checkMapping()
{
- var uiSourceCode = rawSourceCode.uiSourceCode;
- checkUILocation(uiSourceCode, 2, 4, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
- checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(2, 4));
+ var sourceMapping = rawSourceCode.sourceMapping;
+ var uiSourceCode = sourceMapping.uiSourceCode;
+ checkUILocation(uiSourceCode, 2, 4, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
+ checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(2, 4));
next();
}
}
Modified: trunk/Source/WebCore/ChangeLog (96096 => 96097)
--- trunk/Source/WebCore/ChangeLog 2011-09-27 11:20:34 UTC (rev 96096)
+++ trunk/Source/WebCore/ChangeLog 2011-09-27 12:06:28 UTC (rev 96097)
@@ -1,3 +1,34 @@
+2011-09-21 Pavel Podivilov <[email protected]>
+
+ Web Inspector: migrate RawSourceCode clients to SourceMapping class.
+ https://bugs.webkit.org/show_bug.cgi?id=68524
+
+ Clients should use uiSourceCode(), rawLocationToUILocation(), uiLocationToRawLocation() methods of SourceMapping class.
+ Initially, RawSourceCode may not have associated SourceMapping, so it is natural to extract this methods and associated state to a separate class.
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/BreakpointManager.js:
+ (WebInspector.BreakpointManager.prototype._materializeBreakpoint):
+ (WebInspector.BreakpointManager.prototype._breakpointDebuggerLocationChanged):
+ * inspector/front-end/DebuggerPresentationModel.js:
+ (WebInspector.DebuggerPresentationModel.prototype.linkifyLocation.updateAnchor):
+ (WebInspector.DebuggerPresentationModel.prototype.linkifyLocation):
+ (WebInspector.DebuggerPresentationModel.prototype._addScript):
+ (WebInspector.DebuggerPresentationModel.prototype._updateSourceMapping):
+ (WebInspector.DebuggerPresentationModel.prototype._restoreBreakpoints):
+ (WebInspector.DebuggerPresentationModel.prototype._restoreConsoleMessages):
+ (WebInspector.DebuggerPresentationModel.prototype._consoleMessageAdded):
+ (WebInspector.DebuggerPresentationModel.prototype._createPresentationMessage):
+ (WebInspector.DebuggerPresentationModel.prototype.continueToLine):
+ (WebInspector.PresentationCallFrame.prototype.get url):
+ (WebInspector.PresentationCallFrame.prototype.sourceLine.sourceMappingUpdated):
+ (WebInspector.PresentationCallFrame.prototype.sourceLine):
+ (WebInspector.DebuggerPresentationModelResourceBinding.prototype.canSetContent):
+ (WebInspector.DebuggerPresentationModelResourceBinding.prototype.setContent):
+ * inspector/front-end/SourceFile.js:
+ (WebInspector.RawSourceCode.prototype.get sourceMapping):
+
2011-09-27 Vineet Chaudhary <[email protected]>
wrap attribute of textarea element cannot be accessed by _javascript_.
Modified: trunk/Source/WebCore/inspector/front-end/BreakpointManager.js (96096 => 96097)
--- trunk/Source/WebCore/inspector/front-end/BreakpointManager.js 2011-09-27 11:20:34 UTC (rev 96096)
+++ trunk/Source/WebCore/inspector/front-end/BreakpointManager.js 2011-09-27 12:06:28 UTC (rev 96097)
@@ -95,7 +95,7 @@
return;
breakpoint._materialized = true;
- var rawLocation = breakpoint.uiSourceCode.rawSourceCode.uiLocationToRawLocation(breakpoint.lineNumber, 0);
+ var rawLocation = breakpoint.uiSourceCode.rawSourceCode.sourceMapping.uiLocationToRawLocation(breakpoint.lineNumber, 0);
this._setBreakpointInDebugger(breakpoint, rawLocation);
},
@@ -103,7 +103,7 @@
{
if (!breakpoint.uiSourceCode)
return;
- var uiLocation = breakpoint.uiSourceCode.rawSourceCode.rawLocationToUILocation(breakpoint._debuggerLocation);
+ var uiLocation = breakpoint.uiSourceCode.rawSourceCode.sourceMapping.rawLocationToUILocation(breakpoint._debuggerLocation);
if (uiLocation.lineNumber === breakpoint.lineNumber)
return;
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (96096 => 96097)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-09-27 11:20:34 UTC (rev 96096)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-09-27 12:06:28 UTC (rev 96097)
@@ -80,13 +80,13 @@
function updateAnchor()
{
- var uiLocation = rawSourceCode.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
+ var uiLocation = rawSourceCode.sourceMapping.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
anchor.textContent = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber);
anchor.setAttribute("preferred_panel", "scripts");
anchor.uiSourceCode = uiLocation.uiSourceCode;
anchor.lineNumber = uiLocation.lineNumber;
}
- if (rawSourceCode.uiSourceCode)
+ if (rawSourceCode.sourceMapping)
updateAnchor.call(this);
rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, updateAnchor, this);
return anchor;
@@ -116,7 +116,7 @@
resource = WebInspector.networkManager.inflightResourceForURL(script.sourceURL) || WebInspector.resourceForURL(script.sourceURL);
rawSourceCode = new WebInspector.RawSourceCode(rawSourceCodeId, script, resource, this._formatter, this._formatSource);
this._rawSourceCode[rawSourceCodeId] = rawSourceCode;
- if (rawSourceCode.uiSourceCode)
+ if (rawSourceCode.sourceMapping)
this._updateSourceMapping(rawSourceCode, null);
rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, this._sourceMappingUpdated, this);
},
@@ -130,8 +130,6 @@
_updateSourceMapping: function(rawSourceCode, oldUISourceCode)
{
- var uiSourceCode = rawSourceCode.uiSourceCode;
-
if (oldUISourceCode) {
var breakpoints = this._breakpointManager.breakpointsForUISourceCode(oldUISourceCode);
for (var lineNumber in breakpoints) {
@@ -141,9 +139,10 @@
}
}
- this._restoreBreakpoints(uiSourceCode);
- this._restoreConsoleMessages(uiSourceCode);
+ this._restoreBreakpoints(rawSourceCode);
+ this._restoreConsoleMessages(rawSourceCode);
+ var uiSourceCode = rawSourceCode.sourceMapping.uiSourceCode;
if (!oldUISourceCode)
this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.UISourceCodeAdded, uiSourceCode);
else {
@@ -152,19 +151,20 @@
}
},
- _restoreBreakpoints: function(uiSourceCode)
+ _restoreBreakpoints: function(rawSourceCode)
{
+ var uiSourceCode = rawSourceCode.sourceMapping.uiSourceCode;
this._breakpointManager.uiSourceCodeAdded(uiSourceCode);
var breakpoints = this._breakpointManager.breakpointsForUISourceCode(uiSourceCode);
for (var lineNumber in breakpoints)
this._breakpointAdded(breakpoints[lineNumber]);
},
- _restoreConsoleMessages: function(uiSourceCode)
+ _restoreConsoleMessages: function(rawSourceCode)
{
- var messages = uiSourceCode.rawSourceCode.messages;
+ var messages = rawSourceCode.messages;
for (var i = 0; i < messages.length; ++i)
- messages[i]._presentationMessage = this._createPresentationMessage(messages[i], uiSourceCode);
+ messages[i]._presentationMessage = this._createPresentationMessage(messages[i], rawSourceCode.sourceMapping);
},
canEditScriptSource: function(uiSourceCode)
@@ -254,18 +254,18 @@
return;
rawSourceCode.messages.push(message);
- if (rawSourceCode.uiSourceCode) {
- message._presentationMessage = this._createPresentationMessage(message, rawSourceCode.uiSourceCode);
+ if (rawSourceCode.sourceMapping) {
+ message._presentationMessage = this._createPresentationMessage(message, rawSourceCode.sourceMapping);
this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.ConsoleMessageAdded, message._presentationMessage);
}
},
- _createPresentationMessage: function(message, uiSourceCode)
+ _createPresentationMessage: function(message, sourceMapping)
{
// FIXME(62725): stack trace line/column numbers are one-based.
var lineNumber = message.stackTrace ? message.stackTrace[0].lineNumber - 1 : message.line - 1;
var columnNumber = message.stackTrace ? message.stackTrace[0].columnNumber - 1 : 0;
- var uiLocation = uiSourceCode.rawSourceCode.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
+ var uiLocation = sourceMapping.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
var presentationMessage = {};
presentationMessage.uiSourceCode = uiLocation.uiSourceCode;
presentationMessage.lineNumber = uiLocation.lineNumber;
@@ -282,7 +282,7 @@
continueToLine: function(uiSourceCode, lineNumber)
{
- var rawLocation = uiSourceCode.rawSourceCode.uiLocationToRawLocation(lineNumber, 0);
+ var rawLocation = uiSourceCode.rawSourceCode.sourceMapping.uiLocationToRawLocation(lineNumber, 0);
WebInspector.debuggerModel.continueToLocation(rawLocation);
},
@@ -449,8 +449,8 @@
get url()
{
- if (this._rawSourceCode && this._rawSourceCode.uiSourceCode)
- return this._rawSourceCode.uiSourceCode.url;
+ if (this._rawSourceCode && this._rawSourceCode.sourceMapping)
+ return this._rawSourceCode.sourceMapping.uiSourceCode.url;
},
get scopeChain()
@@ -500,8 +500,8 @@
return;
}
- if (this._rawSourceCode.uiSourceCode) {
- var uiLocation = this._rawSourceCode.rawLocationToUILocation(rawLocation);
+ if (this._rawSourceCode.sourceMapping) {
+ var uiLocation = this._rawSourceCode.sourceMapping.rawLocationToUILocation(rawLocation);
callback(uiLocation.uiSourceCode, uiLocation.lineNumber);
return;
}
@@ -509,7 +509,7 @@
function sourceMappingUpdated()
{
this._rawSourceCode.removeEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, sourceMappingUpdated, this);
- var uiLocation = this._rawSourceCode.rawLocationToUILocation(rawLocation);
+ var uiLocation = this._rawSourceCode.sourceMapping.rawLocationToUILocation(rawLocation);
callback(uiLocation.uiSourceCode, uiLocation.lineNumber);
}
this._rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, sourceMappingUpdated, this);
@@ -532,7 +532,7 @@
var rawSourceCode = this._presentationModel._rawSourceCodeForScript(resource.url)
if (!rawSourceCode)
return false;
- return this._presentationModel.canEditScriptSource(rawSourceCode.uiSourceCode);
+ return this._presentationModel.canEditScriptSource(rawSourceCode.sourceMapping.uiSourceCode);
},
setContent: function(resource, content, majorChange, userCallback)
@@ -546,7 +546,7 @@
return;
}
- resource.requestContent(this._setContentWithInitialContent.bind(this, rawSourceCode.uiSourceCode, content, userCallback));
+ resource.requestContent(this._setContentWithInitialContent.bind(this, rawSourceCode.sourceMapping.uiSourceCode, content, userCallback));
},
_setContentWithInitialContent: function(uiSourceCode, content, userCallback, oldContent)
Modified: trunk/Source/WebCore/inspector/front-end/SourceFile.js (96096 => 96097)
--- trunk/Source/WebCore/inspector/front-end/SourceFile.js 2011-09-27 11:20:34 UTC (rev 96096)
+++ trunk/Source/WebCore/inspector/front-end/SourceFile.js 2011-09-27 12:06:28 UTC (rev 96097)
@@ -65,10 +65,9 @@
this._hasNewScripts = true;
},
- get uiSourceCode()
+ get sourceMapping()
{
- // FIXME: clients should use sourceMapping directly.
- return this._sourceMapping && this._sourceMapping.uiSourceCode;
+ return this._sourceMapping;
},
setFormatted: function(formatted)
@@ -90,18 +89,6 @@
this._updateSourceMapping();
},
- rawLocationToUILocation: function(rawLocation)
- {
- // FIXME: clients should use sourceMapping directly.
- return this._sourceMapping.rawLocationToUILocation(rawLocation);
- },
-
- uiLocationToRawLocation: function(lineNumber, columnNumber)
- {
- // FIXME: clients should use sourceMapping directly.
- return this._sourceMapping.uiLocationToRawLocation(lineNumber, columnNumber);
- },
-
_scriptForRawLocation: function(lineNumber, columnNumber)
{
var closestScript = this._scripts[0];
