| Index: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| diff --git a/components/scheduler/renderer/renderer_scheduler_impl.h b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| similarity index 90%
|
| rename from components/scheduler/renderer/renderer_scheduler_impl.h
|
| rename to third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| index dad69eea94b39f139d6d2b597ca7a5b75fe6930b..f7bf7fa3f399c9a27a684deeb0a533523bce86ad 100644
|
| --- a/components/scheduler/renderer/renderer_scheduler_impl.h
|
| +++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
|
| @@ -2,27 +2,26 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_SCHEDULER_RENDERER_RENDERER_SCHEDULER_IMPL_H_
|
| -#define COMPONENTS_SCHEDULER_RENDERER_RENDERER_SCHEDULER_IMPL_H_
|
| +#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_RENDERER_SCHEDULER_IMPL_H_
|
| +#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_RENDERER_SCHEDULER_IMPL_H_
|
|
|
| #include "base/atomicops.h"
|
| #include "base/macros.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "components/scheduler/base/long_task_tracker.h"
|
| -#include "components/scheduler/base/pollable_thread_safe_flag.h"
|
| -#include "components/scheduler/base/queueing_time_estimator.h"
|
| -#include "components/scheduler/base/task_time_tracker.h"
|
| -#include "components/scheduler/child/idle_helper.h"
|
| -#include "components/scheduler/child/scheduler_helper.h"
|
| -#include "components/scheduler/renderer/deadline_task_runner.h"
|
| -#include "components/scheduler/renderer/idle_time_estimator.h"
|
| -#include "components/scheduler/renderer/render_widget_signals.h"
|
| -#include "components/scheduler/renderer/renderer_scheduler.h"
|
| -#include "components/scheduler/renderer/task_cost_estimator.h"
|
| -#include "components/scheduler/renderer/throttling_helper.h"
|
| -#include "components/scheduler/renderer/user_model.h"
|
| -#include "components/scheduler/renderer/web_view_scheduler_impl.h"
|
| -#include "components/scheduler/scheduler_export.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/child/idle_helper.h"
|
| +#include "platform/scheduler/child/scheduler_helper.h"
|
| +#include "platform/scheduler/renderer/deadline_task_runner.h"
|
| +#include "platform/scheduler/renderer/idle_time_estimator.h"
|
| +#include "platform/scheduler/renderer/render_widget_signals.h"
|
| +#include "public/platform/scheduler/renderer/renderer_scheduler.h"
|
| +#include "platform/scheduler/renderer/task_cost_estimator.h"
|
| +#include "platform/scheduler/renderer/throttling_helper.h"
|
| +#include "platform/scheduler/renderer/user_model.h"
|
| +#include "platform/scheduler/renderer/web_view_scheduler_impl.h"
|
|
|
| namespace base {
|
| namespace trace_event {
|
| @@ -30,13 +29,14 @@ class ConvertableToTraceFormat;
|
| }
|
| }
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
| class AutoAdvancingVirtualTimeDomain;
|
| class RenderWidgetSchedulingState;
|
| class WebViewSchedulerImpl;
|
| class ThrottlingHelper;
|
|
|
| -class SCHEDULER_EXPORT RendererSchedulerImpl
|
| +class BLINK_PLATFORM_EXPORT RendererSchedulerImpl
|
| : public RendererScheduler,
|
| public IdleHelper::Delegate,
|
| public SchedulerHelper::Observer,
|
| @@ -80,7 +80,7 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
|
| ~RendererSchedulerImpl() override;
|
|
|
| // RendererScheduler implementation:
|
| - std::unique_ptr<blink::WebThread> CreateMainThread() override;
|
| + std::unique_ptr<WebThread> CreateMainThread() override;
|
| scoped_refptr<TaskQueue> DefaultTaskRunner() override;
|
| scoped_refptr<SingleThreadIdleTaskRunner> IdleTaskRunner() override;
|
| scoped_refptr<TaskQueue> CompositorTaskRunner() override;
|
| @@ -95,18 +95,16 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
|
| void BeginFrameNotExpectedSoon() override;
|
| void DidCommitFrameToCompositor() override;
|
| void DidHandleInputEventOnCompositorThread(
|
| - const blink::WebInputEvent& web_input_event,
|
| + const WebInputEvent& web_input_event,
|
| InputEventState event_state) override;
|
| void DidHandleInputEventOnMainThread(
|
| - const blink::WebInputEvent& web_input_event) override;
|
| + const WebInputEvent& web_input_event) override;
|
| void DidAnimateForInputOnCompositorThread() override;
|
| void OnRendererBackgrounded() override;
|
| void OnRendererForegrounded() override;
|
| void SuspendRenderer() override;
|
| - void AddPendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType type) override;
|
| - void RemovePendingNavigation(
|
| - blink::WebScheduler::NavigatingFrameType type) override;
|
| + void AddPendingNavigation(WebScheduler::NavigatingFrameType type) override;
|
| + void RemovePendingNavigation(WebScheduler::NavigatingFrameType type) override;
|
| void OnNavigationStarted() override;
|
| bool IsHighPriorityWorkAnticipated() override;
|
| bool ShouldYieldForHighPriorityWork() override;
|
| @@ -255,8 +253,7 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
|
| std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValueLocked(
|
| base::TimeTicks optional_now) const;
|
|
|
| - static bool ShouldPrioritizeInputEvent(
|
| - const blink::WebInputEvent& web_input_event);
|
| + static bool ShouldPrioritizeInputEvent(const WebInputEvent& web_input_event);
|
|
|
| // The amount of time which idle periods can continue being scheduled when the
|
| // renderer has been hidden, before going to sleep for good.
|
| @@ -322,7 +319,7 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
|
| base::TimeDelta* expected_use_case_duration) const;
|
|
|
| // An input event of some sort happened, the policy may need updating.
|
| - void UpdateForInputEventOnCompositorThread(blink::WebInputEvent::Type type,
|
| + void UpdateForInputEventOnCompositorThread(WebInputEvent::Type type,
|
| InputEventState input_event_state);
|
|
|
| // Returns true if there has been at least one idle period in the last
|
| @@ -342,8 +339,8 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
|
| // current system state. Must be called from the main thread.
|
| base::TimeDelta EstimateLongestJankFreeTaskDuration() const;
|
|
|
| - // Log a console warning message to all WebViews in this process.
|
| - void BroadcastConsoleWarning(const std::string& message);
|
| + // Report an intervention to all WebViews in this process.
|
| + void BroadcastIntervention(const std::string& message);
|
|
|
| void ApplyTaskQueuePolicy(TaskQueue* task_queue,
|
| const TaskQueuePolicy& old_task_queue_policy,
|
| @@ -437,7 +434,7 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
|
| CompositorThreadOnly();
|
| ~CompositorThreadOnly();
|
|
|
| - blink::WebInputEvent::Type last_input_type;
|
| + WebInputEvent::Type last_input_type;
|
| std::unique_ptr<base::ThreadChecker> compositor_thread_checker;
|
|
|
| void CheckOnValidThread() {
|
| @@ -488,5 +485,6 @@ class SCHEDULER_EXPORT RendererSchedulerImpl
|
| };
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|
| -#endif // COMPONENTS_SCHEDULER_RENDERER_RENDERER_SCHEDULER_IMPL_H_
|
| +#endif // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_RENDERER_SCHEDULER_IMPL_H_
|
|
|