| Index: webkit/glue/devtools/js/devtools.js
|
| diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
|
| index f00b9a44272fdc21a0860564b6ec99ee91eb698d..494b600b5c5e5d76b1f8bfeae0a7e95eeebb39c1 100644
|
| --- a/webkit/glue/devtools/js/devtools.js
|
| +++ b/webkit/glue/devtools/js/devtools.js
|
| @@ -42,6 +42,7 @@ devtools.ToolsAgent = function() {
|
| RemoteToolsAgent.DispatchOnClient =
|
| goog.bind(this.dispatchOnClient_, this);
|
| this.debuggerAgent_ = new devtools.DebuggerAgent();
|
| + this.profilerAgent_ = new devtools.ProfilerAgent();
|
| };
|
|
|
|
|
| @@ -51,6 +52,7 @@ devtools.ToolsAgent = function() {
|
| devtools.ToolsAgent.prototype.reset = function() {
|
| InspectorFrontendHost.reset();
|
| this.debuggerAgent_.reset();
|
| + this.profilerAgent_.reset();
|
| };
|
|
|
|
|
| @@ -75,6 +77,14 @@ devtools.ToolsAgent.prototype.getDebuggerAgent = function() {
|
|
|
|
|
| /**
|
| + * @return {devtools.ProfilerAgent} Profiler agent instance.
|
| + */
|
| +devtools.ToolsAgent.prototype.getProfilerAgent = function() {
|
| + return this.profilerAgent_;
|
| +};
|
| +
|
| +
|
| +/**
|
| * @param {string} url Url frame navigated to.
|
| * @see tools_agent.h
|
| * @private
|
| @@ -319,7 +329,7 @@ WebInspector.ScriptsPanel.prototype.__defineGetter__(
|
| (function InterceptProfilesPanelEvents() {
|
| var oldShow = WebInspector.ProfilesPanel.prototype.show;
|
| WebInspector.ProfilesPanel.prototype.show = function() {
|
| - devtools.tools.getDebuggerAgent().initializeProfiling();
|
| + devtools.tools.getProfilerAgent().initializeProfiling();
|
| this.enableToggleButton.visible = false;
|
| oldShow.call(this);
|
| // Show is called on every show event of a panel, so
|
|
|