NOT FOR REVIEW: Aura on Android

ui/aura/window_tree_host.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window_tree_host.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 31 matching lines @@
 // WindowTreeHost, public:
 
 WindowTreeHost::~WindowTreeHost() {
   DCHECK(!compositor_) << "compositor must be destroyed before root window";
   if (owned_input_method_) {
     delete input_method_;
     input_method_ = nullptr;
   }
 }
 
-#if defined(OS_ANDROID)
-// static
-WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
-  // This is only hit for tests and ash, right now these aren't an issue so
-  // adding the CHECK.
-  // TODO(sky): decide if we want a factory.
-  CHECK(false);
-  return nullptr;
-}
-#endif
-
 // static
 WindowTreeHost* WindowTreeHost::GetForAcceleratedWidget(
     gfx::AcceleratedWidget widget) {
   return reinterpret_cast<WindowTreeHost*>(
       ui::ViewProp::GetValue(widget, kWindowTreeHostForAcceleratedWidget));
 }
 
 void WindowTreeHost::InitHost() {
   InitCompositor();
   UpdateRootWindowSize(GetBounds().size());
@@ skipping 159 matching lines @@
   // TODO(beng): this comment is no longer quite valid since this function
   // isn't called from WED, and WED isn't a subclass of Window. So it seems
   // like we could just rely on ~Window now.
   // Destroy child windows while we're still valid. This is also done by
   // ~Window, but by that time any calls to virtual methods overriden here (such
   // as GetRootWindow()) result in Window's implementation. By destroying here
   // we ensure GetRootWindow() still returns this.
   //window()->RemoveOrDestroyChildren();
 }
 
-void WindowTreeHost::CreateCompositor(
-    gfx::AcceleratedWidget accelerated_widget) {
+void WindowTreeHost::CreateCompositor() {
   DCHECK(Env::GetInstance());
   ui::ContextFactory* context_factory = Env::GetInstance()->context_factory();
   DCHECK(context_factory);
   compositor_.reset(
-      new ui::Compositor(GetAcceleratedWidget(),
-                         context_factory,
-                         base::ThreadTaskRunnerHandle::Get()));
-  // TODO(beng): I think this setup should probably all move to a "accelerated
-  // widget available" function.
+      new ui::Compositor(context_factory, base::ThreadTaskRunnerHandle::Get()));
   if (!dispatcher()) {
     window()->Init(ui::LAYER_NOT_DRAWN);
     window()->set_host(this);
     window()->SetName("RootWindow");
     window()->SetEventTargeter(
         scoped_ptr<ui::EventTargeter>(new WindowTargeter()));
-    prop_.reset(new ui::ViewProp(GetAcceleratedWidget(),
-                                 kWindowTreeHostForAcceleratedWidget,
-                                 this));
     dispatcher_.reset(new WindowEventDispatcher(this));
   }
 }
 
+void WindowTreeHost::OnAcceleratedWidgetAvailable() {
+  compositor_->OnAcceleratedWidgetAvailable(GetAcceleratedWidget());
+  prop_.reset(new ui::ViewProp(GetAcceleratedWidget(),
+                               kWindowTreeHostForAcceleratedWidget,
+                               this));
+}
+
 void WindowTreeHost::OnHostMoved(const gfx::Point& new_location) {
   TRACE_EVENT1("ui", "WindowTreeHost::OnHostMoved",
                "origin", new_location.ToString());
 
   FOR_EACH_OBSERVER(WindowTreeHostObserver, observers_,
                     OnHostMoved(this, new_location));
 }
 
 void WindowTreeHost::OnHostResized(const gfx::Size& new_size) {
   // The compositor should have the same size as the native root window host.
@@ skipping 37 matching lines @@
   client::CursorClient* cursor_client = client::GetCursorClient(window());
   if (cursor_client) {
     const gfx::Display& display =
         gfx::Screen::GetScreenFor(window())->GetDisplayNearestWindow(window());
     cursor_client->SetDisplay(display);
   }
   dispatcher()->OnCursorMovedToRootLocation(root_location);
 }
 
 }  // namespace aura