| Index: ui/views/view.cc
|
| diff --git a/ui/views/view.cc b/ui/views/view.cc
|
| index 81f0207bec7cfd07fc2ef3beefb6f6becada10a8..55a1dcad03aec0974a77ccbce1e3ed3a3d59f880 100644
|
| --- a/ui/views/view.cc
|
| +++ b/ui/views/view.cc
|
| @@ -63,6 +63,11 @@ const bool kContextMenuOnMousePress = false;
|
| const bool kContextMenuOnMousePress = true;
|
| #endif
|
|
|
| +// The minimum percentage of a view's area that needs to be covered by a rect
|
| +// representing a touch region in order for that view to be considered by the
|
| +// views fuzzing algorithm.
|
| +static const float kViewsFuzzingOverlap = 0.6;
|
| +
|
| // Saves the drawing state, and restores the state when going out of scope.
|
| class ScopedCanvas {
|
| public:
|
| @@ -700,6 +705,32 @@ void View::ConvertPointToTarget(const View* source,
|
| }
|
|
|
| // static
|
| +void View::ConvertRectToTarget(const View* source,
|
| + const View* target,
|
| + gfx::Rect* rect) {
|
| + if (source == target)
|
| + return;
|
| +
|
| + // |source| can be NULL.
|
| + const View* root = GetHierarchyRoot(target);
|
| + if (source) {
|
| + CHECK_EQ(GetHierarchyRoot(source), root);
|
| +
|
| + if (source != root)
|
| + source->ConvertRectForAncestor(root, rect);
|
| + }
|
| +
|
| + if (target != root)
|
| + target->ConvertRectFromAncestor(root, rect);
|
| +
|
| + // API defines NULL |source| as returning the point in screen coordinates.
|
| + if (!source) {
|
| + rect->set_origin(rect->origin() -
|
| + root->GetWidget()->GetClientAreaBoundsInScreen().OffsetFromOrigin());
|
| + }
|
| +}
|
| +
|
| +// static
|
| void View::ConvertPointToWidget(const View* src, gfx::Point* p) {
|
| DCHECK(src);
|
| DCHECK(p);
|
| @@ -826,19 +857,65 @@ bool View::get_use_acceleration_when_possible() {
|
| // Input -----------------------------------------------------------------------
|
|
|
| View* View::GetEventHandlerForPoint(const gfx::Point& point) {
|
| - // Walk the child Views recursively looking for the View that most
|
| - // tightly encloses the specified point.
|
| + return GetEventHandlerForRect(gfx::Rect(point, gfx::Size(1, 1)));
|
| +}
|
| +
|
| +View* View::GetEventHandlerForRect(const gfx::Rect& rect) {
|
| + // |rect_view| represents the current best candidate to return
|
| + // if rect-based targeting (i.e., fuzzing) is used.
|
| + // |rect_view_distance| is used to keep track of the distance
|
| + // between the center point of |rect_view| and the center
|
| + // point of |rect|.
|
| + View* rect_view = NULL;
|
| + int rect_view_distance = INT_MAX;
|
| +
|
| + // |point_view| represents the view that would have been returned
|
| + // from this function call if point-based targeting were used.
|
| + View* point_view = NULL;
|
| +
|
| for (int i = child_count() - 1; i >= 0; --i) {
|
| View* child = child_at(i);
|
| +
|
| + // Ignore any children which are invisible or do not intersect |rect|.
|
| if (!child->visible())
|
| continue;
|
| + gfx::Rect rect_in_child_coords(rect);
|
| + ConvertRectToTarget(this, child, &rect_in_child_coords);
|
| + if (!child->HitTestRect(rect_in_child_coords))
|
| + continue;
|
|
|
| - gfx::Point point_in_child_coords(point);
|
| - ConvertPointToTarget(this, child, &point_in_child_coords);
|
| - if (child->HitTestPoint(point_in_child_coords))
|
| - return child->GetEventHandlerForPoint(point_in_child_coords);
|
| + View* cur_view = child->GetEventHandlerForRect(rect_in_child_coords);
|
| +
|
| + if (UsePointBasedTargeting(rect))
|
| + return cur_view;
|
| +
|
| + gfx::Rect cur_rect(cur_view->GetLocalBounds());
|
| + ConvertRectToTarget(cur_view, this, &cur_rect);
|
| + if (PercentCoveredBy(cur_rect, rect) >= kViewsFuzzingOverlap) {
|
| + // |cur_view| is a suitable candidate for rect-based targeting.
|
| + // Check to see if it is the closest suitable candidate so far.
|
| + gfx::Point touch_center(rect.CenterPoint());
|
| + // Terry: change this to just use distance between center points.
|
| + int cur_dist = DistanceSquaredFromCenterLineToPoint(touch_center,
|
| + cur_rect);
|
| + if (!rect_view || cur_dist < rect_view_distance) {
|
| + rect_view = cur_view;
|
| + rect_view_distance = cur_dist;
|
| + }
|
| + } else if (!rect_view && !point_view) {
|
| + // Rect-based targeting has not yielded any candidates so far. Check
|
| + // if point-based targeting would have selected |cur_view|.
|
| + gfx::Point point_in_child_coords(rect.CenterPoint());
|
| + ConvertPointToTarget(this, child, &point_in_child_coords);
|
| + if (child->HitTestPoint(point_in_child_coords))
|
| + point_view = child->GetEventHandlerForPoint(point_in_child_coords);
|
| + }
|
| }
|
| - return this;
|
| +
|
| + if (UsePointBasedTargeting(rect) || (!rect_view && !point_view))
|
| + return this;
|
| +
|
| + return rect_view ? rect_view : point_view;
|
| }
|
|
|
| View* View::GetTooltipHandlerForPoint(const gfx::Point& point) {
|
| @@ -1269,6 +1346,52 @@ int View::GetLineScrollIncrement(ScrollView* scroll_view,
|
| return 0;
|
| }
|
|
|
| +// Views fuzzing ---------------------------------------------------------------
|
| +
|
| +// static
|
| +bool View::UsePointBasedTargeting(const gfx::Rect& rect) {
|
| + return rect.width() == 1 && rect.height() == 1;
|
| +}
|
| +
|
| +// static
|
| +float View::PercentCoveredBy(const gfx::Rect& rect_1, const gfx::Rect& rect_2) {
|
| + gfx::Rect intersection(rect_1);
|
| + intersection.Intersect(rect_2);
|
| + float intersection_area = intersection.size().GetArea();
|
| + float rect_1_area = rect_1.size().GetArea();
|
| + return rect_1_area ? intersection_area / rect_1_area : 0;
|
| +}
|
| +
|
| +// The positive distance from |pos| to the nearest endpoint of the interval
|
| +// [start, end] is returned if |pos| lies within the interval, otherwise
|
| +// 0 is returned.
|
| +int DistanceToInterval(int pos, int start, int end) {
|
| + if (pos < start)
|
| + return start - pos;
|
| + if (pos > end)
|
| + return pos - end;
|
| + return 0;
|
| +}
|
| +
|
| +// static
|
| +int View::DistanceSquaredFromCenterLineToPoint(const gfx::Point& point,
|
| + const gfx::Rect& target_rect) {
|
| + gfx::Point center_point = target_rect.CenterPoint();
|
| + int dx = center_point.x() - point.x();
|
| + int dy = center_point.y() - point.y();
|
| +
|
| + if (target_rect.width() > target_rect.height()) {
|
| + dx = DistanceToInterval(point.x(),
|
| + target_rect.x() + (target_rect.height() / 2),
|
| + target_rect.right() - (target_rect.height() / 2));
|
| + } else {
|
| + dy = DistanceToInterval(point.y(),
|
| + target_rect.y() + (target_rect.width() / 2),
|
| + target_rect.bottom() - (target_rect.width() / 2));
|
| + }
|
| + return (dx * dx) + (dy * dy);
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // View, protected:
|
|
|
| @@ -2014,6 +2137,27 @@ bool View::ConvertPointFromAncestor(const View* ancestor,
|
| return result;
|
| }
|
|
|
| +bool View::ConvertRectForAncestor(const View* ancestor,
|
| + gfx::Rect* rect) const {
|
| + gfx::Transform trans;
|
| + // TODO(sad): Have some way of caching the transformation results.
|
| + bool result = GetTransformRelativeTo(ancestor, &trans);
|
| + gfx::RectF r(*rect);
|
| + trans.TransformRect(&r);
|
| + *rect = gfx::ToEnclosingRect(r);
|
| + return result;
|
| +}
|
| +
|
| +bool View::ConvertRectFromAncestor(const View* ancestor,
|
| + gfx::Rect* rect) const {
|
| + gfx::Transform trans;
|
| + bool result = GetTransformRelativeTo(ancestor, &trans);
|
| + gfx::RectF r(*rect);
|
| + trans.TransformRectReverse(&r);
|
| + *rect = gfx::ToEnclosingRect(r);
|
| + return result;
|
| +}
|
| +
|
| // Accelerated painting --------------------------------------------------------
|
|
|
| void View::CreateLayer() {
|
|
|