Changeset 116846 in webkit


Ignore:
Timestamp:
May 12, 2012 3:02:53 AM (12 years ago)
Author:
pfeldman@chromium.org
Message:

Web Inspector: remove UISourceCode.id since it is no longer used.
https://bugs.webkit.org/show_bug.cgi?id=86286

Reviewed by Vsevolod Vlasov.

Source/WebCore:

We are now using breakpointStorageId property for breakpoint persistence.

  • inspector/front-end/BreakpointManager.js:

(WebInspector.BreakpointManager):
(WebInspector.BreakpointManager.prototype._debuggerReset):
(WebInspector.BreakpointManager.prototype._uiLocationAdded.get if):
(WebInspector.BreakpointManager.prototype._uiLocationAdded):
(WebInspector.BreakpointManager.prototype._uiLocationRemoved.get if):
(WebInspector.BreakpointManager.prototype._uiLocationRemoved):

  • inspector/front-end/CompilerScriptMapping.js:
  • inspector/front-end/JavaScriptSource.js:

(WebInspector.JavaScriptSource):

  • inspector/front-end/RawSourceCode.js:

(WebInspector.RawSourceCode):
(WebInspector.RawSourceCode.prototype.rawLocationToUILocation):
(WebInspector.RawSourceCode.prototype._createUISourceCode):
(WebInspector.RawSourceCode.prototype._finishedLoading):

  • inspector/front-end/SnippetsModel.js:

(WebInspector.SnippetsScriptMapping.prototype._snippetAdded):
(WebInspector.SnippetsScriptMapping.prototype._createUISourceCodeForScript):

  • inspector/front-end/UISourceCode.js:

(WebInspector.UISourceCode):

LayoutTests:

  • inspector/debugger/breakpoint-manager.html:
  • inspector/debugger/raw-source-code.html:
  • inspector/debugger/scripts-file-selector.html:
  • inspector/debugger/scripts-panel.html:
  • inspector/debugger/scripts-sorting.html:
  • inspector/debugger/ui-source-code-display-name.html:
  • inspector/debugger/ui-source-code.html:
Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r116845 r116846  
     12012-05-12  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Web Inspector: remove UISourceCode.id since it is no longer used.
     4        https://bugs.webkit.org/show_bug.cgi?id=86286
     5
     6        Reviewed by Vsevolod Vlasov.
     7
     8        * inspector/debugger/breakpoint-manager.html:
     9        * inspector/debugger/raw-source-code.html:
     10        * inspector/debugger/scripts-file-selector.html:
     11        * inspector/debugger/scripts-panel.html:
     12        * inspector/debugger/scripts-sorting.html:
     13        * inspector/debugger/ui-source-code-display-name.html:
     14        * inspector/debugger/ui-source-code.html:
     15
    1162012-05-12  Kent Tamura  <tkent@chromium.org>
    217
  • trunk/LayoutTests/inspector/debugger/breakpoint-manager-expected.txt

    r116397 r116846  
    55  Created breakpoints manager
    66  Dumping Storage
    7   Adding UISourceCode: a.js (url=a.js)
     7  Adding UISourceCode: a.js)
    88  Setting breakpoint at a.js:30 enabled:true condition:
    99    debuggerModel.setBreakpoint(a.js:30:)
     
    2020  Created breakpoints manager
    2121  Dumping Storage
    22   Adding UISourceCode: a.js (url=a.js)
     22  Adding UISourceCode: a.js)
    2323  Setting breakpoint at a.js:30 enabled:false condition:
    2424    breakpointAdded(a.js, 30, , false)
     
    4040  Created breakpoints manager
    4141  Dumping Storage
    42   Adding UISourceCode: a.js (url=a.js)
     42  Adding UISourceCode: a.js)
    4343  Setting breakpoint at a.js:30 enabled:true condition:condition
    4444    debuggerModel.setBreakpoint(a.js:30:condition)
     
    6767    a.js:20 enabled:false condition:
    6868    b.js:3 enabled:true condition:
    69   Adding UISourceCode: a.js (url=a.js)
     69  Adding UISourceCode: a.js)
    7070    debuggerModel.setBreakpoint(a.js:10:foo == bar)
    7171    breakpointAdded(a.js, 10, foo == bar, true)
     
    8888    a.js:20 enabled:false condition:
    8989    b.js:3 enabled:true condition:
    90   Adding UISourceCode: a.js (url=a.js)
    91     debuggerModel.setBreakpoint(a.js:10:foo == bar)
    92     breakpointAdded(a.js, 10, foo == bar, true)
    93     Location created: a.js:10
    94     breakpointAdded(a.js, 20, , false)
    95   Adding UISourceCode: a.js (url=a.js)
     90  Adding UISourceCode: a.js)
     91    debuggerModel.setBreakpoint(a.js:10:foo == bar)
     92    breakpointAdded(a.js, 10, foo == bar, true)
     93    Location created: a.js:10
     94    breakpointAdded(a.js, 20, , false)
     95  Adding UISourceCode: a.js)
    9696  Dumping Storage
    9797    a.js:10 enabled:true condition:foo == bar
     
    110110    a.js:20 enabled:false condition:
    111111    b.js:3 enabled:true condition:
    112   Adding UISourceCode: a.js (url=a.js)
     112  Adding UISourceCode: a.js)
    113113    debuggerModel.setBreakpoint(a.js:10:foo == bar)
    114114    breakpointAdded(a.js, 10, foo == bar, true)
     
    136136  Created breakpoints manager
    137137  Dumping Storage
    138   Adding UISourceCode: a.js (url=a.js)
     138  Adding UISourceCode: a.js)
    139139  Setting breakpoint at a.js:1015 enabled:true condition:
    140140    debuggerModel.setBreakpoint(a.js:1015:)
     
    151151  Created breakpoints manager
    152152  Dumping Storage
    153   Adding UISourceCode: a.js (url=a.js)
     153  Adding UISourceCode: a.js)
    154154  Setting breakpoint at a.js:1015 enabled:true condition:
    155155    debuggerModel.setBreakpoint(a.js:1015:)
     
    167167  Created breakpoints manager
    168168  Dumping Storage
    169   Adding UISourceCode: a.js (url=a.js)
     169  Adding UISourceCode: a.js)
    170170    debuggerModel.setBreakpoint(a.js:2500:)
    171171    breakpointAdded(a.js, 2500, , true)
     
    182182    a.js:20 enabled:false condition:
    183183    b.js:3 enabled:true condition:
    184   Adding UISourceCode: a.js (url=a.js)
     184  Adding UISourceCode: a.js)
    185185    debuggerModel.setBreakpoint(a.js:10:foo == bar)
    186186    breakpointAdded(a.js, 10, foo == bar, true)
     
    193193    Location disposed: a.js:10
    194194    breakpointRemoved(a.js, 20)
    195   Adding UISourceCode: b.js (url=b.js)
     195  Adding UISourceCode: b.js)
    196196    debuggerModel.setBreakpoint(b.js:3:)
    197197    breakpointAdded(b.js, 3, , true)
     
    203203    Location disposed: b.js:3
    204204  Resolving provisional breakpoint.
    205   Adding UISourceCode: a.js (url=a.js)
     205  Adding UISourceCode: a.js)
    206206    debuggerModel.removeBreakpoint(a.js:10)
    207207    debuggerModel.setBreakpoint(a.js:10:foo == bar)
     
    225225    a.js:10 enabled:true condition:foo == bar
    226226    a.js:20 enabled:true condition:
    227   Adding UISourceCode: a.js (url=a.js)
     227  Adding UISourceCode: a.js)
    228228    debuggerModel.setBreakpoint(a.js:10:foo == bar)
    229229    breakpointAdded(a.js, 10, foo == bar, true)
     
    259259  Dumping Storage
    260260    a.js:10 enabled:true condition:foo == bar
    261   Adding UISourceCode: a.js (url=a.js)
     261  Adding UISourceCode: a.js)
    262262    debuggerModel.setBreakpoint(a.js:10:foo == bar)
    263263    breakpointAdded(a.js, 10, foo == bar, true)
  • trunk/LayoutTests/inspector/debugger/breakpoint-manager.html

    r116775 r116846  
    77function test()
    88{
     9    var uiSourceCodes = {};
     10
    911    var defaultMapping = {
    1012        rawLocationToUILocation: function(rawLocation)
    1113        {
    12             var uiSourceCode = new WebInspector.UISourceCode(rawLocation.scriptId, rawLocation.scriptId, null, this);
    13             return new WebInspector.UILocation(uiSourceCode, rawLocation.lineNumber, 0);
     14            return new WebInspector.UILocation(uiSourceCodes[rawLocation.scriptId], rawLocation.lineNumber, 0);
    1415        },
    1516
    1617        uiLocationToRawLocation: function(uiSourceCode, lineNumber)
    1718        {
    18             return { scriptId: uiSourceCode.id, lineNumber: lineNumber, columnNumber: 0 };
     19            return { scriptId: uiSourceCode.url, lineNumber: lineNumber, columnNumber: 0 };
    1920        }
    2021    };
     
    2324        rawLocationToUILocation: function(rawLocation)
    2425        {
    25             var uiSourceCode = new WebInspector.UISourceCode(rawLocation.scriptId, rawLocation.scriptId, null, this);
    26             return new WebInspector.UILocation(uiSourceCode, rawLocation.lineNumber + 10, 0);
     26            return new WebInspector.UILocation(uiSourceCodes[rawLocation.scriptId], rawLocation.lineNumber + 10, 0);
    2727        },
    2828
    2929        uiLocationToRawLocation: function(uiSourceCode, lineNumber)
    3030        {
    31             return { scriptId: uiSourceCode.id, lineNumber: lineNumber - 10, columnNumber: 0 };
     31            return { scriptId: uiSourceCode.url, lineNumber: lineNumber - 10, columnNumber: 0 };
    3232        }
    3333    };
     
    115115        var breakpoint = event.data.breakpoint;
    116116        var uiLocation = event.data.uiLocation;
    117         InspectorTest.addResult("    breakpointAdded(" + [uiLocation.uiSourceCode.id, uiLocation.lineNumber, breakpoint.condition(), breakpoint.enabled()].join(", ") + ")");
     117        InspectorTest.addResult("    breakpointAdded(" + [uiLocation.uiSourceCode.url, uiLocation.lineNumber, breakpoint.condition(), breakpoint.enabled()].join(", ") + ")");
    118118    }
    119119
     
    121121    {
    122122        var uiLocation = event.data.uiLocation;
    123         InspectorTest.addResult("    breakpointRemoved(" + [uiLocation.uiSourceCode.id, uiLocation.lineNumber].join(", ") + ")");
     123        InspectorTest.addResult("    breakpointRemoved(" + [uiLocation.uiSourceCode.url, uiLocation.lineNumber].join(", ") + ")");
    124124    }
    125125
     
    133133    }, true);
    134134
    135     function addUISourceCode(breakpointManager, id, url)
    136     {
    137         breakpointManager._debuggerModel._addScript(id, url);
    138         InspectorTest.addResult("  Adding UISourceCode: " + id + " (url=" + (url || id) + ")");
    139         var uiSourceCode = new WebInspector.JavaScriptSource(id, url || id, null, defaultMapping);
     135    function addUISourceCode(breakpointManager, url)
     136    {
     137        breakpointManager._debuggerModel._addScript(url, url);
     138        InspectorTest.addResult("  Adding UISourceCode: " + url + ")");
     139        var uiSourceCode = new WebInspector.JavaScriptSource(url, null, defaultMapping);
     140        uiSourceCodes[url] = uiSourceCode;
    140141        breakpointManager.restoreBreakpoints(uiSourceCode);
    141142        return uiSourceCode;
     
    172173    function setBreakpoint(breakpointManager, uiSourceCode, lineNumber, condition, enabled)
    173174    {
    174         InspectorTest.addResult("  Setting breakpoint at " + uiSourceCode.id + ":" + lineNumber + " enabled:" + enabled + " condition:" + condition);
     175        InspectorTest.addResult("  Setting breakpoint at " + uiSourceCode.url + ":" + lineNumber + " enabled:" + enabled + " condition:" + condition);
    175176        return breakpointManager.setBreakpoint(uiSourceCode, lineNumber, condition, enabled);
    176177    }
     
    178179    function removeBreakpoint(breakpointManager, uiSourceCode, lineNumber)
    179180    {
    180         InspectorTest.addResult("  Removing breakpoint at " + uiSourceCode.id + ":" + lineNumber);
     181        InspectorTest.addResult("  Removing breakpoint at " + uiSourceCode.url + ":" + lineNumber);
    181182        breakpointManager.findBreakpoint(uiSourceCode, lineNumber).remove();
    182183    }
     
    195196        InspectorTest.addResult("  Resetting breakpoint manager");
    196197        breakpointManager.reset();
     198        uiSourceCodes = {};
    197199        next();
    198200    }
  • trunk/LayoutTests/inspector/debugger/raw-source-code.html

    r116775 r116846  
    9898
    9999            var uiSourceCode = rawSourceCode.uiSourceCode();
    100             InspectorTest.addResult("UISourceCode: " + rawSourceCode.uiSourceCode().id);
     100            InspectorTest.addResult("UISourceCode: " + rawSourceCode.uiSourceCode().url);
    101101            InspectorTest.addResult("UISourceCode is content script: " + uiSourceCode.isContentScript);
    102102            InspectorTest.checkUILocation(uiSourceCode, 0, 5, rawSourceCode.rawLocationToUILocation(createRawLocation(0, 5)));
  • trunk/LayoutTests/inspector/debugger/scripts-file-selector.html

    r113563 r116846  
    1414    function addUISourceCode(url, isContentScript)
    1515    {
    16         var uiSourceCode = new WebInspector.UISourceCode(0, url, null, null);
     16        var uiSourceCode = new WebInspector.UISourceCode(url, null, null);
    1717        uiSourceCode.isContentScript = isContentScript;
    1818        navigatorFileSelector.addUISourceCode(uiSourceCode);
  • trunk/LayoutTests/inspector/debugger/scripts-panel.html

    r116780 r116846  
    5050    function createUISouceCode(url)
    5151    {
    52         var uiSourceCode = new WebInspector.JavaScriptSource(0, url, null, null);
     52        var uiSourceCode = new WebInspector.JavaScriptSource(url, null, null);
    5353        uiSourceCode.requestContent = function(callback)
    5454        {
  • trunk/LayoutTests/inspector/debugger/scripts-sorting.html

    r113563 r116846  
    1212    var navigatorFileSelector = new WebInspector.ScriptsNavigator();
    1313
    14     var nextId = 1;
    1514    function addUISourceCode(url, isContentScript)
    1615    {
    17         var uiSourceCode = new WebInspector.UISourceCode(nextId++, url, null, null);
     16        var uiSourceCode = new WebInspector.UISourceCode(url, null, null);
    1817        uiSourceCode.isContentScript = isContentScript;
    1918        navigatorFileSelector.addUISourceCode(uiSourceCode);
  • trunk/LayoutTests/inspector/debugger/ui-source-code-display-name.html

    r114623 r116846  
    77    function dumpUISourceCodeDisplayName(url)
    88    {
    9         var uiSourceCode = new WebInspector.UISourceCode("id", url, null, null);
     9        var uiSourceCode = new WebInspector.UISourceCode(url, null, null);
    1010        InspectorTest.addResult("UISourceCode display name for url \"" + url + "\" is \"" + WebInspector.TabbedEditorContainer.prototype._titleForFile(uiSourceCode) + "\".");
    1111    }
  • trunk/LayoutTests/inspector/debugger/ui-source-code.html

    r114241 r116846  
    1818        function testUISourceCode(next)
    1919        {
    20             var uiSourceCode = new WebInspector.UISourceCode("id", "url", contentProvider);
     20            var uiSourceCode = new WebInspector.UISourceCode("url", contentProvider);
    2121            function didRequestContent(callNumber, content, contentEncoded, mimeType)
    2222            {
  • trunk/Source/WebCore/ChangeLog

    r116843 r116846  
     12012-05-12  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Web Inspector: remove UISourceCode.id since it is no longer used.
     4        https://bugs.webkit.org/show_bug.cgi?id=86286
     5
     6        Reviewed by Vsevolod Vlasov.
     7
     8        We are now using breakpointStorageId property for breakpoint persistence.
     9
     10        * inspector/front-end/BreakpointManager.js:
     11        (WebInspector.BreakpointManager):
     12        (WebInspector.BreakpointManager.prototype._debuggerReset):
     13        (WebInspector.BreakpointManager.prototype._uiLocationAdded.get if):
     14        (WebInspector.BreakpointManager.prototype._uiLocationAdded):
     15        (WebInspector.BreakpointManager.prototype._uiLocationRemoved.get if):
     16        (WebInspector.BreakpointManager.prototype._uiLocationRemoved):
     17        * inspector/front-end/CompilerScriptMapping.js:
     18        * inspector/front-end/JavaScriptSource.js:
     19        (WebInspector.JavaScriptSource):
     20        * inspector/front-end/RawSourceCode.js:
     21        (WebInspector.RawSourceCode):
     22        (WebInspector.RawSourceCode.prototype.rawLocationToUILocation):
     23        (WebInspector.RawSourceCode.prototype._createUISourceCode):
     24        (WebInspector.RawSourceCode.prototype._finishedLoading):
     25        * inspector/front-end/SnippetsModel.js:
     26        (WebInspector.SnippetsScriptMapping.prototype._snippetAdded):
     27        (WebInspector.SnippetsScriptMapping.prototype._createUISourceCodeForScript):
     28        * inspector/front-end/UISourceCode.js:
     29        (WebInspector.UISourceCode):
     30
    1312012-05-12  Pavel Feldman  <pfeldman@chromium.org>
    232
  • trunk/Source/WebCore/inspector/front-end/BreakpointManager.js

    r116789 r116846  
    4242    this._breakpoints = [];
    4343    this._breakpointForDebuggerId = {};
    44     this._breakpointsForUILocation = {};
     44    this._breakpointsForUISourceCode = new Map();
    4545    this._sourceFilesWithRestoredBreakpoints = {};
    4646
     
    115115    findBreakpoint: function(uiSourceCode, lineNumber)
    116116    {
    117         var breakpoints = this._breakpointsForUILocation[uiSourceCode.id + ":" + lineNumber];
    118         return breakpoints ? breakpoints[0] : null;
     117        var breakpoints = this._breakpointsForUISourceCode.get(uiSourceCode);
     118        var lineBreakpoints = breakpoints ? breakpoints[lineNumber] : null;
     119        return lineBreakpoints ? lineBreakpoints[0] : null;
    119120    },
    120121
     
    167168        }
    168169        this._breakpoints = [];
    169         this._breakpointsForUILocation = {};
     170        this._breakpointsForUISourceCode.clear();
    170171        this._sourceFilesWithRestoredBreakpoints = {};
    171172    },
     
    199200    _uiLocationAdded: function(breakpoint, uiLocation)
    200201    {
    201         var key = uiLocation.uiSourceCode.id + ":" + uiLocation.lineNumber;
    202         var breakpoints = this._breakpointsForUILocation[key];
     202        var breakpoints = this._breakpointsForUISourceCode.get(uiLocation.uiSourceCode);
    203203        if (!breakpoints) {
    204             breakpoints = [];
    205             this._breakpointsForUILocation[key] = breakpoints;
    206         }
    207         breakpoints.push(breakpoint);
     204            breakpoints = {};
     205            this._breakpointsForUISourceCode.put(uiLocation.uiSourceCode, breakpoints);
     206        }
     207
     208        var lineBreakpoints = breakpoints[uiLocation.lineNumber];
     209        if (!lineBreakpoints) {
     210            lineBreakpoints = [];
     211            breakpoints[uiLocation.lineNumber] = lineBreakpoints;
     212        }
     213
     214        lineBreakpoints.push(breakpoint);
    208215        this.dispatchEventToListeners(WebInspector.BreakpointManager.Events.BreakpointAdded, {breakpoint: breakpoint, uiLocation: uiLocation});
    209216    },
     
    215222    _uiLocationRemoved: function(breakpoint, uiLocation)
    216223    {
    217         var key = uiLocation.uiSourceCode.id + ":" + uiLocation.lineNumber;
    218         var breakpoints = this._breakpointsForUILocation[key];
     224      var breakpoints = this._breakpointsForUISourceCode.get(uiLocation.uiSourceCode);
    219225        if (!breakpoints)
    220226            return;
    221         breakpoints.remove(breakpoint);
    222         if (!breakpoints.length)
    223             delete this._breakpointsForUILocation[key];
     227
     228        var lineBreakpoints = breakpoints[uiLocation.lineNumber];
     229        if (!lineBreakpoints)
     230            return;
     231
     232        lineBreakpoints.remove(breakpoint);
     233        if (!lineBreakpoints.length)
     234            delete breakpoints[uiLocation.lineNumber];
    224235        this.dispatchEventToListeners(WebInspector.BreakpointManager.Events.BreakpointRemoved, {breakpoint: breakpoint, uiLocation: uiLocation});
    225236    }
  • trunk/Source/WebCore/inspector/front-end/CompilerScriptMapping.js

    r116775 r116846  
    117117            else
    118118                contentProvider = new WebInspector.CompilerSourceMappingContentProvider(sourceURL);
    119             var uiSourceCode = new WebInspector.JavaScriptSource(sourceURL, sourceURL, contentProvider, this);
     119            var uiSourceCode = new WebInspector.JavaScriptSource(sourceURL, contentProvider, this);
    120120            uiSourceCode.isContentScript = script.isContentScript;
    121121            uiSourceCode.isEditable = false;
  • trunk/Source/WebCore/inspector/front-end/JavaScriptSource.js

    r116789 r116846  
    3232 * @constructor
    3333 * @extends {WebInspector.UISourceCode}
    34  * @param {string} id
    3534 * @param {string} url
    3635 * @param {WebInspector.ContentProvider} contentProvider
    3736 * @param {WebInspector.SourceMapping} sourceMapping
    3837 */
    39 WebInspector.JavaScriptSource = function(id, url, contentProvider, sourceMapping)
     38WebInspector.JavaScriptSource = function(url, contentProvider, sourceMapping)
    4039{
    41     WebInspector.UISourceCode.call(this, id, url, contentProvider, sourceMapping);
     40    WebInspector.UISourceCode.call(this, url, contentProvider, sourceMapping);
    4241
    4342    this._formatterMapping = new WebInspector.IdentityFormatterSourceMapping();
  • trunk/Source/WebCore/inspector/front-end/RawSourceCode.js

    r116775 r116846  
    5555        this._pendingRequest.addEventListener(WebInspector.NetworkRequest.Events.FinishedLoading, this._finishedLoading, this);
    5656    else
    57         this._uiSourceCode = this._createUISourceCode(this.url);
     57        this._uiSourceCode = this._createUISourceCode();
    5858}
    5959
     
    7979        var uiSourceCode = this._uiSourceCode || this._temporaryUISourceCode;
    8080        if (!uiSourceCode) {
    81             this._temporaryUISourceCode = this._createUISourceCode("tmp-" + this.url);
     81            this._temporaryUISourceCode = this._createUISourceCode();
    8282            uiSourceCode = this._temporaryUISourceCode;
    8383            this.dispatchEventToListeners(WebInspector.RawSourceCode.Events.UISourceCodeChanged, { uiSourceCode: uiSourceCode });
     
    8787
    8888    /**
    89      * @param {string} id
    9089     * @return {WebInspector.UISourceCode}
    9190     */
    92     _createUISourceCode: function(id)
     91    _createUISourceCode: function()
    9392    {
    9493        var isStandaloneScript = this._scripts.length === 1 && !this._scripts[0].isInlineScript();
     
    102101            contentProvider = new WebInspector.ConcatenatedScriptsContentProvider(this._scripts);
    103102
    104         var uiSourceCode = new WebInspector.JavaScriptSource(id, this.url, contentProvider, this._sourceMapping);
     103        var uiSourceCode = new WebInspector.JavaScriptSource(this.url, contentProvider, this._sourceMapping);
    105104        uiSourceCode.isContentScript = this.isContentScript;
    106105        uiSourceCode.isEditable = isStandaloneScript;
     
    134133        delete this._pendingRequest;
    135134        var oldUISourceCode = this._uiSourceCode || this._temporaryUISourceCode;
    136         this._uiSourceCode = this._createUISourceCode(this.url);
     135        this._uiSourceCode = this._createUISourceCode();
    137136        this.dispatchEventToListeners(WebInspector.RawSourceCode.Events.UISourceCodeChanged, { uiSourceCode: this._uiSourceCode, oldUISourceCode: oldUISourceCode });
    138137    }
  • trunk/Source/WebCore/inspector/front-end/SnippetsModel.js

    r116775 r116846  
    392392    _snippetAdded: function(snippet)
    393393    {
    394         var uiSourceCodeId = ""; // FIXME: to be implemented.
    395394        var uiSourceCodeURL = ""; // FIXME: to be implemented.
    396         var uiSourceCode = new WebInspector.JavaScriptSource(uiSourceCodeId, uiSourceCodeURL, new WebInspector.SnippetContentProvider(snippet), this);
     395        var uiSourceCode = new WebInspector.JavaScriptSource(uiSourceCodeURL, new WebInspector.SnippetContentProvider(snippet), this);
    397396        uiSourceCode.isSnippet = true;
    398397        uiSourceCode.isEditable = true;
     
    417416    _createUISourceCodeForScript: function(script)
    418417    {
    419         var uiSourceCode = new WebInspector.JavaScriptSource(script.sourceURL, script.sourceURL, script, this);
     418        var uiSourceCode = new WebInspector.JavaScriptSource(script.sourceURL, script, this);
    420419        uiSourceCode.isSnippetEvaluation = true;
    421420        var oldUISourceCode = this._uiSourceCodeForScriptId[script.scriptId];
  • trunk/Source/WebCore/inspector/front-end/UISourceCode.js

    r116789 r116846  
    3333 * @constructor
    3434 * @extends {WebInspector.Object}
    35  * @param {string} id
    3635 * @param {string} url
    3736 * @param {WebInspector.ContentProvider} contentProvider
    3837 * @param {WebInspector.SourceMapping} sourceMapping
    3938 */
    40 WebInspector.UISourceCode = function(id, url, contentProvider, sourceMapping)
     39WebInspector.UISourceCode = function(url, contentProvider, sourceMapping)
    4140{
    42     this._id = id;
    4341    this._url = url;
    4442    this._parsedURL = new WebInspector.ParsedURL(url);
     
    6664
    6765WebInspector.UISourceCode.prototype = {
    68     /**
    69      * @return {string}
    70      */
    71     get id()
    72     {
    73         return this._id;
    74     },
    75 
    7666    /**
    7767     * @return {string}
Note: See TracChangeset for help on using the changeset viewer.