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

Unified Diff: ui/compositor/test/test_compositor_host_ozone.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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: ui/compositor/test/test_compositor_host_ozone.cc
diff --git a/ui/compositor/test/test_compositor_host_ozone.cc b/ui/compositor/test/test_compositor_host_ozone.cc
index aed3f2179fb3f4c79607566e03b849f429a2ed82..c3dbfa1f1430257b25eb5a9fe4742f1a3ea32559 100644
--- a/ui/compositor/test/test_compositor_host_ozone.cc
+++ b/ui/compositor/test/test_compositor_host_ozone.cc
@@ -45,6 +45,8 @@ TestCompositorHostOzone::TestCompositorHostOzone(
TestCompositorHostOzone::~TestCompositorHostOzone() {}
void TestCompositorHostOzone::Show() {
+ compositor_.reset(new ui::Compositor(context_factory_,
+ base::ThreadTaskRunnerHandle::Get()));
// Ozone should rightly have a backing native framebuffer
// An in-memory array draw into by OSMesa is a reasonble
// fascimile of a dumb framebuffer at present.
@@ -52,9 +54,7 @@ void TestCompositorHostOzone::Show() {
// with a non-0 widget.
// TODO(rjkroege): Use a "real" ozone widget when it is
// available: http://crbug.com/255128
- compositor_.reset(new ui::Compositor(1,
- context_factory_,
- base::ThreadTaskRunnerHandle::Get()));
+ compositor_->OnAcceleratedWidgetAvailable(1);
compositor_->SetScaleAndSize(1.0f, bounds_.size());
}

Powered by Google App Engine
This is Rietveld 408576698