| Index: ui/views/view.h
|
| diff --git a/ui/views/view.h b/ui/views/view.h
|
| index 314ebb7ddeaef6756bfa2450148a5c6badcb4062..5ba242464086aaa1672191ccdeaa326a9a959eab 100644
|
| --- a/ui/views/view.h
|
| +++ b/ui/views/view.h
|
| @@ -559,7 +559,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
|
|
| // Convenience functions which calls into GetEventHandler() with
|
| // a 1x1 rect centered at |point|.
|
| - View* GetEventHandlerForPoint(const gfx::Point& point);
|
| + View* GetEventHandlerForPoint(const gfx::PointF& point);
|
|
|
| // If point-based targeting should be used, return the deepest visible
|
| // descendant that contains the center point of |rect|.
|
| @@ -568,7 +568,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| // its area covered by |rect|. If no such descendant exists, return the
|
| // deepest visible descendant that contains the center point of |rect|.
|
| // See http://goo.gl/3Jp2BD for more information about rect-based targeting.
|
| - virtual View* GetEventHandlerForRect(const gfx::Rect& rect);
|
| + virtual View* GetEventHandlerForRect(const gfx::RectF& rect);
|
|
|
| // Returns the deepest visible descendant that contains the specified point
|
| // and supports tooltips. If the view does not contain the point, returns
|
| @@ -584,10 +584,10 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
|
|
| // A convenience function which calls HitTestRect() with a rect of size
|
| // 1x1 and an origin of |point|.
|
| - bool HitTestPoint(const gfx::Point& point) const;
|
| + bool HitTestPoint(const gfx::PointF& point) const;
|
|
|
| // Tests whether |rect| intersects this view's bounds.
|
| - virtual bool HitTestRect(const gfx::Rect& rect) const;
|
| + virtual bool HitTestRect(const gfx::RectF& rect) const;
|
|
|
| // Returns true if the mouse cursor is over |view| and mouse events are
|
| // enabled.
|
| @@ -924,7 +924,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
|
|
| // Returns true if the mouse was dragged enough to start a drag operation.
|
| // delta_x and y are the distance the mouse was dragged.
|
| - static bool ExceededDragThreshold(const gfx::Vector2d& delta);
|
| + static bool ExceededDragThreshold(const gfx::Vector2dF& delta);
|
|
|
| // Accessibility -------------------------------------------------------------
|
|
|
| @@ -988,13 +988,13 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| // Sets possible_drag to true and start_pt to the specified point.
|
| // This is invoked by the target view if it detects the press may generate
|
| // a drag.
|
| - void PossibleDrag(const gfx::Point& p);
|
| + void PossibleDrag(const gfx::PointF& p);
|
|
|
| // Whether the press may generate a drag.
|
| bool possible_drag;
|
|
|
| // Coordinates of the mouse press.
|
| - gfx::Point start_pt;
|
| + gfx::PointF start_pt;
|
| };
|
|
|
| // Size and disposition ------------------------------------------------------
|
| @@ -1182,8 +1182,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| // the DragController. Subclasses may wish to override rather than install
|
| // a DragController.
|
| // See DragController for a description of these methods.
|
| - virtual int GetDragOperations(const gfx::Point& press_pt);
|
| - virtual void WriteDragData(const gfx::Point& press_pt, OSExchangeData* data);
|
| + virtual int GetDragOperations(const gfx::PointF& press_pt);
|
| + virtual void WriteDragData(const gfx::PointF& press_pt, OSExchangeData* data);
|
|
|
| // Returns whether we're in the middle of a drag session that was initiated
|
| // by us.
|
| @@ -1418,7 +1418,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| // in the view's coordinate system.
|
| // Returns true if a drag was started.
|
| bool DoDrag(const ui::LocatedEvent& event,
|
| - const gfx::Point& press_pt,
|
| + const gfx::PointF& press_pt,
|
| ui::DragDropTypes::DragEventSource source);
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
|
|