summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 22:17:27 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 22:17:27 +0000
commitdf9af8e67bdedffa8bdc7af0eaafaace7305e364 (patch)
tree85b55fe2d1cb0c4be9530e6afdccba9703ffaf10
parenta383861900f8da3af94ee247409bf8d204f6d861 (diff)
downloadchromium_src-df9af8e67bdedffa8bdc7af0eaafaace7305e364.zip
chromium_src-df9af8e67bdedffa8bdc7af0eaafaace7305e364.tar.gz
chromium_src-df9af8e67bdedffa8bdc7af0eaafaace7305e364.tar.bz2
Removes parameter from calls to InspectorController::enableTimeline. These are
Chromium changes that correspond to this WebKit change: https://bugs.webkit.org/show_bug.cgi?id=30135 Review URL: http://codereview.chromium.org/274024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28898 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/webdevtoolsagent_impl.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index 680033d..38e4fe0 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -235,14 +235,18 @@ void WebDevToolsAgentImpl::SetApuAgentEnabled(bool enable) {
InspectorController* ic = web_view_impl_->page()->inspectorController();
if (enable) {
resource_tracking_was_enabled_ = ic->resourceTrackingEnabled();
- ic->enableTimeline(false);
+ // TODO(knorton): Disabled to allow a WebKit change to go through
+ // commit-queue.
+ // ic->startTimelineProfiler();
if (!resource_tracking_was_enabled_) {
// TODO(knorton): Introduce some kind of agents dependency here so that
// user could turn off resource tracking while apu agent is on.
ic->enableResourceTracking(false);
}
} else {
- ic->disableTimeline(false);
+ // TODO(knorton): Disabled to allow a WebKit change to go through
+ // commit-queue.
+ // ic->stopTimelineProfiler();
if (!resource_tracking_was_enabled_) {
ic->disableResourceTracking(false);
}