| Index: third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl.h
|
| diff --git a/components/scheduler/renderer/web_view_scheduler_impl.h b/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl.h
|
| similarity index 63%
|
| rename from components/scheduler/renderer/web_view_scheduler_impl.h
|
| rename to third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl.h
|
| index 6f69845ae911e41fa81fec641ef6f3eb220ba215..09fe1754954f13cb0febfe03eeec96eb006c27e5 100644
|
| --- a/components/scheduler/renderer/web_view_scheduler_impl.h
|
| +++ b/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl.h
|
| @@ -2,17 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
|
| -#define COMPONENTS_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
|
| +#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
|
| +#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
|
|
|
| #include <memory>
|
| #include <set>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "components/scheduler/base/task_queue.h"
|
| -#include "components/scheduler/scheduler_export.h"
|
| -#include "third_party/WebKit/public/platform/WebViewScheduler.h"
|
| +#include "public/platform/scheduler/base/task_queue.h"
|
| +#include "public/platform/WebCommon.h"
|
| +#include "public/platform/WebScheduler.h"
|
| +#include "public/platform/WebViewScheduler.h"
|
|
|
| namespace base {
|
| namespace trace_event {
|
| @@ -22,32 +23,30 @@ class SingleThreadTaskRunner;
|
| } // namespace base
|
|
|
| namespace blink {
|
| -class WebView;
|
| -} // namespace blink
|
| -
|
| namespace scheduler {
|
|
|
| class RendererSchedulerImpl;
|
| class WebFrameSchedulerImpl;
|
|
|
| -class SCHEDULER_EXPORT WebViewSchedulerImpl : public blink::WebViewScheduler {
|
| +class BLINK_PLATFORM_EXPORT WebViewSchedulerImpl : public WebViewScheduler {
|
| public:
|
| - WebViewSchedulerImpl(blink::WebView* web_view,
|
| - RendererSchedulerImpl* renderer_scheduler,
|
| - bool disable_background_timer_throttling);
|
| + WebViewSchedulerImpl(
|
| + WebScheduler::InterventionReporter* intervention_reporter,
|
| + RendererSchedulerImpl* renderer_scheduler,
|
| + bool disable_background_timer_throttling);
|
|
|
| ~WebViewSchedulerImpl() override;
|
|
|
| - // blink::WebViewScheduler implementation:
|
| + // WebViewScheduler implementation:
|
| void setPageVisible(bool page_visible) override;
|
| - std::unique_ptr<blink::WebFrameScheduler> createFrameScheduler(
|
| - blink::BlameContext* blame_context) override;
|
| + std::unique_ptr<WebFrameScheduler> createFrameScheduler(
|
| + BlameContext* blame_context) override;
|
| void enableVirtualTime() override;
|
| bool virtualTimeAllowedToAdvance() const override;
|
| void setVirtualTimePolicy(VirtualTimePolicy virtual_time_policy) override;
|
|
|
| // Virtual for testing.
|
| - virtual void AddConsoleWarning(const std::string& message);
|
| + virtual void ReportIntervention(const std::string& message);
|
|
|
| std::unique_ptr<WebFrameSchedulerImpl> createWebFrameSchedulerImpl(
|
| base::trace_event::BlameContext* blame_context);
|
| @@ -64,7 +63,7 @@ class SCHEDULER_EXPORT WebViewSchedulerImpl : public blink::WebViewScheduler {
|
|
|
| std::set<WebFrameSchedulerImpl*> frame_schedulers_;
|
| std::set<unsigned long> pending_loads_;
|
| - blink::WebView* web_view_;
|
| + WebScheduler::InterventionReporter* intervention_reporter_; // Not owned.
|
| RendererSchedulerImpl* renderer_scheduler_;
|
| VirtualTimePolicy virtual_time_policy_;
|
| int background_parser_count_;
|
| @@ -78,5 +77,6 @@ class SCHEDULER_EXPORT WebViewSchedulerImpl : public blink::WebViewScheduler {
|
| };
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|
| -#endif // COMPONENTS_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
|
| +#endif // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_WEB_VIEW_SCHEDULER_IMPL_H_
|
|
|