Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: content/browser/compositor/browser_compositor_output_surface.h

Issue 1016033006: Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mac build Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d3d8f2630ce8721e537406032b77220ece18d42a..0913aa78870c929cdff7304e1eb9e50fb1d99778 100644
--- a/content/browser/compositor/browser_compositor_output_surface.h
+++ b/content/browser/compositor/browser_compositor_output_surface.h
@@ -8,7 +8,6 @@
#include "base/threading/non_thread_safe.h"
#include "cc/output/output_surface.h"
#include "content/common/content_export.h"
-#include "ui/compositor/compositor_vsync_manager.h"
namespace cc {
class SoftwareOutputDevice;
@@ -20,18 +19,13 @@ class ReflectorImpl;
class WebGraphicsContext3DCommandBufferImpl;
class CONTENT_EXPORT BrowserCompositorOutputSurface
- : public cc::OutputSurface,
- public ui::CompositorVSyncManager::Observer {
+ : public cc::OutputSurface {
public:
~BrowserCompositorOutputSurface() override;
// cc::OutputSurface implementation.
bool BindToClient(cc::OutputSurfaceClient* client) override;
- // ui::CompositorOutputSurface::Observer implementation.
- void OnUpdateVSyncParameters(base::TimeTicks timebase,
- base::TimeDelta interval) override;
-
void OnUpdateVSyncParametersFromGpu(base::TimeTicks tiembase,
base::TimeDelta interval);
@@ -45,16 +39,13 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
protected:
// Constructor used by the accelerated implementation.
- BrowserCompositorOutputSurface(
- const scoped_refptr<cc::ContextProvider>& context,
- const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
+ explicit BrowserCompositorOutputSurface(
+ const scoped_refptr<cc::ContextProvider>& context);
// Constructor used by the software implementation.
- BrowserCompositorOutputSurface(
- scoped_ptr<cc::SoftwareOutputDevice> software_device,
- const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
+ explicit BrowserCompositorOutputSurface(
+ scoped_ptr<cc::SoftwareOutputDevice> software_device);
- scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
ReflectorImpl* reflector_;
private:

Powered by Google App Engine
This is Rietveld 408576698