NOT FOR REVIEW: Aura Android: Content Shell compiles

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 14 matching lines @@
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
 
 const char kWindowTreeHostForAcceleratedWidget[] =
     "__AURA_WINDOW_TREE_HOST_ACCELERATED_WIDGET__";
 
 float GetDeviceScaleFactorFromDisplay(Window* window) {
-  gfx::Display display = gfx::Screen::GetScreenFor(window)->
-      GetDisplayNearestWindow(window);
+  LOG(ERROR) << "auraclank: GetDeviceScaleFactorFromDisplay";
+  gfx::Screen* screen = gfx::Screen::GetScreenFor(window);
+  LOG(ERROR) << 1;
+  gfx::Display display = screen->GetDisplayNearestWindow(window);
+  LOG(ERROR) << 2;
   DCHECK(display.is_valid());
+  LOG(ERROR) << 3;
   return display.device_scale_factor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHost, public:
 
 WindowTreeHost::~WindowTreeHost() {
   DCHECK(!compositor_) << "compositor must be destroyed before root window";
   if (owned_input_method_) {
     delete input_method_;
     input_method_ = nullptr;
   }
 }
 
 // static
 WindowTreeHost* WindowTreeHost::GetForAcceleratedWidget(
     gfx::AcceleratedWidget widget) {
   return reinterpret_cast<WindowTreeHost*>(
       ui::ViewProp::GetValue(widget, kWindowTreeHostForAcceleratedWidget));
 }
 
 void WindowTreeHost::InitHost() {
   InitCompositor();
   UpdateRootWindowSize(GetBounds().size());
   Env::GetInstance()->NotifyHostInitialized(this);
   window()->Show();
 }
 
 void WindowTreeHost::InitCompositor() {
-  compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
+  LOG(ERROR) << "auraclank: WindowTreeHost::InitCompositor";
+  LOG(ERROR) << 1;
+  float sf = GetDeviceScaleFactorFromDisplay(window());
+  LOG(ERROR) << 2;
+  compositor_->SetScaleAndSize(sf,
                                GetBounds().size());
+  LOG(ERROR) << 3;
   compositor_->SetRootLayer(window()->layer());
+  LOG(ERROR) << 4;
 }
 
 void WindowTreeHost::AddObserver(WindowTreeHostObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WindowTreeHost::RemoveObserver(WindowTreeHostObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 75 matching lines @@
   OnCursorVisibilityChangedNative(show);
 }
 
 void WindowTreeHost::MoveCursorTo(const gfx::Point& location_in_dip) {
   gfx::Point host_location(location_in_dip);
   ConvertPointToHost(&host_location);
   MoveCursorToInternal(location_in_dip, host_location);
 }
 
 void WindowTreeHost::MoveCursorToHostLocation(const gfx::Point& host_location) {
+  LOG(ERROR) << "auraclank: WindowTreeHost::MoveCursorToHostLocation";
   gfx::Point root_location(host_location);
+  LOG(ERROR) << 1;
   ConvertPointFromHost(&root_location);
+  LOG(ERROR) << 2;
   MoveCursorToInternal(root_location, host_location);
+  LOG(ERROR) << 3;
 }
 
 ui::InputMethod* WindowTreeHost::GetInputMethod() {
   if (!input_method_) {
     input_method_ =
         ui::CreateInputMethod(this, GetAcceleratedWidget()).release();
     owned_input_method_ = true;
   }
   return input_method_;
 }
@@ skipping 122 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