Rename WindowTreeHost functions to indicate pixels/dips.

ui/aura/window_tree_host.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
 #define UI_AURA_WINDOW_TREE_HOST_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 34 matching lines @@
 
 // WindowTreeHost bridges between a native window and the embedded RootWindow.
 // It provides the accelerated widget and maps events from the native os to
 // aura.
 class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
                                    public ui::EventSource {
  public:
   ~WindowTreeHost() override;
 
   // Creates a new WindowTreeHost. The caller owns the returned value.
-  static WindowTreeHost* Create(const gfx::Rect& bounds);
+  static WindowTreeHost* Create(const gfx::Rect& bounds_in_pixels);
 
   // Returns the WindowTreeHost for the specified accelerated widget, or NULL
   // if there is none associated.
   static WindowTreeHost* GetForAcceleratedWidget(gfx::AcceleratedWidget widget);
 
   void InitHost();
 
   void InitCompositor();
 
   void AddObserver(WindowTreeHostObserver* observer);
@@ skipping 12 matching lines @@
 
   ui::Compositor* compositor() { return compositor_.get(); }
 
   // Gets/Sets the root window's transform.
   virtual gfx::Transform GetRootTransform() const;
   virtual void SetRootTransform(const gfx::Transform& transform);
   virtual gfx::Transform GetInverseRootTransform() const;
 
   // Sets padding applied to the output surface. The output surface is sized to
   // to the size of the host plus output surface padding. |window()| is offset
-  // by |padding|, that is, |window|'s origin is set to padding.left(),
-  // padding.top().
+  // by |padding_in_pixels|, that is, |window|'s origin is set to
+  // padding_in_pixels.left(), padding_in_pixels.top().
   // This does not impact the bounds as returned from GetBounds(), only the
   // output surface size and location of window(). Additionally window() is
   // sized to the size set by bounds (more specifically the size passed to
-  // OnHostResized()), but the location of window() is set to that of
-  // |padding|.
-  void SetOutputSurfacePadding(const gfx::Insets& padding);
+  // OnHostResizedInPixels()), but the location of window() is set to that of
+  // |padding_in_pixels|.
+  void SetOutputSurfacePaddingInPixels(const gfx::Insets& padding_in_pixels);
 
-  // Updates the root window's size using |host_size|, current
+  // Updates the root window's size using |host_size_in_pixels|, current
   // transform and outsets.
-  virtual void UpdateRootWindowSize(const gfx::Size& host_size);
+  virtual void UpdateRootWindowSizeInPixels(
+      const gfx::Size& host_size_in_pixels);
 
   // Converts |point| from the root window's coordinate system to native
   // screen's.
-  void ConvertPointToNativeScreen(gfx::Point* point) const;
+  void ConvertPointFromDIPToNativeScreen(gfx::Point* point) const;

[sky, 2016/11/26 17:09:54]

I find the use of screen and host in these function names confusing. This
function is really ConvertPointFromHostDIPToScreenPixels, but I'm not sure
'host' really adds much. WDYT of
ConvertDIPToScreenInPixels/ConvertScreenPixelsToDIP?

for the host ones ConvertDIPToPixels() and ConvertPixelsToDIP.

 
   // Converts |point| from native screen coordinate system to the root window's.
-  void ConvertPointFromNativeScreen(gfx::Point* point) const;
+  void ConvertPointFromNativeScreenToDIP(gfx::Point* point) const;
 
   // Converts |point| from the root window's coordinate system to the
   // host window's.
-  void ConvertPointToHost(gfx::Point* point) const;
+  void ConvertPointFromDIPToHost(gfx::Point* point) const;
 
   // Converts |point| from the host window's coordinate system to the
   // root window's.
-  void ConvertPointFromHost(gfx::Point* point) const;
+  void ConvertPointFromHostToDIP(gfx::Point* point) const;
 
   // Cursor.
   // Sets the currently-displayed cursor. If the cursor was previously hidden
   // via ShowCursor(false), it will remain hidden until ShowCursor(true) is
   // called, at which point the cursor that was last set via SetCursor() will be
   // used.
   void SetCursor(gfx::NativeCursor cursor);
 
   // Invoked when the cursor's visibility has changed.
   void OnCursorVisibilityChanged(bool visible);
 
   // Moves the cursor to the specified location relative to the root window.
-  void MoveCursorTo(const gfx::Point& location);
+  void MoveCursorToLocationInDIP(const gfx::Point& location_in_dip);
 
   // Moves the cursor to the |host_location| given in host coordinates.
-  void MoveCursorToHostLocation(const gfx::Point& host_location);
+  void MoveCursorToHostLocationInPixels(

[sky, 2016/11/26 17:09:54]

Similarly here remove host, just MoveCursorToLocationInPixels.

+      const gfx::Point& host_location_in_pixels);
 
   gfx::NativeCursor last_cursor() const { return last_cursor_; }
 
   // Gets the InputMethod instance, if NULL, creates & owns it.
   ui::InputMethod* GetInputMethod();
 
   // Sets a shared unowned InputMethod. This is used when there is a singleton
   // InputMethod shared between multiple WindowTreeHost instances.
   //
   // This is used for Ash only. There are 2 reasons:
@@ skipping 47 matching lines @@
   WindowTreeHost();
   explicit WindowTreeHost(std::unique_ptr<WindowPort> window_port);
 
   void DestroyCompositor();
   void DestroyDispatcher();
 
   void CreateCompositor();
   void OnAcceleratedWidgetAvailable();
 
   // Returns the location of the RootWindow on native screen.
-  virtual gfx::Point GetLocationOnNativeScreen() const = 0;
+  virtual gfx::Point GetLocationOnNativeScreenInPixels() const = 0;
 
-  void OnHostMoved(const gfx::Point& new_location);
-  void OnHostResized(const gfx::Size& new_size);
+  void OnHostMovedInPixels(const gfx::Point& new_location_in_pixels);
+  void OnHostResizedInPixels(const gfx::Size& new_size_in_pixels);
   void OnHostWorkspaceChanged();
   void OnHostCloseRequested();
   void OnHostActivated();
   void OnHostLostWindowCapture();
 
   // Sets the currently displayed cursor.
   virtual void SetCursorNative(gfx::NativeCursor cursor) = 0;
 
   // Moves the cursor to the specified location relative to the root window.
-  virtual void MoveCursorToNative(const gfx::Point& location) = 0;
+  virtual void MoveCursorToNativeInPixels(

[sky, 2016/11/26 17:09:54]

MoveCursorToScreenLocationInPixels?

+      const gfx::Point& location_in_pixels) = 0;
 
   // kCalled when the cursor visibility has changed.
   virtual void OnCursorVisibilityChangedNative(bool show) = 0;
 
   // Shows the WindowTreeHost.
   virtual void ShowImpl() = 0;
 
   // Hides the WindowTreeHost.
   virtual void HideImpl() = 0;
 
   virtual gfx::ICCProfile GetICCProfileForCurrentDisplay();
 
   // Overridden from ui::EventSource:
   ui::EventProcessor* GetEventProcessor() override;
 
  private:
   friend class test::WindowTreeHostTestApi;
 
   // Moves the cursor to the specified location. This method is internally used
-  // by MoveCursorTo() and MoveCursorToHostLocation().
+  // by MoveCursorToLocationInDIP() and MoveCursorToHostLocationInPixels().
   void MoveCursorToInternal(const gfx::Point& root_location,
                             const gfx::Point& host_location);
 
   // We don't use a std::unique_ptr for |window_| since we need this ptr to be
   // valid during its deletion. (Window's dtor notifies observers that may
   // attempt to reach back up to access this object which will be valid until
   // the end of the dtor).
   Window* window_;  // Owning.
 
   base::ObserverList<WindowTreeHostObserver> observers_;
 
   std::unique_ptr<WindowEventDispatcher> dispatcher_;
 
   std::unique_ptr<ui::Compositor> compositor_;
 
   // Last cursor set.  Used for testing.
   gfx::NativeCursor last_cursor_;
   gfx::Point last_cursor_request_position_in_host_;
 
   std::unique_ptr<ui::ViewProp> prop_;
 
   // The InputMethod instance used to process key events.
   // If owned it, it is created in GetInputMethod() method;
   // If not owned it, it is passed in through SetSharedInputMethod() method.
   ui::InputMethod* input_method_;
 
   // Whether the InputMethod instance is owned by this WindowTreeHost.
   bool owned_input_method_;
 
-  gfx::Insets output_surface_padding_;
+  gfx::Insets output_surface_padding_in_pixels_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_TREE_HOST_H_