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

Unified Diff: content/browser/renderer_host/compositor_impl_android.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: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 358ac519981ee5bc746eae1e660a48a9977d032a..9a3459a263a3b9473a349cf286a3de240cc9f2a0 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -238,7 +238,7 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
window_(NULL),
surface_id_(0),
client_(client),
- root_window_(root_window),
+ root_window_((ui::WindowAndroid*)root_window),
did_post_swapbuffers_(false),
ignore_schedule_composite_(false),
needs_composite_(false),
@@ -251,7 +251,7 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
weak_factory_(this) {
DCHECK(client);
DCHECK(root_window);
- root_window->AttachCompositor(this);
+ root_window_->AttachCompositor(this);
}
CompositorImpl::~CompositorImpl() {

Powered by Google App Engine
This is Rietveld 408576698