Full-screen Magnifier: Support warping the cursor on the edge

ash/magnifier/magnification_controller.h

Index: ash/magnifier/magnification_controller.h
diff --git a/ash/magnifier/magnification_controller.h b/ash/magnifier/magnification_controller.h
index f0927b6bd0bdbf14fdb8dd1293bfee68e8e68d1f..19c28b59cd0d3542637889bb207c20c73f990cb1 100644
--- a/ash/magnifier/magnification_controller.h
+++ b/ash/magnifier/magnification_controller.h
@@ -8,53 +8,42 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "ui/aura/event_filter.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 class RootWindow;
+class EventFilter;
 }
 
 namespace ash {
 namespace internal {
 
-class MagnificationController {
+class MagnificationController : public aura::EventFilter {

[sky, 2012/06/19 19:47:52]

Why does the virtual interface implement EventFilter? Isn't that an
implementation detail?

[yoshiki, 2012/06/20 00:23:34]

Done.

  public:
-  MagnificationController();
+  MagnificationController() {}

[sky, 2012/06/19 19:47:52]

Shouldn't this be protected?

[yoshiki, 2012/06/20 00:23:34]

Done.

 
-  virtual ~MagnificationController() {}
+  static MagnificationController* CreateInstance();
 
   // Sets the magnification ratio. 1.0f means no magnification.
-  void SetScale(float scale);
+  virtual void SetScale(float scale, bool animation) = 0;

[sky, 2012/06/19 19:47:52]

animation -> animate in all places.

[yoshiki, 2012/06/20 00:23:34]

Done.

   // Returns the current magnification ratio.
-  float GetScale() const { return scale_; }
+  virtual float GetScale() const = 0;
 
   // Set the top-left point of the magnification window.
-  void MoveWindow(int x, int y);
-  void MoveWindow(const gfx::Point& point);
+  virtual void MoveWindow(int x, int y, bool animation) = 0;
+  virtual void MoveWindow(const gfx::Point& point, bool animation) = 0;
   // Returns the current top-left point of the magnification window.
-  gfx::Point GetWindowPosition() const { return gfx::Point(x_, y_); }
+  virtual gfx::Point GetWindowPosition() const = 0;
 
   // Ensures that the given point/rect is inside the magnification window. If
   // not, the controller moves the window to contain the given point/rect.
-  void EnsureShowRect(const gfx::Rect& rect);
-  void EnsureShowPoint(const gfx::Point& point, bool animation);
+  virtual void EnsureShowRect(const gfx::Rect& rect, bool animation) = 0;

[sky, 2012/06/19 19:47:52]

Why do we need both of these? Can't we have EnsurePointIsVisible and leave it to
the caller to figure out what point is important?

[yoshiki, 2012/06/20 00:23:34]

I'll add the scale adjustment (un-zooming) in case that the magnification window
can't contain the given rect, but it is not implemented in this patch. I added
the TODO comment in Impl::EnsureRectIsVisibleDIP().

On 2012/06/19 19:47:52, sky wrote:

+  virtual void EnsureShowPoint(const gfx::Point& point, bool animation) = 0;
 
  private:
-  aura::RootWindow* root_window_;
-
-  // Current scale, position of the magnification window.
-  float scale_;
-  int x_;
-  int y_;
-
-  // Returns the rect of the magnification window.
-  gfx::Rect GetWindowRect();
-  // Moves the magnification window to new scale and position. This method
-  // should be called internally just after the scale and/or the position are
-  // changed.
-  void RedrawScreen(bool animation);
-
   DISALLOW_COPY_AND_ASSIGN(MagnificationController);

[sky, 2012/06/19 19:47:52]

This is no longer needed.

[yoshiki, 2012/06/20 00:23:34]

Done.

 };