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 e049e4d1bb5ffdc57dd60b7985f4e87c97493628..8c8f56cac0d11ffea21a8139a87c82c69e2c536f 100644 |
--- a/content/browser/compositor/browser_compositor_output_surface.h |
+++ b/content/browser/compositor/browser_compositor_output_surface.h |
@@ -10,11 +10,9 @@ |
#include "build/build_config.h" |
#include "cc/output/output_surface.h" |
#include "content/common/content_export.h" |
-#include "ui/compositor/compositor_vsync_manager.h" |
namespace cc { |
class SoftwareOutputDevice; |
-class SyntheticBeginFrameSource; |
} |
namespace display_compositor { |
@@ -31,6 +29,9 @@ class ReflectorImpl; |
class CONTENT_EXPORT BrowserCompositorOutputSurface |
: public cc::OutputSurface { |
public: |
+ using UpdateVSyncParametersCallback = |
+ base::Callback<void(base::TimeTicks timebase, base::TimeDelta interval)>; |
+ |
~BrowserCompositorOutputSurface() override; |
// cc::OutputSurface implementation. |
@@ -38,9 +39,6 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface |
bool HasExternalStencilTest() const override; |
void ApplyExternalStencil() override; |
- void OnUpdateVSyncParametersFromGpu(base::TimeTicks timebase, |
- base::TimeDelta interval); |
- |
void SetReflector(ReflectorImpl* reflector); |
// Called when |reflector_| was updated. |
@@ -54,25 +52,21 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface |
// Constructor used by the accelerated implementation. |
BrowserCompositorOutputSurface( |
scoped_refptr<cc::ContextProvider> context, |
- scoped_refptr<ui::CompositorVSyncManager> vsync_manager, |
- cc::SyntheticBeginFrameSource* begin_frame_source, |
+ const UpdateVSyncParametersCallback& update_vsync_parameters_callback, |
std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> |
overlay_candidate_validator); |
// Constructor used by the software implementation. |
BrowserCompositorOutputSurface( |
std::unique_ptr<cc::SoftwareOutputDevice> software_device, |
- const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
- cc::SyntheticBeginFrameSource* begin_frame_source); |
+ const UpdateVSyncParametersCallback& update_vsync_parameters_callback); |
// Constructor used by the Vulkan implementation. |
BrowserCompositorOutputSurface( |
const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider, |
- const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
- cc::SyntheticBeginFrameSource* begin_frame_source); |
+ const UpdateVSyncParametersCallback& update_vsync_parameters_callback); |
- scoped_refptr<ui::CompositorVSyncManager> vsync_manager_; |
- cc::SyntheticBeginFrameSource* synthetic_begin_frame_source_; |
+ const UpdateVSyncParametersCallback update_vsync_parameters_callback_; |
ReflectorImpl* reflector_; |
private: |