Changeset 55535 in webkit
- Timestamp:
- Mar 4, 2010 10:46:33 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r55532 r55535 1 2010-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 1 36 2010-03-04 Antoine Quint <ml@graougraou.com> 2 37 -
trunk/WebCore/inspector/InspectorBackend.cpp
r55464 r55535 105 105 } 106 106 107 bool InspectorBackend::resourceTrackingEnabled() const108 {109 if (m_inspectorController)110 return m_inspectorController->resourceTrackingEnabled();111 return false;112 }113 114 107 void InspectorBackend::enableResourceTracking(bool always) 115 108 { -
trunk/WebCore/inspector/InspectorBackend.h
r55464 r55535 67 67 void enableResourceTracking(bool always); 68 68 void disableResourceTracking(bool always); 69 bool resourceTrackingEnabled() const;70 69 void getResourceContent(long callId, unsigned long identifier); 71 70 void reloadPage(); -
trunk/WebCore/inspector/InspectorBackend.idl
r55464 r55535 40 40 boolean searchingForNode(); 41 41 42 boolean resourceTrackingEnabled();43 42 void enableResourceTracking(in boolean always); 44 43 void disableResourceTracking(in boolean always); -
trunk/WebCore/inspector/InspectorController.cpp
r55528 r55535 669 669 m_frontend->populateFrontendSettings(setting(FrontendSettingsSettingName)); 670 670 671 if (m_resourceTrackingEnabled) 672 m_frontend->resourceTrackingWasEnabled(); 673 #if ENABLE(JAVASCRIPT_DEBUGGER) 674 if (m_profilerEnabled) 675 m_frontend->profilerWasEnabled(); 676 #endif 677 671 678 ResourcesMap::iterator resourcesEnd = m_resources.end(); 672 679 for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it) … … 695 702 for (WorkersMap::iterator it = m_workers.begin(); it != workersEnd; ++it) 696 703 m_frontend->didCreateWorker(*it->second); 697 #endif698 #if ENABLE(JAVASCRIPT_DEBUGGER)699 if (m_profilerEnabled)700 m_frontend->profilerWasEnabled();701 704 #endif 702 705 -
trunk/WebCore/inspector/front-end/AuditsPanel.js
r54591 r55535 189 189 this._resourceTrackingCallback = callback; 190 190 191 if (! InspectorBackend.resourceTrackingEnabled()) {191 if (!WebInspector.panels.resources.resourceTrackingEnabled) { 192 192 InspectorBackend.enableResourceTracking(false); 193 193 this._updateLauncherViewControls(true); … … 239 239 240 240 this.showView(); 241 this._updateLauncherViewControls( InspectorBackend.resourceTrackingEnabled());241 this._updateLauncherViewControls(WebInspector.panels.resources.resourceTrackingEnabled); 242 242 }, 243 243 -
trunk/WebCore/inspector/front-end/InspectorBackendStub.js
r55347 r55535 35 35 this._searchingForNode = false; 36 36 this._attachedWindowHeight = 0; 37 this._debuggerEnabled = true;38 this._profilerEnabled = true;39 this._resourceTrackingEnabled = false;40 37 this._timelineEnabled = false; 41 38 } … … 127 124 }, 128 125 129 debuggerEnabled: function()130 {131 return this._debuggerEnabled;132 },133 134 126 enableResourceTracking: function() 135 127 { 136 this._resourceTrackingEnabled = true;137 128 WebInspector.resourceTrackingWasEnabled(); 138 129 }, … … 140 131 disableResourceTracking: function() 141 132 { 142 this._resourceTrackingEnabled = false;143 133 WebInspector.resourceTrackingWasDisabled(); 144 134 }, 145 135 146 resourceTrackingEnabled: function()147 {148 return this._resourceTrackingEnabled;149 },150 151 136 reloadPage: function() 152 137 { … … 155 140 enableDebugger: function() 156 141 { 157 this._debuggerEnabled = true;142 WebInspector.debuggerWasEnabled(); 158 143 }, 159 144 160 145 disableDebugger: function() 161 146 { 162 this._debuggerEnabled = false;147 WebInspector.debuggerWasDisabled(); 163 148 }, 164 149 … … 198 183 }, 199 184 200 profilerEnabled: function()201 {202 return true;203 },204 205 185 enableProfiler: function() 206 186 { 207 this._profilerEnabled = true;187 WebInspector.profilerWasEnabled(); 208 188 }, 209 189 210 190 disableProfiler: function() 211 191 { 212 this._profilerEnabled = false;192 WebInspector.profilerWasDisabled(); 213 193 }, 214 194 -
trunk/WebCore/inspector/front-end/ResourcesPanel.js
r55517 r55535 48 48 this.filter(this.filterAllElement, false); 49 49 this.graphsTreeElement.children[0].select(); 50 this._resourceTrackingEnabled = false; 50 51 } 51 52 … … 125 126 126 127 this.itemsTreeElement.expand(); 128 }, 129 130 get resourceTrackingEnabled() 131 { 132 return this._resourceTrackingEnabled; 127 133 }, 128 134 … … 283 289 if (this.visibleResource) 284 290 return this.visibleResource._resourcesView; 285 return InspectorBackend.resourceTrackingEnabled()? null : this.panelEnablerView;291 return this._resourceTrackingEnabled ? null : this.panelEnablerView; 286 292 }, 287 293 … … 312 318 resourceTrackingWasEnabled: function() 313 319 { 320 this._resourceTrackingEnabled = true; 314 321 this.reset(); 315 322 }, … … 317 324 resourceTrackingWasDisabled: function() 318 325 { 326 this._resourceTrackingEnabled = false; 319 327 this.reset(); 320 328 }, … … 348 356 this.summaryBar.reset(); 349 357 350 if ( InspectorBackend.resourceTrackingEnabled()) {358 if (this._resourceTrackingEnabled) { 351 359 this.enableToggleButton.title = WebInspector.UIString("Resource tracking enabled. Click to disable."); 352 360 this.enableToggleButton.toggled = true; … … 691 699 _enableResourceTracking: function() 692 700 { 693 if ( InspectorBackend.resourceTrackingEnabled())701 if (this._resourceTrackingEnabled) 694 702 return; 695 703 this._toggleResourceTracking(this.panelEnablerView.alwaysEnabled); … … 698 706 _toggleResourceTracking: function(optionalAlways) 699 707 { 700 if ( InspectorBackend.resourceTrackingEnabled()) {708 if (this._resourceTrackingEnabled) { 701 709 this.largerResourcesButton.visible = false; 702 710 this.sortingSelectElement.visible = false; -
trunk/WebKit/chromium/ChangeLog
r55512 r55535 1 2010-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 1 11 2010-03-04 Darin Fisher <darin@chromium.org> 2 12 -
trunk/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
r54592 r55535 162 162 } 163 163 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 173 164 void WebDevToolsAgentImpl::attach() 174 165 { … … 180 171 this)); 181 172 resetInspectorFrontendProxy(); 182 unhideResourcesPanelIfNecessary(); 173 183 174 // Allow controller to send messages to the frontend. 184 175 InspectorController* ic = inspectorController(); … … 229 220 m_toolsAgentDelegateStub->frameNavigate(WebCore::KURL(url).string()); 230 221 SetApuAgentEnabledInUtilityContext(m_utilityContext, m_apuAgentEnabled); 231 unhideResourcesPanelIfNecessary();232 222 } 233 223 } -
trunk/WebKit/chromium/src/WebDevToolsAgentImpl.h
r54592 r55535 107 107 108 108 void disposeUtilityContext(); 109 void unhideResourcesPanelIfNecessary();110 109 111 110 void compileUtilityScripts(); -
trunk/WebKit/chromium/src/js/DevTools.js
r55464 r55535 152 152 153 153 /** 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 /**165 154 * Prints string to the inspector console or shows alert if the console doesn't 166 155 * exist. … … 378 367 379 368 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 392 369 (function() 393 370 {
Note: See TracChangeset
for help on using the changeset viewer.