| Index: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| index 28c8d46d0f3dd7a3c3a816716692095b6a1ab87b..bedca1e75f6e8b15ad1ba825dcc6827874296e83 100644
|
| --- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| +++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| @@ -8,10 +8,8 @@
|
| #include "base/atomicops.h"
|
| #include "base/macros.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "platform/scheduler/base/long_task_tracker.h"
|
| #include "platform/scheduler/base/pollable_thread_safe_flag.h"
|
| #include "platform/scheduler/base/queueing_time_estimator.h"
|
| -#include "platform/scheduler/base/task_time_tracker.h"
|
| #include "platform/scheduler/base/thread_load_tracker.h"
|
| #include "platform/scheduler/child/idle_helper.h"
|
| #include "platform/scheduler/child/scheduler_helper.h"
|
| @@ -23,6 +21,7 @@
|
| #include "platform/scheduler/renderer/user_model.h"
|
| #include "platform/scheduler/renderer/web_view_scheduler_impl.h"
|
| #include "public/platform/scheduler/renderer/renderer_scheduler.h"
|
| +#include "public/platform/scheduler/base/task_time_observer.h"
|
|
|
| namespace base {
|
| namespace trace_event {
|
| @@ -42,7 +41,7 @@ class BLINK_PLATFORM_EXPORT RendererSchedulerImpl
|
| public IdleHelper::Delegate,
|
| public SchedulerHelper::Observer,
|
| public RenderWidgetSignals::Observer,
|
| - public TaskTimeTracker,
|
| + public TaskTimeObserver,
|
| public QueueingTimeEstimator::Client {
|
| public:
|
| // Keep RendererScheduler::UseCaseToString in sync with this enum.
|
| @@ -131,9 +130,8 @@ class BLINK_PLATFORM_EXPORT RendererSchedulerImpl
|
| void OnTriedToExecuteBlockedTask(const TaskQueue& queue,
|
| const base::PendingTask& task) override;
|
|
|
| - // TaskTimeTracker implementation:
|
| - void ReportTaskTime(base::TimeTicks start_time,
|
| - base::TimeTicks end_time) override;
|
| + // TaskTimeObserver implementation:
|
| + void ReportTaskTime(double start_time, double end_time) override;
|
|
|
| // QueueingTimeEstimator::Client implementation:
|
| void OnQueueingTimeForWindowEstimated(base::TimeDelta queueing_time) override;
|
| @@ -150,7 +148,8 @@ class BLINK_PLATFORM_EXPORT RendererSchedulerImpl
|
| void AddWebViewScheduler(WebViewSchedulerImpl* web_view_scheduler);
|
| void RemoveWebViewScheduler(WebViewSchedulerImpl* web_view_scheduler);
|
|
|
| - LongTaskTracker::LongTaskTiming GetLongTaskTiming();
|
| + void AddTaskTimeObserver(TaskTimeObserver* task_time_observer);
|
| + void RemoveTaskTimeObserver(TaskTimeObserver* task_time_observer);
|
|
|
| // Test helpers.
|
| SchedulerHelper* GetSchedulerHelperForTesting();
|
| @@ -371,7 +370,6 @@ class BLINK_PLATFORM_EXPORT RendererSchedulerImpl
|
| TaskCostEstimator loading_task_cost_estimator;
|
| TaskCostEstimator timer_task_cost_estimator;
|
| QueueingTimeEstimator queueing_time_estimator;
|
| - LongTaskTracker long_task_tracker;
|
| IdleTimeEstimator idle_time_estimator;
|
| ThreadLoadTracker background_main_thread_load_tracker;
|
| ThreadLoadTracker foreground_main_thread_load_tracker;
|
|
|