| Index: chrome/renderer/renderer_main.cc
|
| diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc
|
| index 06e71d3edc0c3d61a6e892f2782ca1f7594ffae9..9a7b4406c05a3d29a92e096da087253088ea55bc 100644
|
| --- a/chrome/renderer/renderer_main.cc
|
| +++ b/chrome/renderer/renderer_main.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -181,7 +181,7 @@ static void HandleRendererErrorTestParameters(const CommandLine& command_line) {
|
|
|
| // This is a simplified version of the browser Jankometer, which measures
|
| // the processing time of tasks on the render thread.
|
| -class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
|
| +class RendererMessageLoopObserver : public MessageLoop::ClosureObserver {
|
| public:
|
| RendererMessageLoopObserver()
|
| : process_times_(base::Histogram::FactoryGet(
|
| @@ -189,11 +189,11 @@ class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
|
| 1, 3600000, 50, base::Histogram::kUmaTargetedHistogramFlag)) {}
|
| virtual ~RendererMessageLoopObserver() {}
|
|
|
| - virtual void WillProcessTask(const Task* task) {
|
| + virtual void WillProcessClosure(base::TimeTicks time_posted) {
|
| begin_process_message_ = base::TimeTicks::Now();
|
| }
|
|
|
| - virtual void DidProcessTask(const Task* task) {
|
| + virtual void DidProcessClosure(base::TimeTicks time_posted) {
|
| if (begin_process_message_ != base::TimeTicks())
|
| process_times_->AddTime(base::TimeTicks::Now() - begin_process_message_);
|
| }
|
| @@ -266,7 +266,7 @@ int RendererMain(const MainFunctionParams& parameters) {
|
| base::StatsScope<base::StatsCounterTimer>
|
| startup_timer(chrome::Counters::renderer_main());
|
|
|
| - RendererMessageLoopObserver task_observer;
|
| + RendererMessageLoopObserver closure_observer;
|
| #if defined(OS_MACOSX)
|
| // As long as we use Cocoa in the renderer (for the forseeable future as of
|
| // now; see http://crbug.com/13890 for info) we need to have a UI loop.
|
| @@ -277,7 +277,7 @@ int RendererMain(const MainFunctionParams& parameters) {
|
| MessageLoop main_message_loop(RenderProcessImpl::InProcessPlugins() ?
|
| MessageLoop::TYPE_UI : MessageLoop::TYPE_DEFAULT);
|
| #endif
|
| - main_message_loop.AddTaskObserver(&task_observer);
|
| + main_message_loop.AddClosureObserver(&closure_observer);
|
|
|
| base::PlatformThread::SetName("CrRendererMain");
|
|
|
|
|