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

Unified Diff: content/browser/compositor/reflector_impl_unittest.cc

Issue 1124523003: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/reflector_impl_unittest.cc
diff --git a/content/browser/compositor/reflector_impl_unittest.cc b/content/browser/compositor/reflector_impl_unittest.cc
index 231015f24e8b0aa9bbac76915fdabe890cafb210..867a9de10a224963725337381ad761f822e20318 100644
--- a/content/browser/compositor/reflector_impl_unittest.cc
+++ b/content/browser/compositor/reflector_impl_unittest.cc
@@ -69,9 +69,11 @@
class TestOutputSurface : public BrowserCompositorOutputSurface {
public:
- explicit TestOutputSurface(
- const scoped_refptr<cc::ContextProvider>& context_provider)
+ TestOutputSurface(
+ const scoped_refptr<cc::ContextProvider>& context_provider,
+ const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
: BrowserCompositorOutputSurface(context_provider,
+ vsync_manager,
CreateTestValidatorOzone().Pass()) {}
void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; }
@@ -111,7 +113,9 @@
context_provider_ = cc::TestContextProvider::Create(
cc::TestWebGraphicsContext3D::Create().Pass());
output_surface_ =
- scoped_ptr<TestOutputSurface>(new TestOutputSurface(context_provider_));
+ scoped_ptr<TestOutputSurface>(
+ new TestOutputSurface(context_provider_,
+ compositor_->vsync_manager())).Pass();
CHECK(output_surface_->BindToClient(&output_surface_client_));
mirroring_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));

Powered by Google App Engine
This is Rietveld 408576698