Changeset 127705 in webkit


Ignore:
Timestamp:
Sep 6, 2012 12:40:56 AM (12 years ago)
Author:
vsevik@chromium.org
Message:

Web Inspector: Fix inconsistencies in NetworkUISourceCodeProvider implementation.
​https://bugs.webkit.org/show_bug.cgi?id=95752

Reviewed by Alexander Pavlov.

Source/WebCore:

NetworkUISourceCodeProvider does not receive ResourceAdded event until resource is finished anymore.
StylesSourceMapping now listens for workspace event instead of being called directly by NetworkUISourceCodeProvider.
StylesSourceMapping is now created from inspector.js.
ProjectDidReset event introduced instead of setTimeout hacks in mappings.

  • inspector/front-end/NetworkUISourceCodeProvider.js:

(WebInspector.NetworkUISourceCodeProvider):
(WebInspector.NetworkUISourceCodeProvider.prototype._resourceAdded):
(WebInspector.NetworkUISourceCodeProvider.prototype._projectWillReset):
(WebInspector.NetworkUISourceCodeProvider.prototype._projectDidReset):

  • inspector/front-end/ResourceTreeModel.js:

(WebInspector.ResourceTreeModel):
(WebInspector.ResourceTreeModel.prototype._onRequestFinished):

  • inspector/front-end/ScriptSnippetModel.js:

(WebInspector.ScriptSnippetModel):
(WebInspector.ScriptSnippetModel.prototype._projectWillReset):
(WebInspector.ScriptSnippetModel.prototype._projectDidReset):

  • inspector/front-end/StylesSourceMapping.js:

(WebInspector.StylesSourceMapping):
(WebInspector.StylesSourceMapping.prototype._uiSourceCodeAddedToWorkspace):
(WebInspector.StylesSourceMapping.prototype._addUISourceCode):
(WebInspector.StylesSourceMapping.prototype._reset):

  • inspector/front-end/Workspace.js:

(WebInspector.WorkspaceController.prototype._mainFrameNavigated):
(WebInspector.Project.prototype.reset):

  • inspector/front-end/inspector.js:

LayoutTests:

  • http/tests/inspector/network/network-request-revision-content-expected.txt:
  • http/tests/inspector/network/network-request-revision-content.html:
  • inspector/console/console-uncaught-exception-expected.txt:
  • inspector/debugger/network-uisourcecode-provider-expected.txt:
  • inspector/debugger/network-uisourcecode-provider.html:
  • inspector/debugger/script-snippet-model.html:
  • inspector/debugger/scripts-panel.html:
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r127704 r127705  
     12012-09-04  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Web Inspector: Fix inconsistencies in NetworkUISourceCodeProvider implementation.
     4        https://bugs.webkit.org/show_bug.cgi?id=95752
     5
     6        Reviewed by Alexander Pavlov.
     7
     8        * http/tests/inspector/network/network-request-revision-content-expected.txt:
     9        * http/tests/inspector/network/network-request-revision-content.html:
     10        * inspector/console/console-uncaught-exception-expected.txt:
     11        * inspector/debugger/network-uisourcecode-provider-expected.txt:
     12        * inspector/debugger/network-uisourcecode-provider.html:
     13        * inspector/debugger/script-snippet-model.html:
     14        * inspector/debugger/scripts-panel.html:
     15
    1162012-09-06  Adam Barth  <abarth@webkit.org>
    217

  • trunk/LayoutTests/http/tests/inspector/network/network-request-revision-content-expected.txt

    r122436 r127705  
    22
    33Bug 63631
    4 http://127.0.0.1:8000/inspector/network/resource/style.css
     4http://127.0.0.1:8000/inspector/network/resources/style.css
    55
    66

  • trunk/LayoutTests/http/tests/inspector/network/network-request-revision-content.html

    r127454 r127705  
    88    css.rel = "stylesheet";
    99    css.type = "text/css";
    10     css.href = "resource/style.css";
     10    css.href = "resources/style.css";
    1111    document.head.appendChild(css);
    1212}
    … …  
    1414function test()
    1515{
    16     InspectorTest.addConsoleSniffer(step2, true);
    17     InspectorTest.addSniffer(WebInspector.NetworkUISourceCodeProvider.prototype, "_resourceAdded", true);
     16    WebInspector.workspace.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, step2);
    1817    InspectorTest.evaluateInPage("loadStylesheet()");
    1918

  • trunk/LayoutTests/inspector/console/console-uncaught-exception-expected.txt

    r110693 r127705  
    55
    66
    7 Error: Exception in inline script. uncaught-in-iframe.html:18
    8 Error: Exception in 'load' event listener. uncaught-in-iframe.html:11
     7Error: Exception in inline script. resources/uncaught-in-iframe.html:18
     8Error: Exception in 'load' event listener. resources/uncaught-in-iframe.html:11
    99Error: Exception in setTimeout callback. uncaught-in-iframe.html:6
    1010

  • trunk/LayoutTests/inspector/debugger/network-uisourcecode-provider-expected.txt

    r127454 r127705  
    22
    33
    4 Running: testDocumentResourceWithPendingRequest
    5 Creating request.
    6 Finishing request.
    7 UISourceCode: http://fake.url/2
    8 UISourceCode is editable: false
    9 UISourceCode is content script: false
    10 Mime type: text/html
    11 UISourceCode content: <document request content>
    12 
    134Running: testDocumentResource
    145Creating resource.
    15 UISourceCode: http://fake.url/3
     6UISourceCode: http://fake.url/1
    167UISourceCode is editable: false
    178UISourceCode is content script: false
    … …  
    1910UISourceCode content: <document resource content>
    2011
    21 Running: testScriptResourceWithPendingRequest
    22 Creating request.
    23 Finishing request.
    24 UISourceCode: http://fake.url/4
    25 UISourceCode is editable: true
    26 UISourceCode is content script: false
    27 Mime type: text/javascript
    28 UISourceCode content: <script request content>
    29 
    3012Running: testScriptResource
    3113Creating resource.
    32 UISourceCode: http://fake.url/5
     14UISourceCode: http://fake.url/2
    3315UISourceCode is editable: true
    3416UISourceCode is content script: false
    … …  
    3618UISourceCode content: <script resource content>
    3719
    38 Running: testStylesheetResourceWithPendingRequest
    39 Creating request.
    40 UISourceCode: http://fake.url/6
    41 Finishing request.
    42 Mime type: text/css
    43 UISourceCode content: <stylesheet request content>
    44 
    4520Running: testStylesheetResource
    4621Creating resource.
    47 UISourceCode: http://fake.url/7
     22UISourceCode: http://fake.url/3
    4823Mime type: text/css
    4924UISourceCode content: <stylesheet resource content>

  • trunk/LayoutTests/inspector/debugger/network-uisourcecode-provider.html

    r127454 r127705  
    88{
    99    var mockContentsMap = {};
    10     var lastResouceId = 1;
     10    var lastResourceId = 0;
    1111
    1212    NetworkAgent.getResponseBody = function(requestId, callback)
    … …  
    2020    }
    2121
    22     function createResourceMock(type, withPendingRequest, content)
     22    function createResourceMock(type, content)
    2323    {
    2424        var documentURL = "http://fake.url";
    25         var resourceId = ++lastResouceId + "";
     25        var resourceId = ++lastResourceId + "";
    2626        var url = documentURL + "/" + resourceId;
    2727        var frameId = "frame-id";
    … …  
    4040        }
    4141
    42         if (withPendingRequest) {
    43             var request = new WebInspector.NetworkRequest(resourceId, url, "http://fake.url", frameId, loaderId);
    44             request.type = type;
    45             request.mimeType = mimeType;
    46             mockContentsMap[resourceId] = content;
    47         }
    48         var resource = new WebInspector.Resource(request, url, documentURL, frameId, loaderId, type, mimeType);
     42        var resource = new WebInspector.Resource(null, url, documentURL, frameId, loaderId, type, mimeType);
    4943        mockContentsMap[url] = content;
    5044        WebInspector.resourceTreeModel.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, resource);
    … …  
    6862
    6963    InspectorTest.runTestSuite([
    70         function testDocumentResourceWithPendingRequest(next)
    71         {
    72             var networkUISourceCodeProvider = createNetworkUISourceCodeProvider();
    73 
    74             InspectorTest.addResult("Creating request.");
    75             var resource = createResourceMock(WebInspector.resourceTypes.Document, true, "<document request content>");
    76 
    77             InspectorTest.waitForWorkspaceUISourceCodeAddedEvent(uiSourceCodeAdded);
    78             InspectorTest.addResult("Finishing request.");
    79             finishResource(resource);
    80 
    81             function uiSourceCodeAdded(uiSourceCode)
    82             {
    83                 InspectorTest.dumpUISourceCode(uiSourceCode, next);
    84             }
    85         },
    86 
    8764        function testDocumentResource(next)
    8865        {
    … …  
    9067            InspectorTest.addResult("Creating resource.");
    9168            InspectorTest.waitForWorkspaceUISourceCodeAddedEvent(uiSourceCodeAdded);
    92             var resource = createResourceMock(WebInspector.resourceTypes.Document, false, "<document resource content>");
    93 
    94             function uiSourceCodeAdded(uiSourceCode)
    95             {
    96                 InspectorTest.dumpUISourceCode(uiSourceCode, next);
    97             }
    98         },
    99 
    100         function testScriptResourceWithPendingRequest(next)
    101         {
    102             var networkUISourceCodeProvider = createNetworkUISourceCodeProvider();
    103 
    104             InspectorTest.addResult("Creating request.");
    105             var resource = createResourceMock(WebInspector.resourceTypes.Script, true, "<script request content>");
    106 
    107             InspectorTest.waitForWorkspaceUISourceCodeAddedEvent(uiSourceCodeAdded);
    108             InspectorTest.addResult("Finishing request.");
    109             finishResource(resource);
     69            var resource = createResourceMock(WebInspector.resourceTypes.Document, "<document resource content>");
    11070
    11171            function uiSourceCodeAdded(uiSourceCode)
    … …  
    12080            InspectorTest.addResult("Creating resource.");
    12181            InspectorTest.waitForWorkspaceUISourceCodeAddedEvent(uiSourceCodeAdded);
    122             var resource = createResourceMock(WebInspector.resourceTypes.Script, false, "<script resource content>");
     82            var resource = createResourceMock(WebInspector.resourceTypes.Script, "<script resource content>");
    12383
    12484            function uiSourceCodeAdded(uiSourceCode)
    12585            {
    12686                InspectorTest.dumpUISourceCode(uiSourceCode, next);
    127             }
    128         },
    129 
    130         function testStylesheetResourceWithPendingRequest(next)
    131         {
    132             var endTestCallsLeft = 2;
    133             var networkUISourceCodeProvider = createNetworkUISourceCodeProvider();
    134             InspectorTest.waitForWorkspaceUISourceCodeAddedEvent(uiSourceCodeAdded);
    135             InspectorTest.addResult("Creating request.");
    136             var resource = createResourceMock(WebInspector.resourceTypes.Stylesheet, true, "<stylesheet request content>");
    137             InspectorTest.addResult("Finishing request.");
    138             finishResource(resource);
    139             endTest();
    140 
    141             function uiSourceCodeAdded(uiSourceCode)
    142             {
    143                 InspectorTest.dumpUISourceCode(uiSourceCode, endTest);
    144             }
    145 
    146             function endTest()
    147             {
    148                 if (--endTestCallsLeft)
    149                     return;
    150                 next();
    15187            }
    15288        },
    … …  
    15793            InspectorTest.addResult("Creating resource.");
    15894            InspectorTest.waitForWorkspaceUISourceCodeAddedEvent(uiSourceCodeAdded);
    159             var resource = createResourceMock(WebInspector.resourceTypes.Stylesheet, false, "<stylesheet resource content>");
     95            var resource = createResourceMock(WebInspector.resourceTypes.Stylesheet, "<stylesheet resource content>");
    16096
    16197            function uiSourceCodeAdded(uiSourceCode)

  • trunk/LayoutTests/inspector/debugger/script-snippet-model.html

    r126999 r127705  
    1616    WebInspector.experimentsSettings.snippetsSupport.isEnabled = function() { return true; };
    1717    var workspace = new WebInspector.Workspace();
     18    var workspaceController = new WebInspector.WorkspaceController(workspace);
    1819    WebInspector.scriptSnippetModel = new WebInspector.ScriptSnippetModel(workspace);
    1920
    … …  
    2829            workspace.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, uiSourceCodeAdded);
    2930            InspectorTest.addResult("Resetting snippet script mapping.");
    30             workspace.project().reset();
    31             InspectorTest.assertTrue(!workspace.uiSourceCodes().length, "Snippets script mapping should not have any uiSourceCodes after reset.");
     31            workspaceController._mainFrameNavigated();
    3232
    3333            function uiSourceCodeAdded(event)
    3434            {
     35                InspectorTest.assertEquals(1, workspace.uiSourceCodes().length, "Only one snippet uiSourceCode should be present after project navigation.");
    3536                var uiSourceCode = event.data;
    3637                if (uiSourceCode.url.indexOf(snippetName) === -1)

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

    r127454 r127705  
    6565        {
    6666            var workspace = new WebInspector.Workspace();
     67            var workspaceController = new WebInspector.WorkspaceController(workspace);
    6768            var panel = new WebInspector.ScriptsPanel(workspace);
    6869            panel.show();
    … …  
    7879            InspectorTest.dumpScriptsNavigator(panel._navigator);
    7980
    80             workspace.project().reset();
     81            workspaceController._mainFrameNavigated();
    8182            workspace.project().addUISourceCode(uiSourceCodeBar);
    8283            InspectorTest.dumpScriptsNavigator(panel._navigator);

  • trunk/Source/WebCore/ChangeLog

    r127703 r127705  
     12012-09-04  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Web Inspector: Fix inconsistencies in NetworkUISourceCodeProvider implementation.
     4        https://bugs.webkit.org/show_bug.cgi?id=95752
     5
     6        Reviewed by Alexander Pavlov.
     7
     8        NetworkUISourceCodeProvider does not receive ResourceAdded event until resource is finished anymore.
     9        StylesSourceMapping now listens for workspace event instead of being called directly by NetworkUISourceCodeProvider.
     10        StylesSourceMapping is now created from inspector.js.
     11        ProjectDidReset event introduced instead of setTimeout hacks in mappings.
     12
     13        * inspector/front-end/NetworkUISourceCodeProvider.js:
     14        (WebInspector.NetworkUISourceCodeProvider):
     15        (WebInspector.NetworkUISourceCodeProvider.prototype._resourceAdded):
     16        (WebInspector.NetworkUISourceCodeProvider.prototype._projectWillReset):
     17        (WebInspector.NetworkUISourceCodeProvider.prototype._projectDidReset):
     18        * inspector/front-end/ResourceTreeModel.js:
     19        (WebInspector.ResourceTreeModel):
     20        (WebInspector.ResourceTreeModel.prototype._onRequestFinished):
     21        * inspector/front-end/ScriptSnippetModel.js:
     22        (WebInspector.ScriptSnippetModel):
     23        (WebInspector.ScriptSnippetModel.prototype._projectWillReset):
     24        (WebInspector.ScriptSnippetModel.prototype._projectDidReset):
     25        * inspector/front-end/StylesSourceMapping.js:
     26        (WebInspector.StylesSourceMapping):
     27        (WebInspector.StylesSourceMapping.prototype._uiSourceCodeAddedToWorkspace):
     28        (WebInspector.StylesSourceMapping.prototype._addUISourceCode):
     29        (WebInspector.StylesSourceMapping.prototype._reset):
     30        * inspector/front-end/Workspace.js:
     31        (WebInspector.WorkspaceController.prototype._mainFrameNavigated):
     32        (WebInspector.Project.prototype.reset):
     33        * inspector/front-end/inspector.js:
     34
    1352012-09-06  Sheriff Bot  <webkit.review.bot@gmail.com>
    236

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

    r127454 r127705  
    3737    this._workspace = workspace;
    3838    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
    39     this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._reset, this);
    40     this._stylesSourceMapping = new WebInspector.StylesSourceMapping();
     39    this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._projectWillReset, this);
     40    this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectDidReset, this._projectDidReset, this);
    4141
    4242    this._uiSourceCodeForResource = {};
    … …  
    6060
    6161    /**
    62      * @param {WebInspector.Resource} resource
    63      */
    64     _styleResourceAdded: function(resource)
    65     {
    66         var uiSourceCode = new WebInspector.StyleSource(resource);
    67         this._stylesSourceMapping.addUISourceCode(uiSourceCode);
    68         this._addUISourceCode(uiSourceCode);
    69     },
    70 
    71     /**
    72      * @param {WebInspector.Resource} resource
    73      */
    74     _scriptResourceAdded: function(resource)
    75     {
    76         if (resource.request && !resource.request.finished) {
    77             resource.request.addEventListener(WebInspector.NetworkRequest.Events.FinishedLoading, resourceFinished, this);
    78             return;
    79         }
    80         this._addJavaScriptSource(resource);
    81        
    82         function resourceFinished()
    83         {
    84             resource.request.removeEventListener(WebInspector.NetworkRequest.Events.FinishedLoading, resourceFinished, this);
    85             this._addJavaScriptSource(resource);
    86         }
    87     },
    88 
    89     /**
    90      * @param {WebInspector.Resource} resource
    91      */
    92     _addJavaScriptSource: function(resource)
    93     {
    94         if (this._uiSourceCodeForResource[resource.url])
    95             return;
    96         var isDocument = resource.type === WebInspector.resourceTypes.Document;
    97         var uiSourceCode = new WebInspector.JavaScriptSource(resource.url, resource, resource, !isDocument);
    98         this._uiSourceCodeForResource[resource.url] = uiSourceCode;
    99         this._addUISourceCode(uiSourceCode);
    100     },
    101 
    102     /**
    103      * @param {WebInspector.UISourceCode} uiSourceCode
    104      */
    105     _addUISourceCode: function(uiSourceCode)
    106     {
    107         this._workspace.project().addUISourceCode(uiSourceCode);
    108     },
    109 
    110     /**
    11162     * @param {WebInspector.Event} event
    11263     */
    … …  
    11465    {
    11566        var resource = /** @type {WebInspector.Resource} */ event.data;
     67        if (this._uiSourceCodeForResource[resource.url])
     68            return;
     69        var uiSourceCode;
    11670        switch (resource.type) {
    11771        case WebInspector.resourceTypes.Stylesheet:
    118             this._styleResourceAdded(resource);
     72            uiSourceCode = new WebInspector.StyleSource(resource);
    11973            break;
    12074        case WebInspector.resourceTypes.Document:
     75            uiSourceCode = new WebInspector.JavaScriptSource(resource.url, resource, resource, false);
     76            break;
    12177        case WebInspector.resourceTypes.Script:
    122             this._scriptResourceAdded(resource);
     78            uiSourceCode = new WebInspector.JavaScriptSource(resource.url, resource, resource, true);
    12379            break;
     80        }
     81        if (uiSourceCode) {
     82            this._uiSourceCodeForResource[resource.url] = uiSourceCode;
     83            this._workspace.project().addUISourceCode(uiSourceCode);
    12484        }
    12585    },
    12686
    127     _reset: function()
     87    _projectWillReset: function()
    12888    {
    12989        this._uiSourceCodeForResource = {};
    130         this._stylesSourceMapping.reset();
    131         // FIXME: We should not populate until the ProjectWillReset event was handled by all listeners. Introduce ProjectDidReset event for that matter.
    132         setTimeout(this._populate.bind(this), 0);
     90    },
     91
     92    _projectDidReset: function()
     93    {
     94        this._populate();
    13395    }
    13496}

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

    r126584 r127705  
    3636WebInspector.ResourceTreeModel = function(networkManager)
    3737{
    38     networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestUpdated, this._onRequestUpdated, this);
    39     networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestFinished, this._onRequestUpdated, this);
     38    networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestFinished, this._onRequestFinished, this);
    4039    networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestUpdateDropped, this._onRequestUpdateDropped, this);
    4140
    … …  
    173172     * @param {WebInspector.Event} event
    174173     */
    175     _onRequestUpdated: function(event)
     174    _onRequestFinished: function(event)
    176175    {
    177176        if (!this._cachedResourcesProcessed)

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

    r127454 r127705  
    4444    this._lastSnippetEvaluationIndexSetting = WebInspector.settings.createSetting("lastSnippetEvaluationIndex", 0);
    4545    this._snippetScriptMapping = new WebInspector.SnippetScriptMapping(this);
    46     this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._reset, this);
     46    this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._projectWillReset, this);
     47    this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectDidReset, this._projectDidReset, this);
    4748    this._loadSnippets();
    4849}
    … …  
    353354    },
    354355
    355     _reset: function()
     356    _projectWillReset: function()
    356357    {
    357358        var removedUISourceCodes = this._releasedUISourceCodes();
    … …  
    359360        this._scriptForUISourceCode = new Map();
    360361        this._snippetJavaScriptSourceForSnippetId = {};
    361         setTimeout(this._loadSnippets.bind(this), 0);
     362    },
     363
     364    _projectDidReset: function()
     365    {
     366        this._loadSnippets();
    362367    }
    363368}

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

    r127002 r127705  
    3232 * @constructor
    3333 * @implements {WebInspector.SourceMapping}
    34 */
    35 WebInspector.StylesSourceMapping = function()
     34 * @param {WebInspector.Workspace} workspace
     35 */
     36WebInspector.StylesSourceMapping = function(workspace)
    3637{
     38    this._workspace = workspace;
     39    this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._reset, this);
     40    this._workspace.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
     41
    3742    this._uiSourceCodeForURL = {};
    3843}
    3944
    4045WebInspector.StylesSourceMapping.prototype = {
    41     /**
    42      * @param {WebInspector.UISourceCode} uiSourceCode
    43      */
    44     addUISourceCode: function(uiSourceCode)
    45     {
    46         this._uiSourceCodeForURL[uiSourceCode.url] = uiSourceCode;
    47         WebInspector.cssModel.setSourceMapping(uiSourceCode.url, this);
    48     },
    49 
    5046    /**
    5147     * @param {WebInspector.RawLocation} rawLocation
    … …  
    7066    },
    7167
    72     reset: function()
     68    _uiSourceCodeAddedToWorkspace: function(event)
     69    {
     70        var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
     71        if (!uiSourceCode.url || this._uiSourceCodeForURL[uiSourceCode.url])
     72            return;
     73        if (uiSourceCode.contentType() !== WebInspector.resourceTypes.StyleSheet)
     74            return;
     75           
     76        this._addUISourceCode(uiSourceCode);
     77    },
     78
     79    /**
     80     * @param {WebInspector.UISourceCode} uiSourceCode
     81     */
     82    _addUISourceCode: function(uiSourceCode)
     83    {
     84        this._uiSourceCodeForURL[uiSourceCode.url] = uiSourceCode;
     85        uiSourceCode.setSourceMapping(this);
     86        WebInspector.cssModel.setSourceMapping(uiSourceCode.url, this);
     87    },
     88
     89    _reset: function()
    7390    {
    7491        this._uiSourceCodeForURL = {};

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

    r127454 r127705  
    4242    {
    4343        WebInspector.Revision.filterOutStaleRevisions();
     44        this._workspace.dispatchEventToListeners(WebInspector.Workspace.Events.ProjectWillReset, this._workspace.project());
    4445        this._workspace.project().reset();
     46        this._workspace.dispatchEventToListeners(WebInspector.Workspace.Events.ProjectDidReset, this._workspace.project());
    4547    }
    4648}
    … …  
    6365    reset: function()
    6466    {
    65         this._workspace.dispatchEventToListeners(WebInspector.Workspace.Events.ProjectWillReset, this);
    6667        this._uiSourceCodes = [];
    6768    },
    … …  
    132133WebInspector.Workspace.Events = {
    133134    UISourceCodeContentCommitted: "UISourceCodeContentCommitted",
    134     ProjectWillReset: "ProjectWillReset"
     135    ProjectWillReset: "ProjectWillReset",
     136    ProjectDidReset: "ProjectDidReset"
    135137}
    136138

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

    r127454 r127705  
    525525    new WebInspector.DebuggerScriptMapping(this.workspace);
    526526    new WebInspector.NetworkUISourceCodeProvider(this.workspace);
     527    new WebInspector.StylesSourceMapping(this.workspace);
    527528    if (WebInspector.experimentsSettings.sass.isEnabled())
    528529        new WebInspector.SASSSourceMapping(this.workspace);
Note: See TracChangeset for help on using the changeset viewer.