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

Unified Diff: ui/compositor/compositor.h

Issue 161413002: Revert of Read compositor VSync information from platform, when possible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 84ed365803cb7a9b46ee53045325e7df067a238a..81363ba1cb68d3558216bd6e86dbc3f0acc272f2 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -43,7 +43,6 @@
namespace ui {
class Compositor;
-class CompositorVSyncManager;
class Layer;
class PostedSwapQueue;
class Reflector;
@@ -164,7 +163,8 @@
// view hierarchy.
class COMPOSITOR_EXPORT Compositor
: NON_EXPORTED_BASE(public cc::LayerTreeHostClient),
- NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient) {
+ NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient),
+ public base::SupportsWeakPtr<Compositor> {
public:
explicit Compositor(gfx::AcceleratedWidget widget);
virtual ~Compositor();
@@ -222,9 +222,6 @@
// Returns the widget for this compositor.
gfx::AcceleratedWidget widget() const { return widget_; }
- // Returns the vsync manager for this compositor.
- scoped_refptr<CompositorVSyncManager> vsync_manager() const;
-
// Compositor does not own observers. It is the responsibility of the
// observer to remove itself when it is done observing.
void AddObserver(CompositorObserver* observer);
@@ -246,6 +243,9 @@
// Signals swap has aborted (e.g. lost context).
void OnSwapBuffersAborted();
+
+ void OnUpdateVSyncParameters(base::TimeTicks timebase,
+ base::TimeDelta interval);
// LayerTreeHostClient implementation.
virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
@@ -302,9 +302,6 @@
scoped_refptr<cc::Layer> root_web_layer_;
scoped_ptr<cc::LayerTreeHost> host_;
- // The manager of vsync parameters for this compositor.
- scoped_refptr<CompositorVSyncManager> vsync_manager_;
-
// Used to verify that we have at most one draw swap in flight.
scoped_ptr<PostedSwapQueue> posted_swaps_;
« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698