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

Unified Diff: ui/aura/window_tree_host.cc

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid
Patch Set: Temp Created 5 years 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
« no previous file with comments | « content/shell/browser/shell_views.cc ('k') | ui/aura/window_tree_host_platform.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host.cc
diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
index 5c9f25cd549d024484d4ae4a3f4b102f27e3a0d3..67c8ddb745f7b9b1ed7b4429a9bfca00f64cb7f0 100644
--- a/ui/aura/window_tree_host.cc
+++ b/ui/aura/window_tree_host.cc
@@ -32,9 +32,13 @@ 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();
}
@@ -64,9 +68,15 @@ void WindowTreeHost::InitHost() {
}
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) {
@@ -162,9 +172,13 @@ void WindowTreeHost::MoveCursorTo(const gfx::Point& location_in_dip) {
}
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() {
« no previous file with comments | « content/shell/browser/shell_views.cc ('k') | ui/aura/window_tree_host_platform.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698