Changeset 55535 in webkit


Ignore:
Timestamp:
Mar 4, 2010 10:46:33 AM (14 years ago)
Author:
pfeldman@chromium.org
Message:

2010-03-04 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Remove sync access to resourceTrackingEnabled.

​https://bugs.webkit.org/show_bug.cgi?id=35693

  • inspector/InspectorBackend.cpp:
  • inspector/InspectorBackend.h:
  • inspector/InspectorBackend.idl:
  • inspector/InspectorController.cpp: (WebCore::InspectorController::populateScriptObjects):
  • inspector/front-end/AuditsPanel.js: (WebInspector.AuditsPanel.prototype._reloadResources): (WebInspector.AuditsPanel.prototype.show):
  • inspector/front-end/InspectorBackendStub.js: (.WebInspector.InspectorBackendStub): (.WebInspector.InspectorBackendStub.prototype.enableResourceTracking): (.WebInspector.InspectorBackendStub.prototype.disableResourceTracking): (.WebInspector.InspectorBackendStub.prototype.enableDebugger): (.WebInspector.InspectorBackendStub.prototype.disableDebugger): (.WebInspector.InspectorBackendStub.prototype.enableProfiler): (.WebInspector.InspectorBackendStub.prototype.disableProfiler):
  • inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel): (WebInspector.ResourcesPanel.prototype.get resourceTrackingEnabled): (WebInspector.ResourcesPanel.prototype.get visibleView): (WebInspector.ResourcesPanel.prototype.resourceTrackingWasEnabled): (WebInspector.ResourcesPanel.prototype.resourceTrackingWasDisabled): (WebInspector.ResourcesPanel.prototype.reset): (WebInspector.ResourcesPanel.prototype.showResource): (WebInspector.ResourcesPanel.prototype._enableResourceTracking): (WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r55532 r55535  
     12010-03-04  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Web Inspector: Remove sync access to resourceTrackingEnabled.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=35693
     8
     9        * inspector/InspectorBackend.cpp:
     10        * inspector/InspectorBackend.h:
     11        * inspector/InspectorBackend.idl:
     12        * inspector/InspectorController.cpp:
     13        (WebCore::InspectorController::populateScriptObjects):
     14        * inspector/front-end/AuditsPanel.js:
     15        (WebInspector.AuditsPanel.prototype._reloadResources):
     16        (WebInspector.AuditsPanel.prototype.show):
     17        * inspector/front-end/InspectorBackendStub.js:
     18        (.WebInspector.InspectorBackendStub):
     19        (.WebInspector.InspectorBackendStub.prototype.enableResourceTracking):
     20        (.WebInspector.InspectorBackendStub.prototype.disableResourceTracking):
     21        (.WebInspector.InspectorBackendStub.prototype.enableDebugger):
     22        (.WebInspector.InspectorBackendStub.prototype.disableDebugger):
     23        (.WebInspector.InspectorBackendStub.prototype.enableProfiler):
     24        (.WebInspector.InspectorBackendStub.prototype.disableProfiler):
     25        * inspector/front-end/ResourcesPanel.js:
     26        (WebInspector.ResourcesPanel):
     27        (WebInspector.ResourcesPanel.prototype.get resourceTrackingEnabled):
     28        (WebInspector.ResourcesPanel.prototype.get visibleView):
     29        (WebInspector.ResourcesPanel.prototype.resourceTrackingWasEnabled):
     30        (WebInspector.ResourcesPanel.prototype.resourceTrackingWasDisabled):
     31        (WebInspector.ResourcesPanel.prototype.reset):
     32        (WebInspector.ResourcesPanel.prototype.showResource):
     33        (WebInspector.ResourcesPanel.prototype._enableResourceTracking):
     34        (WebInspector.ResourcesPanel.prototype._toggleResourceTracking):
     35
    1362010-03-04  Antoine Quint  <ml@graougraou.com>
    237

  • trunk/WebCore/inspector/InspectorBackend.cpp

    r55464 r55535  
    105105}
    106106
    107 bool InspectorBackend::resourceTrackingEnabled() const
    108 {
    109     if (m_inspectorController)
    110         return m_inspectorController->resourceTrackingEnabled();
    111     return false;
    112 }
    113 
    114107void InspectorBackend::enableResourceTracking(bool always)
    115108{

  • trunk/WebCore/inspector/InspectorBackend.h

    r55464 r55535  
    6767    void enableResourceTracking(bool always);
    6868    void disableResourceTracking(bool always);
    69     bool resourceTrackingEnabled() const;
    7069    void getResourceContent(long callId, unsigned long identifier);
    7170    void reloadPage();

  • trunk/WebCore/inspector/InspectorBackend.idl

    r55464 r55535  
    4040        boolean searchingForNode();
    4141
    42         boolean resourceTrackingEnabled();
    4342        void enableResourceTracking(in boolean always);
    4443        void disableResourceTracking(in boolean always);

  • trunk/WebCore/inspector/InspectorController.cpp

    r55528 r55535  
    669669    m_frontend->populateFrontendSettings(setting(FrontendSettingsSettingName));
    670670
     671    if (m_resourceTrackingEnabled)
     672        m_frontend->resourceTrackingWasEnabled();
     673#if ENABLE(JAVASCRIPT_DEBUGGER)
     674    if (m_profilerEnabled)
     675        m_frontend->profilerWasEnabled();
     676#endif
     677
    671678    ResourcesMap::iterator resourcesEnd = m_resources.end();
    672679    for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
    … …  
    695702    for (WorkersMap::iterator it = m_workers.begin(); it != workersEnd; ++it)
    696703        m_frontend->didCreateWorker(*it->second);
    697 #endif
    698 #if ENABLE(JAVASCRIPT_DEBUGGER)
    699     if (m_profilerEnabled)
    700         m_frontend->profilerWasEnabled();
    701704#endif
    702705

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

    r54591 r55535  
    189189        this._resourceTrackingCallback = callback;
    190190
    191         if (!InspectorBackend.resourceTrackingEnabled()) {
     191        if (!WebInspector.panels.resources.resourceTrackingEnabled) {
    192192            InspectorBackend.enableResourceTracking(false);
    193193            this._updateLauncherViewControls(true);
    … …  
    239239
    240240        this.showView();
    241         this._updateLauncherViewControls(InspectorBackend.resourceTrackingEnabled());
     241        this._updateLauncherViewControls(WebInspector.panels.resources.resourceTrackingEnabled);
    242242    },
    243243

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

    r55347 r55535  
    3535    this._searchingForNode = false;
    3636    this._attachedWindowHeight = 0;
    37     this._debuggerEnabled = true;
    38     this._profilerEnabled = true;
    39     this._resourceTrackingEnabled = false;
    4037    this._timelineEnabled = false;
    4138}
    … …  
    127124    },
    128125
    129     debuggerEnabled: function()
    130     {
    131         return this._debuggerEnabled;
    132     },
    133 
    134126    enableResourceTracking: function()
    135127    {
    136         this._resourceTrackingEnabled = true;
    137128        WebInspector.resourceTrackingWasEnabled();
    138129    },
    … …  
    140131    disableResourceTracking: function()
    141132    {
    142         this._resourceTrackingEnabled = false;
    143133        WebInspector.resourceTrackingWasDisabled();
    144134    },
    145135
    146     resourceTrackingEnabled: function()
    147     {
    148         return this._resourceTrackingEnabled;
    149     },
    150 
    151136    reloadPage: function()
    152137    {
    … …  
    155140    enableDebugger: function()
    156141    {
    157         this._debuggerEnabled = true;
     142        WebInspector.debuggerWasEnabled();
    158143    },
    159144
    160145    disableDebugger: function()
    161146    {
    162         this._debuggerEnabled = false;
     147        WebInspector.debuggerWasDisabled();
    163148    },
    164149
    … …  
    198183    },
    199184
    200     profilerEnabled: function()
    201     {
    202         return true;
    203     },
    204 
    205185    enableProfiler: function()
    206186    {
    207         this._profilerEnabled = true;
     187        WebInspector.profilerWasEnabled();
    208188    },
    209189
    210190    disableProfiler: function()
    211191    {
    212         this._profilerEnabled = false;
     192        WebInspector.profilerWasDisabled();
    213193    },
    214194

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

    r55517 r55535  
    4848    this.filter(this.filterAllElement, false);
    4949    this.graphsTreeElement.children[0].select();
     50    this._resourceTrackingEnabled = false;
    5051}
    5152
    … …  
    125126
    126127        this.itemsTreeElement.expand();
     128    },
     129
     130    get resourceTrackingEnabled()
     131    {
     132        return this._resourceTrackingEnabled;
    127133    },
    128134
    … …  
    283289        if (this.visibleResource)
    284290            return this.visibleResource._resourcesView;
    285         return InspectorBackend.resourceTrackingEnabled() ? null : this.panelEnablerView;
     291        return this._resourceTrackingEnabled ? null : this.panelEnablerView;
    286292    },
    287293
    … …  
    312318    resourceTrackingWasEnabled: function()
    313319    {
     320        this._resourceTrackingEnabled = true;
    314321        this.reset();
    315322    },
    … …  
    317324    resourceTrackingWasDisabled: function()
    318325    {
     326        this._resourceTrackingEnabled = false;
    319327        this.reset();
    320328    },
    … …  
    348356        this.summaryBar.reset();
    349357
    350         if (InspectorBackend.resourceTrackingEnabled()) {
     358        if (this._resourceTrackingEnabled) {
    351359            this.enableToggleButton.title = WebInspector.UIString("Resource tracking enabled. Click to disable.");
    352360            this.enableToggleButton.toggled = true;
    … …  
    691699    _enableResourceTracking: function()
    692700    {
    693         if (InspectorBackend.resourceTrackingEnabled())
     701        if (this._resourceTrackingEnabled)
    694702            return;
    695703        this._toggleResourceTracking(this.panelEnablerView.alwaysEnabled);
    … …  
    698706    _toggleResourceTracking: function(optionalAlways)
    699707    {
    700         if (InspectorBackend.resourceTrackingEnabled()) {
     708        if (this._resourceTrackingEnabled) {
    701709            this.largerResourcesButton.visible = false;
    702710            this.sortingSelectElement.visible = false;

  • trunk/WebKit/chromium/ChangeLog

    r55512 r55535  
     12010-03-03  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Web Inspector: Remove sync access to resourceTrackingEnabled.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=35693
     8
     9        * src/js/DevTools.js:
     10
    1112010-03-04  Darin Fisher  <darin@chromium.org>
    212

  • trunk/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

    r54592 r55535  
    162162}
    163163
    164 void WebDevToolsAgentImpl::unhideResourcesPanelIfNecessary()
    165 {
    166     InspectorController* ic = m_webViewImpl->page()->inspectorController();
    167     ic->ensureResourceTrackingSettingsLoaded();
    168     String command = String::format("[\"setResourcesPanelEnabled\", %s]",
    169         ic->resourceTrackingEnabled() ? "true" : "false");
    170     m_toolsAgentDelegateStub->dispatchOnClient(command);
    171 }
    172 
    173164void WebDevToolsAgentImpl::attach()
    174165{
    … …  
    180171                              this));
    181172    resetInspectorFrontendProxy();
    182     unhideResourcesPanelIfNecessary();
     173
    183174    // Allow controller to send messages to the frontend.
    184175    InspectorController* ic = inspectorController();
    … …  
    229220        m_toolsAgentDelegateStub->frameNavigate(WebCore::KURL(url).string());
    230221        SetApuAgentEnabledInUtilityContext(m_utilityContext, m_apuAgentEnabled);
    231         unhideResourcesPanelIfNecessary();
    232222    }
    233223}

  • trunk/WebKit/chromium/src/WebDevToolsAgentImpl.h

    r54592 r55535  
    107107
    108108    void disposeUtilityContext();
    109     void unhideResourcesPanelIfNecessary();
    110109
    111110    void compileUtilityScripts();

  • trunk/WebKit/chromium/src/js/DevTools.js

    r55464 r55535  
    152152
    153153/**
    154  * Enables / disables resources panel in the ui.
    155  * @param {boolean} enabled New panel status.
    156  */
    157 WebInspector.setResourcesPanelEnabled = function(enabled)
    158 {
    159     InspectorBackend._resourceTrackingEnabled = enabled;
    160     WebInspector.panels.resources.reset();
    161 };
    162 
    163 
    164 /**
    165154 * Prints string  to the inspector console or shows alert if the console doesn't
    166155 * exist.
    … …  
    378367
    379368
    380 WebInspector.resourceTrackingWasEnabled = function()
    381 {
    382       InspectorBackend._resourceTrackingEnabled = true;
    383       this.panels.resources.resourceTrackingWasEnabled();
    384 };
    385 
    386 WebInspector.resourceTrackingWasDisabled = function()
    387 {
    388       InspectorBackend._resourceTrackingEnabled = false;
    389       this.panels.resources.resourceTrackingWasDisabled();
    390 };
    391 
    392369(function()
    393370{
Note: See TracChangeset for help on using the changeset viewer.