Changeset 96097 in webkit


Ignore:
Timestamp:
Sep 27, 2011 5:06:28 AM (13 years ago)
Author:
podivilov@chromium.org
Message:

Web Inspector: migrate RawSourceCode clients to SourceMapping class.
https://bugs.webkit.org/show_bug.cgi?id=68524

Source/WebCore:

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):

LayoutTests:

Reviewed by Yury Semikhatsky.

  • inspector/debugger/breakpoint-manager.html:
  • inspector/debugger/raw-source-code.html:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r96096 r96097  
     12011-09-21  Pavel Podivilov  <podivilov@chromium.org>
     2
     3        Web Inspector: migrate RawSourceCode clients to SourceMapping class.
     4        https://bugs.webkit.org/show_bug.cgi?id=68524
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        * inspector/debugger/breakpoint-manager.html:
     9        * inspector/debugger/raw-source-code.html:
     10
    1112011-09-27  Vineet Chaudhary  <vineet.chaudhary@motorola.com>
    212
  • trunk/LayoutTests/inspector/debugger/breakpoint-manager.html

    r94167 r96097  
    5959    serializedBreakpoints.push(createBreakpoint("b.js", 3, "", true));
    6060
    61     var uiSourceCodeA = {
    62         id: "a.js",
    63         url: "a.js",
    64         rawSourceCode: {
    65             rawLocationToUILocation: function(rawLocation) { return rawLocation; },
    66             uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "a.js", lineNumber: lineNumber, columnNumber: columnNumber }; }
    67         }
    68     };
    69     var uiSourceCodeB = {
    70         id: "b.js",
    71         url: "b.js",
    72         rawSourceCode: {
    73             rawLocationToUILocation: function(rawLocation) { return rawLocation; },
    74             uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "b.js", lineNumber: lineNumber, columnNumber: columnNumber }; }
    75         }
    76     }
     61    function createUISourceCode(id, url, rawLocationToUILocation, uiLocationToRawLocation)
     62    {
     63        return {
     64            id: id,
     65            url: url,
     66            rawSourceCode: { sourceMapping : { rawLocationToUILocation: rawLocationToUILocation, uiLocationToRawLocation: uiLocationToRawLocation } }
     67        };
     68    }
     69
     70    var uiSourceCodeA = createUISourceCode("a.js", "a.js",
     71            function(rawLocation) { return rawLocation; },
     72            function(lineNumber, columnNumber) { return { scriptId: "a.js", lineNumber: lineNumber, columnNumber: columnNumber }; });
     73    var uiSourceCodeB = createUISourceCode("b.js", "b.js",
     74            function(rawLocation) { return rawLocation; },
     75            function(lineNumber, columnNumber) { return { scriptId: "b.js", lineNumber: lineNumber, columnNumber: columnNumber }; });
    7776
    7877    function createBreakpointManager(breakpoints)
     
    205204        {
    206205            var breakpointManager = createBreakpointManager([createBreakpoint("c.js", 4, "", true)]);
    207 
    208             var uiSourceCodeC = {
    209                 id: "c.js",
    210                 url: "c.js",
    211                 rawSourceCode: {
    212                     rawLocationToUILocation: function(rawLocation) { return rawLocation; },
    213                     uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: lineNumber, columnNumber: columnNumber }; }
    214                 }
    215             };
    216             var uiSourceCodeCFormatted = {
    217                 id: "deobfuscated:c.js",
    218                 url: "c.js",
    219                 rawSourceCode: {
    220                     rawLocationToUILocation: function(rawLocation) { return { lineNumber: rawLocation.lineNumber * 2, columnNumber: rawLocation.columnNumber * 2 }; },
    221                     uiLocationToRawLocation: function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: Math.floor(lineNumber / 2), columnNumber: Math.floor(columnNumber / 2) }; }
    222                 }
    223             }
     206            var uiSourceCodeC = createUISourceCode("c.js", "c.js",
     207                    function(rawLocation) { return rawLocation; },
     208                    function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: lineNumber, columnNumber: columnNumber }; });
     209            var uiSourceCodeCFormatted = createUISourceCode("deobfuscated:c.js", "c.js",
     210                    function(rawLocation) { return { lineNumber: rawLocation.lineNumber * 2, columnNumber: rawLocation.columnNumber * 2 }; },
     211                    function(lineNumber, columnNumber) { return { scriptId: "c.js", lineNumber: Math.floor(lineNumber / 2), columnNumber: Math.floor(columnNumber / 2) }; });
    224212
    225213            breakpointManager.uiSourceCodeAdded(uiSourceCodeC);
  • trunk/LayoutTests/inspector/debugger/raw-source-code.html

    r94762 r96097  
    106106            var rawSourceCode = createRawSourceCode(script, null);
    107107
    108             InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
    109             var uiSourceCode = rawSourceCode.uiSourceCode;
     108            var sourceMapping = rawSourceCode.sourceMapping;
     109            var uiSourceCode = sourceMapping.uiSourceCode;
    110110            InspectorTest.assertEquals("foo.js", uiSourceCode.url);
    111111            InspectorTest.assertEquals(true, uiSourceCode.isContentScript);
    112112            InspectorTest.assertEquals(rawSourceCode, uiSourceCode.rawSourceCode);
    113             checkUILocation(uiSourceCode, 0, 5, rawSourceCode.rawLocationToUILocation(createRawLocation(0, 5)));
    114             checkRawLocation(script, 0, 10, rawSourceCode.uiLocationToRawLocation(0, 10));
     113            checkUILocation(uiSourceCode, 0, 5, sourceMapping.rawLocationToUILocation(createRawLocation(0, 5)));
     114            checkRawLocation(script, 0, 10, sourceMapping.uiLocationToRawLocation(0, 10));
    115115            uiSourceCode.requestContent(didRequestContent);
    116116
     
    130130            var rawSourceCode = createRawSourceCode(script1, resource);
    131131
    132             InspectorTest.assertTrue(!rawSourceCode.uiSourceCode);
     132            InspectorTest.assertTrue(!rawSourceCode.sourceMapping);
    133133            waitForSourceMappingEvent(rawSourceCode, mappingReady);
    134134            resource.finish();
     
    137137            {
    138138                InspectorTest.assertTrue(!event.data.oldSourceCode);
    139                 var uiSourceCode = rawSourceCode.uiSourceCode;
     139                var uiSourceCode = rawSourceCode.sourceMapping.uiSourceCode;
    140140                InspectorTest.assertEquals("index.html", uiSourceCode.url);
    141141                InspectorTest.assertEquals(false, uiSourceCode.isContentScript);
     
    161161            var rawSourceCode = createRawSourceCode(script1, resource);
    162162
    163             InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
    164             var uiSourceCode = rawSourceCode.uiSourceCode;
     163            var sourceMapping = rawSourceCode.sourceMapping;
     164            var uiSourceCode = sourceMapping.uiSourceCode;
    165165            InspectorTest.assertEquals("index.html", uiSourceCode.url);
    166166            InspectorTest.assertEquals(false, uiSourceCode.isContentScript);
     
    174174                rawSourceCode.addScript(script2);
    175175                rawSourceCode.forceUpdateSourceMapping();
    176                 checkUILocation(uiSourceCode, 1, 20, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 20)));
    177                 checkRawLocation(script1, 1, 20, rawSourceCode.uiLocationToRawLocation(1, 20));
    178                 checkRawLocation(script2, 6, 2, rawSourceCode.uiLocationToRawLocation(6, 2));
     176                checkUILocation(uiSourceCode, 1, 20, sourceMapping.rawLocationToUILocation(createRawLocation(1, 20)));
     177                checkRawLocation(script1, 1, 20, sourceMapping.uiLocationToRawLocation(1, 20));
     178                checkRawLocation(script2, 6, 2, sourceMapping.uiLocationToRawLocation(6, 2));
    179179
    180180                next();
     
    188188            var rawSourceCode = createRawSourceCode(script, resource);
    189189
    190             InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
    191             rawSourceCode.uiSourceCode.requestContent(didRequestContent);
     190            var sourceMapping = rawSourceCode.sourceMapping;
     191            var uiSourceCode = sourceMapping.uiSourceCode;
     192            uiSourceCode.requestContent(didRequestContent);
    192193
    193194            function didRequestContent(mimeType, content)
     
    203204            function mappingReadyAfterEdit()
    204205            {
    205                 rawSourceCode.uiSourceCode.requestContent(didRequestContentAfterEdit);
     206                rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentAfterEdit);
    206207            }
    207208
     
    222223            var rawSourceCode = createRawSourceCode(script1, resource);
    223224
    224             InspectorTest.assertTrue(!rawSourceCode.uiSourceCode);
     225            InspectorTest.assertTrue(!rawSourceCode.sourceMapping);
    225226            waitForSourceMappingEvent(rawSourceCode, requestContent);
    226227            rawSourceCode.forceUpdateSourceMapping();
     
    228229            function requestContent()
    229230            {
    230                 rawSourceCode.uiSourceCode.requestContent(didRequestContentOneScript);
     231                rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentOneScript);
    231232            }
    232233
     
    244245            function requestContentTwoScripts()
    245246            {
    246                 rawSourceCode.uiSourceCode.requestContent(didRequestContentTwoScripts);
     247                rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentTwoScripts);
    247248            }
    248249
     
    259260            function requestContentResource()
    260261            {
    261                 rawSourceCode.uiSourceCode.requestContent(didRequestContentResource);
     262                rawSourceCode.sourceMapping.uiSourceCode.requestContent(didRequestContentResource);
    262263            }
    263264
     
    280281            var rawSourceCode = createRawSourceCode(script, resource, false);
    281282
    282             InspectorTest.assertTrue(!!rawSourceCode.uiSourceCode);
    283             var uiSourceCode = rawSourceCode.uiSourceCode;
    284             checkUILocation(uiSourceCode, 1, 2, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
    285             checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(1, 2));
     283            var sourceMapping = rawSourceCode.sourceMapping;
     284            var uiSourceCode = sourceMapping.uiSourceCode;
     285            checkUILocation(uiSourceCode, 1, 2, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
     286            checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(1, 2));
    286287            uiSourceCode.requestContent(didRequestContent);
    287288
     
    298299            function requestFormattedContent()
    299300            {
    300                 var uiSourceCode = rawSourceCode.uiSourceCode;
    301                 checkUILocation(uiSourceCode, 2, 4, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
    302                 checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(2, 4));
     301                var sourceMapping = rawSourceCode.sourceMapping;
     302                var uiSourceCode = sourceMapping.uiSourceCode;
     303                checkUILocation(uiSourceCode, 2, 4, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
     304                checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(2, 4));
    303305                uiSourceCode.requestContent(didRequestFormattedContent);
    304306            }
     
    315317            function requestNotFormattedContent()
    316318            {
    317                 var uiSourceCode = rawSourceCode.uiSourceCode;
    318                 checkUILocation(uiSourceCode, 1, 2, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
    319                 checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(1, 2));
     319                var sourceMapping = rawSourceCode.sourceMapping;
     320                var uiSourceCode = sourceMapping.uiSourceCode;
     321                checkUILocation(uiSourceCode, 1, 2, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
     322                checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(1, 2));
    320323                uiSourceCode.requestContent(didRequestNotFormattedContent);
    321324            }
     
    336339            var rawSourceCode = createRawSourceCode(script, resource, true);
    337340
    338             InspectorTest.assertTrue(!rawSourceCode.uiSourceCode);
     341            InspectorTest.assertTrue(!rawSourceCode.sourceMapping);
    339342            resource.finish();
    340343            waitForSourceMappingEvent(rawSourceCode, checkMapping);
     
    343346            function checkMapping()
    344347            {
    345                 var uiSourceCode = rawSourceCode.uiSourceCode;
    346                 checkUILocation(uiSourceCode, 2, 4, rawSourceCode.rawLocationToUILocation(createRawLocation(1, 2)));
    347                 checkRawLocation(script, 1, 2, rawSourceCode.uiLocationToRawLocation(2, 4));
     348                var sourceMapping = rawSourceCode.sourceMapping;
     349                var uiSourceCode = sourceMapping.uiSourceCode;
     350                checkUILocation(uiSourceCode, 2, 4, sourceMapping.rawLocationToUILocation(createRawLocation(1, 2)));
     351                checkRawLocation(script, 1, 2, sourceMapping.uiLocationToRawLocation(2, 4));
    348352                next();
    349353            }
  • trunk/Source/WebCore/ChangeLog

    r96096 r96097  
     12011-09-21  Pavel Podivilov  <podivilov@chromium.org>
     2
     3        Web Inspector: migrate RawSourceCode clients to SourceMapping class.
     4        https://bugs.webkit.org/show_bug.cgi?id=68524
     5
     6        Clients should use uiSourceCode(), rawLocationToUILocation(), uiLocationToRawLocation() methods of SourceMapping class.
     7        Initially, RawSourceCode may not have associated SourceMapping, so it is natural to extract this methods and associated state to a separate class.
     8
     9        Reviewed by Yury Semikhatsky.
     10
     11        * inspector/front-end/BreakpointManager.js:
     12        (WebInspector.BreakpointManager.prototype._materializeBreakpoint):
     13        (WebInspector.BreakpointManager.prototype._breakpointDebuggerLocationChanged):
     14        * inspector/front-end/DebuggerPresentationModel.js:
     15        (WebInspector.DebuggerPresentationModel.prototype.linkifyLocation.updateAnchor):
     16        (WebInspector.DebuggerPresentationModel.prototype.linkifyLocation):
     17        (WebInspector.DebuggerPresentationModel.prototype._addScript):
     18        (WebInspector.DebuggerPresentationModel.prototype._updateSourceMapping):
     19        (WebInspector.DebuggerPresentationModel.prototype._restoreBreakpoints):
     20        (WebInspector.DebuggerPresentationModel.prototype._restoreConsoleMessages):
     21        (WebInspector.DebuggerPresentationModel.prototype._consoleMessageAdded):
     22        (WebInspector.DebuggerPresentationModel.prototype._createPresentationMessage):
     23        (WebInspector.DebuggerPresentationModel.prototype.continueToLine):
     24        (WebInspector.PresentationCallFrame.prototype.get url):
     25        (WebInspector.PresentationCallFrame.prototype.sourceLine.sourceMappingUpdated):
     26        (WebInspector.PresentationCallFrame.prototype.sourceLine):
     27        (WebInspector.DebuggerPresentationModelResourceBinding.prototype.canSetContent):
     28        (WebInspector.DebuggerPresentationModelResourceBinding.prototype.setContent):
     29        * inspector/front-end/SourceFile.js:
     30        (WebInspector.RawSourceCode.prototype.get sourceMapping):
     31
    1322011-09-27  Vineet Chaudhary  <vineet.chaudhary@motorola.com>
    233
  • trunk/Source/WebCore/inspector/front-end/BreakpointManager.js

    r94762 r96097  
    9696
    9797        breakpoint._materialized = true;
    98         var rawLocation = breakpoint.uiSourceCode.rawSourceCode.uiLocationToRawLocation(breakpoint.lineNumber, 0);
     98        var rawLocation = breakpoint.uiSourceCode.rawSourceCode.sourceMapping.uiLocationToRawLocation(breakpoint.lineNumber, 0);
    9999        this._setBreakpointInDebugger(breakpoint, rawLocation);
    100100    },
     
    104104        if (!breakpoint.uiSourceCode)
    105105            return;
    106         var uiLocation = breakpoint.uiSourceCode.rawSourceCode.rawLocationToUILocation(breakpoint._debuggerLocation);
     106        var uiLocation = breakpoint.uiSourceCode.rawSourceCode.sourceMapping.rawLocationToUILocation(breakpoint._debuggerLocation);
    107107        if (uiLocation.lineNumber === breakpoint.lineNumber)
    108108            return;
  • trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

    r95538 r96097  
    8181        function updateAnchor()
    8282        {
    83             var uiLocation = rawSourceCode.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
     83            var uiLocation = rawSourceCode.sourceMapping.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
    8484            anchor.textContent = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber);
    8585            anchor.setAttribute("preferred_panel", "scripts");
     
    8787            anchor.lineNumber = uiLocation.lineNumber;
    8888        }
    89         if (rawSourceCode.uiSourceCode)
     89        if (rawSourceCode.sourceMapping)
    9090            updateAnchor.call(this);
    9191        rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, updateAnchor, this);
     
    117117        rawSourceCode = new WebInspector.RawSourceCode(rawSourceCodeId, script, resource, this._formatter, this._formatSource);
    118118        this._rawSourceCode[rawSourceCodeId] = rawSourceCode;
    119         if (rawSourceCode.uiSourceCode)
     119        if (rawSourceCode.sourceMapping)
    120120            this._updateSourceMapping(rawSourceCode, null);
    121121        rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, this._sourceMappingUpdated, this);
     
    131131    _updateSourceMapping: function(rawSourceCode, oldUISourceCode)
    132132    {
    133         var uiSourceCode = rawSourceCode.uiSourceCode;
    134 
    135133        if (oldUISourceCode) {
    136134            var breakpoints = this._breakpointManager.breakpointsForUISourceCode(oldUISourceCode);
     
    142140        }
    143141
    144         this._restoreBreakpoints(uiSourceCode);
    145         this._restoreConsoleMessages(uiSourceCode);
    146 
     142        this._restoreBreakpoints(rawSourceCode);
     143        this._restoreConsoleMessages(rawSourceCode);
     144
     145        var uiSourceCode = rawSourceCode.sourceMapping.uiSourceCode;
    147146        if (!oldUISourceCode)
    148147            this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.UISourceCodeAdded, uiSourceCode);
     
    153152    },
    154153
    155     _restoreBreakpoints: function(uiSourceCode)
    156     {
     154    _restoreBreakpoints: function(rawSourceCode)
     155    {
     156        var uiSourceCode = rawSourceCode.sourceMapping.uiSourceCode;
    157157        this._breakpointManager.uiSourceCodeAdded(uiSourceCode);
    158158        var breakpoints = this._breakpointManager.breakpointsForUISourceCode(uiSourceCode);
     
    161161    },
    162162
    163     _restoreConsoleMessages: function(uiSourceCode)
    164     {
    165         var messages = uiSourceCode.rawSourceCode.messages;
     163    _restoreConsoleMessages: function(rawSourceCode)
     164    {
     165        var messages = rawSourceCode.messages;
    166166        for (var i = 0; i < messages.length; ++i)
    167             messages[i]._presentationMessage = this._createPresentationMessage(messages[i], uiSourceCode);
     167            messages[i]._presentationMessage = this._createPresentationMessage(messages[i], rawSourceCode.sourceMapping);
    168168    },
    169169
     
    255255
    256256        rawSourceCode.messages.push(message);
    257         if (rawSourceCode.uiSourceCode) {
    258             message._presentationMessage = this._createPresentationMessage(message, rawSourceCode.uiSourceCode);
     257        if (rawSourceCode.sourceMapping) {
     258            message._presentationMessage = this._createPresentationMessage(message, rawSourceCode.sourceMapping);
    259259            this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.ConsoleMessageAdded, message._presentationMessage);
    260260        }
    261261    },
    262262
    263     _createPresentationMessage: function(message, uiSourceCode)
     263    _createPresentationMessage: function(message, sourceMapping)
    264264    {
    265265        // FIXME(62725): stack trace line/column numbers are one-based.
    266266        var lineNumber = message.stackTrace ? message.stackTrace[0].lineNumber - 1 : message.line - 1;
    267267        var columnNumber = message.stackTrace ? message.stackTrace[0].columnNumber - 1 : 0;
    268         var uiLocation = uiSourceCode.rawSourceCode.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
     268        var uiLocation = sourceMapping.rawLocationToUILocation({ lineNumber: lineNumber, columnNumber: columnNumber });
    269269        var presentationMessage = {};
    270270        presentationMessage.uiSourceCode = uiLocation.uiSourceCode;
     
    283283    continueToLine: function(uiSourceCode, lineNumber)
    284284    {
    285         var rawLocation = uiSourceCode.rawSourceCode.uiLocationToRawLocation(lineNumber, 0);
     285        var rawLocation = uiSourceCode.rawSourceCode.sourceMapping.uiLocationToRawLocation(lineNumber, 0);
    286286        WebInspector.debuggerModel.continueToLocation(rawLocation);
    287287    },
     
    450450    get url()
    451451    {
    452         if (this._rawSourceCode && this._rawSourceCode.uiSourceCode)
    453             return this._rawSourceCode.uiSourceCode.url;
     452        if (this._rawSourceCode && this._rawSourceCode.sourceMapping)
     453            return this._rawSourceCode.sourceMapping.uiSourceCode.url;
    454454    },
    455455
     
    501501        }
    502502
    503         if (this._rawSourceCode.uiSourceCode) {
    504             var uiLocation = this._rawSourceCode.rawLocationToUILocation(rawLocation);
     503        if (this._rawSourceCode.sourceMapping) {
     504            var uiLocation = this._rawSourceCode.sourceMapping.rawLocationToUILocation(rawLocation);
    505505            callback(uiLocation.uiSourceCode, uiLocation.lineNumber);
    506506            return;
     
    510510        {
    511511            this._rawSourceCode.removeEventListener(WebInspector.RawSourceCode.Events.SourceMappingUpdated, sourceMappingUpdated, this);
    512             var uiLocation = this._rawSourceCode.rawLocationToUILocation(rawLocation);
     512            var uiLocation = this._rawSourceCode.sourceMapping.rawLocationToUILocation(rawLocation);
    513513            callback(uiLocation.uiSourceCode, uiLocation.lineNumber);
    514514        }
     
    533533        if (!rawSourceCode)
    534534            return false;
    535         return this._presentationModel.canEditScriptSource(rawSourceCode.uiSourceCode);
     535        return this._presentationModel.canEditScriptSource(rawSourceCode.sourceMapping.uiSourceCode);
    536536    },
    537537
     
    547547        }
    548548
    549         resource.requestContent(this._setContentWithInitialContent.bind(this, rawSourceCode.uiSourceCode, content, userCallback));
     549        resource.requestContent(this._setContentWithInitialContent.bind(this, rawSourceCode.sourceMapping.uiSourceCode, content, userCallback));
    550550    },
    551551
  • trunk/Source/WebCore/inspector/front-end/SourceFile.js

    r95797 r96097  
    6666    },
    6767
    68     get uiSourceCode()
    69     {
    70         // FIXME: clients should use sourceMapping directly.
    71         return this._sourceMapping && this._sourceMapping.uiSourceCode;
     68    get sourceMapping()
     69    {
     70        return this._sourceMapping;
    7271    },
    7372
     
    8988        this._useTemporaryContent = false;
    9089        this._updateSourceMapping();
    91     },
    92 
    93     rawLocationToUILocation: function(rawLocation)
    94     {
    95         // FIXME: clients should use sourceMapping directly.
    96         return this._sourceMapping.rawLocationToUILocation(rawLocation);
    97     },
    98 
    99     uiLocationToRawLocation: function(lineNumber, columnNumber)
    100     {
    101         // FIXME: clients should use sourceMapping directly.
    102         return this._sourceMapping.uiLocationToRawLocation(lineNumber, columnNumber);
    10390    },
    10491
Note: See TracChangeset for help on using the changeset viewer.