Changeset 117267 in webkit


Ignore:
Timestamp:
May 16, 2012 5:22:29 AM (12 years ago)
Author:
pfeldman@chromium.org
Message:

Web Inspector: get rid of UISourceCodeListChanged event.
​https://bugs.webkit.org/show_bug.cgi?id=86601

Reviewed by Vsevolod Vlasov.

Source/WebCore:

There was unnecessary conversion between this event and UISourceCodeAdded/Removed/Replaced.

  • inspector/front-end/CompilerScriptMapping.js:

(WebInspector.CompilerScriptMapping.prototype.reset):

  • inspector/front-end/DebuggerScriptMapping.js:

(WebInspector.DebuggerScriptMapping):
(WebInspector.DebuggerScriptMapping.prototype._handleUISourceCodeAdded):
(WebInspector.DebuggerScriptMapping.prototype._handleUISourceCodeReplaced):
(WebInspector.DebuggerScriptMapping.prototype._handleUISourceCodeRemoved):

  • inspector/front-end/NavigatorView.js:
  • inspector/front-end/ResourceScriptMapping.js:

(WebInspector.ResourceScriptMapping.prototype.addScript):
(WebInspector.ResourceScriptMapping.prototype._handleUISourceCodeChanged):
(WebInspector.ResourceScriptMapping.prototype._uiSourceCodeAdded):
(WebInspector.ResourceScriptMapping.prototype._uiSourceCodeReplaced):
(WebInspector.ResourceScriptMapping.prototype._uiSourceCodeRemoved):
(WebInspector.ResourceScriptMapping.prototype.reset):

  • inspector/front-end/ScriptMapping.js:
  • inspector/front-end/ScriptSnippetModel.js:

(WebInspector.ScriptSnippetModel.prototype._addScriptSnippet):
(WebInspector.ScriptSnippetModel.prototype._createUISourceCodeForScript):
(WebInspector.ScriptSnippetModel.prototype._reset):
(WebInspector.SnippetScriptMapping.prototype._fireUISourceCodeAdded):
(WebInspector.SnippetScriptMapping.prototype._fireUISourceCodeRemoved):

  • inspector/front-end/ScriptsNavigator.js:

(WebInspector.ScriptsNavigator.prototype.replaceUISourceCode):

  • inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._uiSourceCodeReplaced):

  • inspector/front-end/TabbedEditorContainer.js:

LayoutTests:

  • http/tests/inspector/compiler-script-mapping.html:
  • inspector/debugger/scripts-panel.html:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r117266 r117267  
     12012-05-16  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Web Inspector: get rid of UISourceCodeListChanged event.
     4        https://bugs.webkit.org/show_bug.cgi?id=86601
     5
     6        Reviewed by Vsevolod Vlasov.
     7
     8        * http/tests/inspector/compiler-script-mapping.html:
     9        * inspector/debugger/scripts-panel.html:
     10
    1112012-05-16  Yury Semikhatsky  <yurys@chromium.org>
    212

  • trunk/LayoutTests/http/tests/inspector/compiler-script-mapping.html

    r117235 r117267  
    194194            WebInspector.debuggerModel._reset();
    195195            var debuggerScriptMapping = new WebInspector.DebuggerScriptMapping();
    196             debuggerScriptMapping.addEventListener(WebInspector.DebuggerScriptMapping.Events.UISourceCodeAdded, uiSourceCodeAdded);
     196            debuggerScriptMapping.addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeAdded, uiSourceCodeAdded);
    197197
    198198            var script = InspectorTest.createScriptMock("compiled.js", 0, 0, true, "");

  • trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt

    r113563 r117267  
    2929Dumping ScriptsNavigator 'Scripts' tab:
    3030  foo.js
    31   source1.js
    32   source2.js
    33 Dumping ScriptsNavigator 'Content scripts' tab:
    34 Source requested for source2.js
    35 Source requested for source1.js
    36 Source requested for compiled.js
    37 Dumping ScriptsNavigator 'Scripts' tab:
    38   compiled.js
    39   foo.js
     31  source.js
    4032Dumping ScriptsNavigator 'Content scripts' tab:
    4133

  • trunk/LayoutTests/inspector/debugger/scripts-panel.html

    r117235 r117267  
    3030        {
    3131            uiSourceCodes.push(uiSourceCode);
    32             this.dispatchEventToListeners(WebInspector.DebuggerScriptMapping.Events.UISourceCodeAdded, uiSourceCode);
     32            this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeAdded, uiSourceCode);
    3333        }
    3434        model._reset = function(preservedItems)
    … …  
    3737            WebInspector.debuggerModel.dispatchEventToListeners(WebInspector.DebuggerModel.Events.GlobalObjectCleared);
    3838        }
    39         model._replaceUISourceCodes = function(oldUISourceCodeList, newUISourceCodeList)
     39        model._replaceUISourceCode = function(oldUISourceCode, uiSourceCode)
    4040        {
    41             for (var i = 0; i < oldUISourceCodeList.length; ++i)
    42               uiSourceCodes.remove(oldUISourceCodeList[i]);
    43             for (var i = 0; i < newUISourceCodeList.length; ++i)
    44               uiSourceCodes.push(newUISourceCodeList[i]);
    45             var data = { oldUISourceCodeList: oldUISourceCodeList, uiSourceCodeList: newUISourceCodeList };
    46             this.dispatchEventToListeners(WebInspector.DebuggerScriptMapping.Events.UISourceCodeReplaced, data);
     41            uiSourceCodes.remove(oldUISourceCode);
     42            uiSourceCodes.push(uiSourceCode);
     43            var data = { oldUISourceCode: oldUISourceCode, uiSourceCode: uiSourceCode };
     44            this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeReplaced, data);
    4745        }
    4846        return model;
    … …  
    110108        },
    111109
    112 
    113110        function testSourceReplaced(next)
    114111        {
    … …  
    125122
    126123            // Plug compiler source mapping.
    127             var source1SourceCode = createUISouceCode("source1.js");
    128             var source2SourceCode = createUISouceCode("source2.js");
    129             mapping._replaceUISourceCodes([compiledSourceCode], [source1SourceCode, source2SourceCode]);
     124            var sourceSourceCode = createUISouceCode("source.js");
     125            mapping._replaceUISourceCode(compiledSourceCode, sourceSourceCode);
    130126
    131127            InspectorTest.dumpScriptsNavigator(panel._navigator);
    132             InspectorTest.showScriptSourceOnScriptsPanel(panel, "source2.js", step2);
    133 
    134             function step2() {
    135                 InspectorTest.showScriptSourceOnScriptsPanel(panel, "source1.js", step3);
    136             }
    137 
    138             function step3() {
    139                 // Unplug compiler source mapping.
    140                 mapping._replaceUISourceCodes([source1SourceCode, source2SourceCode], [compiledSourceCode]);
    141                 InspectorTest.dumpScriptsNavigator(panel._navigator);
    142 
    143                 panel.detach();
    144                 next();
    145             }
     128            next();
    146129        }
    147130    ]);

  • trunk/Source/WebCore/ChangeLog

    r117263 r117267  
     12012-05-16  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Web Inspector: get rid of UISourceCodeListChanged event.
     4        https://bugs.webkit.org/show_bug.cgi?id=86601
     5
     6        Reviewed by Vsevolod Vlasov.
     7
     8        There was unnecessary conversion between this event and UISourceCodeAdded/Removed/Replaced.
     9
     10        * inspector/front-end/CompilerScriptMapping.js:
     11        (WebInspector.CompilerScriptMapping.prototype.reset):
     12        * inspector/front-end/DebuggerScriptMapping.js:
     13        (WebInspector.DebuggerScriptMapping):
     14        (WebInspector.DebuggerScriptMapping.prototype._handleUISourceCodeAdded):
     15        (WebInspector.DebuggerScriptMapping.prototype._handleUISourceCodeReplaced):
     16        (WebInspector.DebuggerScriptMapping.prototype._handleUISourceCodeRemoved):
     17        * inspector/front-end/NavigatorView.js:
     18        * inspector/front-end/ResourceScriptMapping.js:
     19        (WebInspector.ResourceScriptMapping.prototype.addScript):
     20        (WebInspector.ResourceScriptMapping.prototype._handleUISourceCodeChanged):
     21        (WebInspector.ResourceScriptMapping.prototype._uiSourceCodeAdded):
     22        (WebInspector.ResourceScriptMapping.prototype._uiSourceCodeReplaced):
     23        (WebInspector.ResourceScriptMapping.prototype._uiSourceCodeRemoved):
     24        (WebInspector.ResourceScriptMapping.prototype.reset):
     25        * inspector/front-end/ScriptMapping.js:
     26        * inspector/front-end/ScriptSnippetModel.js:
     27        (WebInspector.ScriptSnippetModel.prototype._addScriptSnippet):
     28        (WebInspector.ScriptSnippetModel.prototype._createUISourceCodeForScript):
     29        (WebInspector.ScriptSnippetModel.prototype._reset):
     30        (WebInspector.SnippetScriptMapping.prototype._fireUISourceCodeAdded):
     31        (WebInspector.SnippetScriptMapping.prototype._fireUISourceCodeRemoved):
     32        * inspector/front-end/ScriptsNavigator.js:
     33        (WebInspector.ScriptsNavigator.prototype.replaceUISourceCode):
     34        * inspector/front-end/ScriptsPanel.js:
     35        (WebInspector.ScriptsPanel.prototype._uiSourceCodeReplaced):
     36        * inspector/front-end/TabbedEditorContainer.js:
     37
    1382012-05-16  Keishi Hattori  <keishi@webkit.org>
    239

  • trunk/Source/WebCore/inspector/front-end/CompilerScriptMapping.js

    r116846 r117267  
    127127        this._sourceMapForScriptId[script.scriptId] = sourceMap;
    128128        this._scriptForSourceMap.put(sourceMap, script);
    129         var data = { removedItems: [], addedItems: uiSourceCodeList };
    130         this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeListChanged, data);
    131129        script.setSourceMapping(this);
     130
     131        for (var i = 0; i < uiSourceCodeList.length; ++i)
     132            this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeAdded, uiSourceCodeList[i]);
    132133    },
    133134
    … …  
    160161    reset: function()
    161162    {
    162         var data = { removedItems: this.uiSourceCodeList(), addedItems: [] };
    163         this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeListChanged, data);
     163        var uiSourceCodes = this.uiSourceCodeList();
     164        for (var i = 0; i < uiSourceCodes.length; ++i)
     165            this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeRemoved, uiSourceCodes[i]);
    164166
    165167        this._sourceMapByURL = {};

  • trunk/Source/WebCore/inspector/front-end/DebuggerScriptMapping.js

    r117235 r117267  
    4444    this._snippetMapping = WebInspector.scriptSnippetModel.scriptMapping;
    4545    this._mappings.push(this._snippetMapping);
    46  
    47     for (var i = 0; i < this._mappings.length; ++i)
    48         this._mappings[i].addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeListChanged, this._handleUISourceCodeListChanged, this);
     46    for (var i = 0; i < this._mappings.length; ++i) {
     47        this._mappings[i].addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeAdded, this._handleUISourceCodeAdded, this);
     48        this._mappings[i].addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeReplaced, this._handleUISourceCodeReplaced, this);
     49        this._mappings[i].addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeRemoved, this._handleUISourceCodeRemoved, this);
     50    }
    4951
    5052    WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);
    5153    WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this);
    5254    WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
    53 }
    54 
    55 WebInspector.DebuggerScriptMapping.Events = {
    56     UISourceCodeAdded: "source-file-added",
    57     UISourceCodeReplaced: "source-file-replaced",
    58     UISourceCodeRemoved: "source-file-removed"
    5955}
    6056
    … …  
    8783     * @param {WebInspector.Event} event
    8884     */
    89     _handleUISourceCodeListChanged: function(event)
     85    _handleUISourceCodeAdded: function(event)
    9086    {
    91         var removedItems = /** @type {Array.<WebInspector.UISourceCode>} */ event.data["removedItems"];
    92         var addedItems = /** @type {Array.<WebInspector.UISourceCode>} */ event.data["addedItems"];
     87        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeAdded, event.data);
     88    },
    9389
    94         if (!removedItems.length) {
    95             for (var i = 0; i < addedItems.length; ++i)
    96                 this.dispatchEventToListeners(WebInspector.DebuggerScriptMapping.Events.UISourceCodeAdded, addedItems[i]);
    97         } else if (!addedItems.length) {
    98             for (var i = 0; i < addedItems.length; ++i)
    99                 this.dispatchEventToListeners(WebInspector.DebuggerScriptMapping.Events.UISourceCodeRemoved, removedItems[i]);
    100         } else {
    101             var eventData = { uiSourceCodeList: addedItems, oldUISourceCodeList: removedItems };
    102             this.dispatchEventToListeners(WebInspector.DebuggerScriptMapping.Events.UISourceCodeReplaced, eventData);
    103         }
     90    /**
     91     * @param {WebInspector.Event} event
     92     */
     93    _handleUISourceCodeReplaced: function(event)
     94    {
     95        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeReplaced, event.data);
     96    },
     97
     98    /**
     99     * @param {WebInspector.Event} event
     100     */
     101    _handleUISourceCodeRemoved: function(event)
     102    {
     103        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeRemoved, event.data);
    104104    },
    105105

  • trunk/Source/WebCore/inspector/front-end/NavigatorView.js

    r114753 r117267  
    127127
    128128    /**
    129      * @param {Array.<WebInspector.UISourceCode>} oldUISourceCodeList
    130      * @param {Array.<WebInspector.UISourceCode>} uiSourceCodeList
    131      */
    132     replaceUISourceCodes: function(oldUISourceCodeList, uiSourceCodeList)
     129     * @param {WebInspector.UISourceCode} oldUISourceCode
     130     * @param {WebInspector.UISourceCode} uiSourceCode
     131     */
     132    replaceUISourceCode: function(oldUISourceCode, uiSourceCode)
    133133    {
    134134        var added = false;
    135135        var selected = false;
    136         for (var i = 0; i < oldUISourceCodeList.length; ++i) {
    137             var uiSourceCode = oldUISourceCodeList[i];
    138             if (!this._scriptTreeElementsByUISourceCode.get(uiSourceCode))
    139                 continue;
     136        if (this._scriptTreeElementsByUISourceCode.get(oldUISourceCode)) {
    140137            added = true;
    141138
    142             if (this._lastSelectedUISourceCode === uiSourceCode)
     139            if (this._lastSelectedUISourceCode === oldUISourceCode)
    143140                selected = true;
    144             this._removeUISourceCode(uiSourceCode);
    145         }
    146        
     141            this._removeUISourceCode(oldUISourceCode);
     142        }
     143
    147144        if (!added)
    148145            return;
    149            
    150         for (var i = 0; i < uiSourceCodeList.length; ++i)
    151             this.addUISourceCode(uiSourceCodeList[i]);
    152 
     146        this.addUISourceCode(uiSourceCode);
    153147        if (selected)
    154             this.revealUISourceCode(uiSourceCodeList[0]);
     148            this.revealUISourceCode(uiSourceCode);
    155149    },
    156150

  • trunk/Source/WebCore/inspector/front-end/ResourceScriptMapping.js

    r116775 r117267  
    120120
    121121        if (rawSourceCode.uiSourceCode())
    122             this._uiSourceCodeChanged(rawSourceCode, null, rawSourceCode.uiSourceCode());
     122            this._uiSourceCodeAdded(rawSourceCode, rawSourceCode.uiSourceCode());
    123123        rawSourceCode.addEventListener(WebInspector.RawSourceCode.Events.UISourceCodeChanged, this._handleUISourceCodeChanged, this);
    124124    },
    … …  
    132132        var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data.uiSourceCode;
    133133        var oldUISourceCode = /** @type {WebInspector.UISourceCode} */ event.data.oldUISourceCode;
    134         this._uiSourceCodeChanged(rawSourceCode, oldUISourceCode, uiSourceCode);
    135     },
    136 
    137     /**
    138      * @param {WebInspector.RawSourceCode} rawSourceCode
    139      * @param {WebInspector.UISourceCode} removedItem
    140      * @param {WebInspector.UISourceCode} addedItem
    141      */
    142     _uiSourceCodeChanged: function(rawSourceCode, removedItem, addedItem)
    143     {
    144         if (removedItem)
    145             this._rawSourceCodeForUISourceCode.remove(removedItem);
    146         if (addedItem)
    147             this._rawSourceCodeForUISourceCode.put(addedItem, rawSourceCode);
    148 
    149         var scriptIds = [];
    150         for (var i = 0; i < rawSourceCode._scripts.length; ++i) {
    151             scriptIds.push(rawSourceCode._scripts[i].scriptId);
     134        if (!oldUISourceCode)
     135            this._uiSourceCodeAdded(rawSourceCode, uiSourceCode);
     136        else
     137            this._uiSourceCodeReplaced(rawSourceCode, oldUISourceCode, uiSourceCode);
     138    },
     139
     140    /**
     141     * @param {WebInspector.RawSourceCode} rawSourceCode
     142     * @paran {WebInspector.UISourceCode} uiSourceCode
     143     */
     144    _uiSourceCodeAdded: function(rawSourceCode, uiSourceCode)
     145    {
     146        this._rawSourceCodeForUISourceCode.put(uiSourceCode, rawSourceCode);
     147
     148        for (var i = 0; i < rawSourceCode._scripts.length; ++i)
    152149            rawSourceCode._scripts[i].setSourceMapping(this);
    153         }
    154         var removedItems = removedItem ? [removedItem] : [];
    155         var addedItems = addedItem ? [addedItem] : [];
    156 
    157         var data = { removedItems: removedItems, addedItems: addedItems };
    158         this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeListChanged, data);
     150
     151        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeAdded, uiSourceCode);
     152    },
     153
     154    /**
     155     * @param {WebInspector.RawSourceCode} rawSourceCode
     156     * @param {WebInspector.UISourceCode} oldUISourceCode
     157     * @param {WebInspector.UISourceCode} uiSourceCode
     158     */
     159    _uiSourceCodeReplaced: function(rawSourceCode, oldUISourceCode, uiSourceCode)
     160    {
     161        this._rawSourceCodeForUISourceCode.remove(oldUISourceCode);
     162        this._rawSourceCodeForUISourceCode.put(uiSourceCode, rawSourceCode);
     163
     164        for (var i = 0; i < rawSourceCode._scripts.length; ++i)
     165            rawSourceCode._scripts[i].setSourceMapping(this);
     166
     167        var data = { oldUISourceCode: uiSourceCode, uiSourceCode: uiSourceCode };
     168        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeReplaced, data);
     169    },
     170
     171    /**
     172     * @param {WebInspector.RawSourceCode} rawSourceCode
     173     * @paran {WebInspector.UISourceCode} uiSourceCode
     174     */
     175    _uiSourceCodeRemoved: function(rawSourceCode, uiSourceCode)
     176    {
     177        this._rawSourceCodeForUISourceCode.remove(uiSourceCode);
     178        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeRemoved, uiSourceCode);
    159179    },
    160180
    … …  
    174194        for (var i = 0; i < this._rawSourceCodes.length; ++i) {
    175195            var rawSourceCode = this._rawSourceCodes[i];
    176             this._uiSourceCodeChanged(rawSourceCode, rawSourceCode.uiSourceCode(), null);
     196            this._uiSourceCodeRemoved(rawSourceCode, rawSourceCode.uiSourceCode());
    177197            rawSourceCode.removeAllListeners();
    178198        }

  • trunk/Source/WebCore/inspector/front-end/ScriptMapping.js

    r116843 r117267  
    9898
    9999WebInspector.ScriptMapping.Events = {
    100     UISourceCodeListChanged: "ui-source-code-list-changed"
     100    UISourceCodeAdded: "UISourceCodeAdded",
     101    UISourceCodeReplaced: "UISourceCodeReplaced",
     102    UISourceCodeRemoved: "UISourceCodeRemoved"
    101103}
    102104

  • trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js

    r117065 r117267  
    8282        this._uiSourceCodeForSnippet.put(snippet, uiSourceCode);
    8383        this._snippetForUISourceCode.put(uiSourceCode, snippet);
    84         this._snippetScriptMapping._uiSourceCodesAdded([uiSourceCode]);
     84        this._snippetScriptMapping._fireUISourceCodeAdded(uiSourceCode);
    8585        return uiSourceCode;
    8686    },
    … …  
    9696        this._uiSourceCodeForSnippet.remove(snippet);
    9797        this._snippetForUISourceCode.remove(uiSourceCode);
    98         this._snippetScriptMapping._uiSourceCodesRemoved([uiSourceCode]);
     98        this._snippetScriptMapping._fireUISourceCodeRemoved(uiSourceCode);
    9999    },
    100100
    … …  
    220220        this._uiSourceCodeForScriptId[script.scriptId] = uiSourceCode;
    221221        this._scriptForUISourceCode.put(uiSourceCode, script);
    222         this._snippetScriptMapping._uiSourceCodesAdded([uiSourceCode]);
     222        this._snippetScriptMapping._fireUISourceCodeAdded(uiSourceCode);
    223223        script.setSourceMapping(this._snippetScriptMapping);
    224224    },
    … …  
    285285        this._uiSourceCodeForScriptId = {};
    286286        this._scriptForUISourceCode = new Map();
    287         this._snippetScriptMapping._uiSourceCodesRemoved(removedUISourceCodes);
     287        for (var i = 0; i < removedUISourceCodes.length; ++i)
     288            this._snippetScriptMapping._fireUISourceCodeRemoved(removedUISourceCodes[i]);
    288289    }
    289290}
    … …  
    348349
    349350    /**
    350      * @param {Array.<WebInspector.UISourceCode>} uiSourceCodes
    351      */
    352     _uiSourceCodesAdded: function(uiSourceCodes)
    353     {
    354         var data = { removedItems: [], addedItems: uiSourceCodes };
    355         this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeListChanged, data);
    356     },
    357 
    358     /**
    359      * @param {Array.<WebInspector.UISourceCode>} uiSourceCodes
    360      */
    361     _uiSourceCodesRemoved: function(uiSourceCodes)
    362     {
    363         var data = { removedItems: uiSourceCodes, addedItems: [] };
    364         this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeListChanged, data);
     351     * @param {WebInspector.UISourceCode} uiSourceCode
     352     */
     353    _fireUISourceCodeAdded: function(uiSourceCode)
     354    {
     355        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeAdded, uiSourceCode);
     356    },
     357
     358    /**
     359     * @param {WebInspector.UISourceCode} uiSourceCode
     360     */
     361    _fireUISourceCodeRemoved: function(uiSourceCode)
     362    {
     363        this.dispatchEventToListeners(WebInspector.ScriptMapping.Events.UISourceCodeRemoved, uiSourceCode);
    365364    },
    366365

  • trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js

    r114753 r117267  
    125125
    126126    /**
    127      * @param {Array.<WebInspector.UISourceCode>} oldUISourceCodeList
    128      * @param {Array.<WebInspector.UISourceCode>} uiSourceCodeList
    129      */
    130     replaceUISourceCodes: function(oldUISourceCodeList, uiSourceCodeList)
    131     {
    132         this._scriptsView.replaceUISourceCodes(oldUISourceCodeList, uiSourceCodeList);
    133         this._contentScriptsView.replaceUISourceCodes(oldUISourceCodeList, uiSourceCodeList);
    134         this._snippetsView.replaceUISourceCodes(oldUISourceCodeList, uiSourceCodeList);
     127     * @param {WebInspector.UISourceCode} oldUISourceCode
     128     * @param {WebInspector.UISourceCode} uiSourceCode
     129     */
     130    replaceUISourceCode: function(oldUISourceCode, uiSourceCode)
     131    {
     132        this._scriptsView.replaceUISourceCode(oldUISourceCode, uiSourceCode);
     133        this._contentScriptsView.replaceUISourceCode(oldUISourceCode, uiSourceCode);
     134        this._snippetsView.replaceUISourceCode(oldUISourceCode, uiSourceCode);
    135135    },
    136136

  • trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

    r117235 r117267  
    170170    WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.BreakpointsActiveStateChanged, this._breakpointsActiveStateChanged, this);
    171171
    172     this._scriptMapping.addEventListener(WebInspector.DebuggerScriptMapping.Events.UISourceCodeAdded, this._handleUISourceCodeAdded, this);
    173     this._scriptMapping.addEventListener(WebInspector.DebuggerScriptMapping.Events.UISourceCodeReplaced, this._uiSourceCodeReplaced, this);
    174     this._scriptMapping.addEventListener(WebInspector.DebuggerScriptMapping.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
     172    this._scriptMapping.addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeAdded, this._handleUISourceCodeAdded, this);
     173    this._scriptMapping.addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeReplaced, this._uiSourceCodeReplaced, this);
     174    this._scriptMapping.addEventListener(WebInspector.ScriptMapping.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
    175175
    176176    var enableDebugger = !Capabilities.debuggerCausesRecompilation || WebInspector.settings.debuggerEnabled.get();
    … …  
    495495    _uiSourceCodeReplaced: function(event)
    496496    {
    497         var oldUISourceCodeList = /** @type {Array.<WebInspector.UISourceCode>} */ event.data.oldUISourceCodeList;
    498         var uiSourceCodeList = /** @type {Array.<WebInspector.UISourceCode>} */ event.data.uiSourceCodeList;
    499 
    500         this._navigator.replaceUISourceCodes(oldUISourceCodeList, uiSourceCodeList);
    501         this._editorContainer.replaceFiles(oldUISourceCodeList, uiSourceCodeList);
    502         for (var i = 0; i < oldUISourceCodeList.length; ++i)
    503             this._removeSourceFrame(oldUISourceCodeList[i]);
     497        var oldUISourceCode = /** @type {WebInspector.UISourceCode} */ event.data.oldUISourceCode;
     498        var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data.uiSourceCode;
     499
     500        this._navigator.replaceUISourceCode(oldUISourceCode, uiSourceCode);
     501        this._editorContainer.replaceFile(oldUISourceCode, uiSourceCode);
     502        this._removeSourceFrame(oldUISourceCode);
    504503    },
    505504

  • trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js

    r114740 r117267  
    267267    /**
    268268     * @param {WebInspector.UISourceCode} oldUISourceCode
    269      * @param {WebInspector.UISourceCode} newUISourceCode
    270      */
    271     _replaceFileTab: function(oldUISourceCode, newUISourceCode)
     269     * @param {WebInspector.UISourceCode} uiSourceCode
     270     */
     271    replaceFile: function(oldUISourceCode, uiSourceCode)
    272272    {
    273273        var tabId = this._tabIds.get(oldUISourceCode);
    … …  
    278278        delete this._files[this._tabIds.get(oldUISourceCode)]
    279279        this._tabIds.remove(oldUISourceCode);
    280         this._tabIds.put(newUISourceCode, tabId);
    281         this._files[tabId] = newUISourceCode;
    282 
    283         this._tabbedPane.changeTabTitle(tabId, this._titleForFile(newUISourceCode));
    284         this._tabbedPane.changeTabView(tabId, this._delegate.viewForFile(newUISourceCode));
    285         this._tabbedPane.changeTabTooltip(tabId, this._tooltipForFile(newUISourceCode));
    286     },
    287 
    288     /**
    289      * @param {Array.<WebInspector.UISourceCode>} oldUISourceCodeList
    290      * @param {Array.<WebInspector.UISourceCode>} uiSourceCodeList
    291      */
    292     replaceFiles: function(oldUISourceCodeList, uiSourceCodeList)
    293     {
    294         var mainFile;
    295         for (var i = 0; i < oldUISourceCodeList.length; ++i) {
    296             var tabId = this._tabIds.get(oldUISourceCodeList[i]);
    297             if (tabId && (!mainFile || this._tabbedPane.selectedTabId === tabId)) {
    298                 mainFile = oldUISourceCodeList[i];
    299                 break;
    300             }
    301         }
    302        
    303         if (!mainFile)
    304             return;
    305        
    306         this._replaceFileTab(mainFile, uiSourceCodeList[0]);
    307         for (var i = 0; i < oldUISourceCodeList.length; ++i)
    308             this._removeFileTab(oldUISourceCodeList[i]);
    309     },
    310    
     280        this._tabIds.put(uiSourceCode, tabId);
     281        this._files[tabId] = uiSourceCode;
     282
     283        this._tabbedPane.changeTabTitle(tabId, this._titleForFile(uiSourceCode));
     284        this._tabbedPane.changeTabView(tabId, this._delegate.viewForFile(uiSourceCode));
     285        this._tabbedPane.changeTabTooltip(tabId, this._tooltipForFile(uiSourceCode));
     286    },
     287
    311288    /**
    312289     * @param {WebInspector.UISourceCode} uiSourceCode
Note: See TracChangeset for help on using the changeset viewer.