Rename WindowTreeHost functions to indicate pixels/dips.

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/threading/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 43 matching lines @@
 
 // static
 WindowTreeHost* WindowTreeHost::GetForAcceleratedWidget(
     gfx::AcceleratedWidget widget) {
   return reinterpret_cast<WindowTreeHost*>(
       ui::ViewProp::GetValue(widget, kWindowTreeHostForAcceleratedWidget));
 }
 
 void WindowTreeHost::InitHost() {
   InitCompositor();
-  UpdateRootWindowSize(GetBoundsInPixels().size());
+  UpdateRootWindowSizeInPixels(GetBoundsInPixels().size());
   Env::GetInstance()->NotifyHostInitialized(this);
   window()->Show();
 }
 
 void WindowTreeHost::InitCompositor() {
   compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
                                GetBoundsInPixels().size());
   compositor_->SetRootLayer(window()->layer());
   compositor_->SetDisplayColorSpace(
       GetICCProfileForCurrentDisplay().GetColorSpace());
@@ skipping 14 matching lines @@
 gfx::Transform WindowTreeHost::GetRootTransform() const {
   float scale = ui::GetDeviceScaleFactor(window()->layer());
   gfx::Transform transform;
   transform.Scale(scale, scale);
   transform *= window()->layer()->transform();
   return transform;
 }
 
 void WindowTreeHost::SetRootTransform(const gfx::Transform& transform) {
   window()->SetTransform(transform);
-  UpdateRootWindowSize(GetBoundsInPixels().size());
+  UpdateRootWindowSizeInPixels(GetBoundsInPixels().size());
 }
 
 gfx::Transform WindowTreeHost::GetInverseRootTransform() const {
   gfx::Transform invert;
   gfx::Transform transform = GetRootTransform();
   if (!transform.GetInverse(&invert))
     return transform;
   return invert;
 }
 
-void WindowTreeHost::SetOutputSurfacePadding(const gfx::Insets& padding) {
-  if (output_surface_padding_ == padding)
+void WindowTreeHost::SetOutputSurfacePaddingInPixels(
+    const gfx::Insets& padding_in_pixels) {
+  if (output_surface_padding_in_pixels_ == padding_in_pixels)
     return;
 
-  output_surface_padding_ = padding;
-  OnHostResized(GetBoundsInPixels().size());
+  output_surface_padding_in_pixels_ = padding_in_pixels;
+  OnHostResizedInPixels(GetBoundsInPixels().size());
 }
 
-void WindowTreeHost::UpdateRootWindowSize(const gfx::Size& host_size) {
-  gfx::Rect bounds(output_surface_padding_.left(),
-                   output_surface_padding_.top(), host_size.width(),
-                   host_size.height());
+void WindowTreeHost::UpdateRootWindowSizeInPixels(
+    const gfx::Size& host_size_in_pixels) {
+  gfx::Rect bounds(output_surface_padding_in_pixels_.left(),
+                   output_surface_padding_in_pixels_.top(),
+                   host_size_in_pixels.width(), host_size_in_pixels.height());
   float scale_factor = ui::GetDeviceScaleFactor(window()->layer());
   gfx::RectF new_bounds =
       gfx::ScaleRect(gfx::RectF(bounds), 1.0f / scale_factor);
   window()->layer()->transform().TransformRect(&new_bounds);
   window()->SetBounds(gfx::ToEnclosingRect(new_bounds));
 }
 
-void WindowTreeHost::ConvertPointToNativeScreen(gfx::Point* point) const {
-  ConvertPointToHost(point);
-  gfx::Point location = GetLocationOnNativeScreen();
+void WindowTreeHost::ConvertDIPToScreenInPixels(gfx::Point* point) const {
+  ConvertDIPToPixels(point);
+  gfx::Point location = GetLocationOnScreenInPixels();
   point->Offset(location.x(), location.y());
 }
 
-void WindowTreeHost::ConvertPointFromNativeScreen(gfx::Point* point) const {
-  gfx::Point location = GetLocationOnNativeScreen();
+void WindowTreeHost::ConvertScreenInPixelsToDIP(gfx::Point* point) const {
+  gfx::Point location = GetLocationOnScreenInPixels();
   point->Offset(-location.x(), -location.y());
-  ConvertPointFromHost(point);
+  ConvertPixelsToDIP(point);
 }
 
-void WindowTreeHost::ConvertPointToHost(gfx::Point* point) const {
+void WindowTreeHost::ConvertDIPToPixels(gfx::Point* point) const {
   auto point_3f = gfx::Point3F(gfx::PointF(*point));
   GetRootTransform().TransformPoint(&point_3f);
   *point = gfx::ToFlooredPoint(point_3f.AsPointF());
 }
 
-void WindowTreeHost::ConvertPointFromHost(gfx::Point* point) const {
+void WindowTreeHost::ConvertPixelsToDIP(gfx::Point* point) const {
   auto point_3f = gfx::Point3F(gfx::PointF(*point));
   GetInverseRootTransform().TransformPoint(&point_3f);
   *point = gfx::ToFlooredPoint(point_3f.AsPointF());
 }
 
 void WindowTreeHost::SetCursor(gfx::NativeCursor cursor) {
   last_cursor_ = cursor;
   // A lot of code seems to depend on NULL cursors actually showing an arrow,
   // so just pass everything along to the host.
   SetCursorNative(cursor);
 }
 
 void WindowTreeHost::OnCursorVisibilityChanged(bool show) {
   // Clear any existing mouse hover effects when the cursor becomes invisible.
   // Note we do not need to dispatch a mouse enter when the cursor becomes
   // visible because that can only happen in response to a mouse event, which
   // will trigger its own mouse enter.
   if (!show) {
     ui::EventDispatchDetails details = dispatcher()->DispatchMouseExitAtPoint(
         nullptr, dispatcher()->GetLastMouseLocationInRoot());
     if (details.dispatcher_destroyed)
       return;
   }
 
   OnCursorVisibilityChangedNative(show);
 }
 
-void WindowTreeHost::MoveCursorTo(const gfx::Point& location_in_dip) {
+void WindowTreeHost::MoveCursorToLocationInDIP(
+    const gfx::Point& location_in_dip) {
   gfx::Point host_location(location_in_dip);
-  ConvertPointToHost(&host_location);
+  ConvertDIPToPixels(&host_location);
   MoveCursorToInternal(location_in_dip, host_location);
 }
 
-void WindowTreeHost::MoveCursorToHostLocation(const gfx::Point& host_location) {
-  gfx::Point root_location(host_location);
-  ConvertPointFromHost(&root_location);
-  MoveCursorToInternal(root_location, host_location);
+void WindowTreeHost::MoveCursorToLocationInPixels(
+    const gfx::Point& location_in_pixels) {
+  gfx::Point root_location(location_in_pixels);
+  ConvertPixelsToDIP(&root_location);
+  MoveCursorToInternal(root_location, location_in_pixels);
 }
 
 ui::InputMethod* WindowTreeHost::GetInputMethod() {
   if (!input_method_) {
     input_method_ =
         ui::CreateInputMethod(this, GetAcceleratedWidget()).release();
     owned_input_method_ = true;
   }
   return input_method_;
 }
@@ skipping 66 matching lines @@
     dispatcher_.reset(new WindowEventDispatcher(this));
   }
 }
 
 void WindowTreeHost::OnAcceleratedWidgetAvailable() {
   compositor_->SetAcceleratedWidget(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());
+void WindowTreeHost::OnHostMovedInPixels(
+    const gfx::Point& new_location_in_pixels) {
+  TRACE_EVENT1("ui", "WindowTreeHost::OnHostMovedInPixels", "origin",
+               new_location_in_pixels.ToString());
 
   for (WindowTreeHostObserver& observer : observers_)
-    observer.OnHostMoved(this, new_location);
+    observer.OnHostMovedInPixels(this, new_location_in_pixels);
 }
 
-void WindowTreeHost::OnHostResized(const gfx::Size& new_size) {
-  gfx::Size adjusted_size(new_size);
-  adjusted_size.Enlarge(output_surface_padding_.width(),
-                        output_surface_padding_.height());
+void WindowTreeHost::OnHostResizedInPixels(
+    const gfx::Size& new_size_in_pixels) {
+  gfx::Size adjusted_size(new_size_in_pixels);
+  adjusted_size.Enlarge(output_surface_padding_in_pixels_.width(),
+                        output_surface_padding_in_pixels_.height());
   // The compositor should have the same size as the native root window host.
   // Get the latest scale from display because it might have been changed.
   compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()),
                                adjusted_size);
 
   gfx::Size layer_size = GetBoundsInPixels().size();
   // The layer, and the observers should be notified of the
   // transformed size of the root window.
-  UpdateRootWindowSize(layer_size);
+  UpdateRootWindowSizeInPixels(layer_size);
   for (WindowTreeHostObserver& observer : observers_)
     observer.OnHostResized(this);
 }
 
 void WindowTreeHost::OnHostWorkspaceChanged() {
   for (WindowTreeHostObserver& observer : observers_)
     observer.OnHostWorkspaceChanged(this);
 }
 
 void WindowTreeHost::OnHostCloseRequested() {
@@ skipping 20 matching lines @@
 ui::EventProcessor* WindowTreeHost::GetEventProcessor() {
   return event_processor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHost, private:
 
 void WindowTreeHost::MoveCursorToInternal(const gfx::Point& root_location,
                                           const gfx::Point& host_location) {
   last_cursor_request_position_in_host_ = host_location;
-  MoveCursorToNative(host_location);
+  MoveCursorToScreenLocationInPixels(host_location);
   client::CursorClient* cursor_client = client::GetCursorClient(window());
   if (cursor_client) {
     const display::Display& display =
         display::Screen::GetScreen()->GetDisplayNearestWindow(window());
     cursor_client->SetDisplay(display);
   }
   dispatcher()->OnCursorMovedToRootLocation(root_location);
 }
 
 }  // namespace aura