| Index: content/browser/compositor/browser_compositor_output_surface.h
|
| diff --git a/content/browser/compositor/browser_compositor_output_surface.h b/content/browser/compositor/browser_compositor_output_surface.h
|
| index e2dbb9b2f0c8f13fb179c0194f2a06007fff1d5d..f0e8fd31e654227f5d6292305a32c8ba45308cf8 100644
|
| --- a/content/browser/compositor/browser_compositor_output_surface.h
|
| +++ b/content/browser/compositor/browser_compositor_output_surface.h
|
| @@ -9,12 +9,12 @@
|
| #include "base/threading/non_thread_safe.h"
|
| #include "build/build_config.h"
|
| #include "cc/output/output_surface.h"
|
| -#include "cc/scheduler/begin_frame_source.h"
|
| #include "content/common/content_export.h"
|
| #include "ui/compositor/compositor_vsync_manager.h"
|
|
|
| namespace cc {
|
| class SoftwareOutputDevice;
|
| +class SyntheticBeginFrameSource;
|
| }
|
|
|
| namespace display_compositor {
|
| @@ -74,16 +74,12 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
|
| virtual void SetSurfaceSuspendedForRecycle(bool suspended) = 0;
|
| #endif
|
|
|
| - cc::SyntheticBeginFrameSource* begin_frame_source() {
|
| - return synthetic_begin_frame_source_.get();
|
| - }
|
| -
|
| protected:
|
| // Constructor used by the accelerated implementation.
|
| BrowserCompositorOutputSurface(
|
| scoped_refptr<cc::ContextProvider> context,
|
| scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
|
| - base::SingleThreadTaskRunner* task_runner,
|
| + cc::SyntheticBeginFrameSource* begin_frame_source,
|
| std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
|
| overlay_candidate_validator);
|
|
|
| @@ -91,16 +87,16 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
|
| BrowserCompositorOutputSurface(
|
| std::unique_ptr<cc::SoftwareOutputDevice> software_device,
|
| const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
|
| - base::SingleThreadTaskRunner* task_runner);
|
| + cc::SyntheticBeginFrameSource* begin_frame_source);
|
|
|
| // Constructor used by the Vulkan implementation.
|
| BrowserCompositorOutputSurface(
|
| const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
|
| const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
|
| - base::SingleThreadTaskRunner* task_runner);
|
| + cc::SyntheticBeginFrameSource* begin_frame_source);
|
|
|
| scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
|
| - std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
|
| + cc::SyntheticBeginFrameSource* synthetic_begin_frame_source_;
|
| ReflectorImpl* reflector_;
|
|
|
| // True when BeginFrame scheduling is enabled.
|
|
|