| Index: third_party/WebKit/Source/core/page/SpatialNavigation.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/SpatialNavigation.cpp b/third_party/WebKit/Source/core/page/SpatialNavigation.cpp
|
| index d3782c1ad726872177f7c57ae9d145c61796c2e1..a7b43f4f3c00dead6c27f060fd23654cb1d7088f 100644
|
| --- a/third_party/WebKit/Source/core/page/SpatialNavigation.cpp
|
| +++ b/third_party/WebKit/Source/core/page/SpatialNavigation.cpp
|
| @@ -111,16 +111,18 @@ static bool rectsIntersectOnOrthogonalAxis(WebFocusType type,
|
| // For overlapping rects, |a| is considered to be below |b|
|
| // if both edges of |a| are below the respective ones of |b|
|
| static inline bool below(const LayoutRect& a, const LayoutRect& b) {
|
| - return a.y() >= b.maxY() || (a.y() >= b.y() && a.maxY() > b.maxY() &&
|
| - a.x() < b.maxX() && a.maxX() > b.x());
|
| + return a.y() >= b.maxY() ||
|
| + (a.y() >= b.y() && a.maxY() > b.maxY() && a.x() < b.maxX() &&
|
| + a.maxX() > b.x());
|
| }
|
|
|
| // Return true if rect |a| is on the right of |b|. False otherwise.
|
| // For overlapping rects, |a| is considered to be on the right of |b|
|
| // if both edges of |a| are on the right of the respective ones of |b|
|
| static inline bool rightOf(const LayoutRect& a, const LayoutRect& b) {
|
| - return a.x() >= b.maxX() || (a.x() >= b.x() && a.maxX() > b.maxX() &&
|
| - a.y() < b.maxY() && a.maxY() > b.y());
|
| + return a.x() >= b.maxX() ||
|
| + (a.x() >= b.x() && a.maxX() > b.maxX() && a.y() < b.maxY() &&
|
| + a.maxY() > b.y());
|
| }
|
|
|
| static bool isRectInDirection(WebFocusType type,
|
| @@ -676,9 +678,10 @@ LayoutRect virtualRectForAreaElementAndDirection(HTMLAreaElement& area,
|
| // flatten the rect of the area elements to minimize the effect of overlapping
|
| // areas.
|
| LayoutRect rect = virtualRectForDirection(
|
| - type, rectToAbsoluteCoordinates(
|
| - area.document().frame(),
|
| - area.computeAbsoluteRect(area.imageElement()->layoutObject())),
|
| + type,
|
| + rectToAbsoluteCoordinates(
|
| + area.document().frame(),
|
| + area.computeAbsoluteRect(area.imageElement()->layoutObject())),
|
| LayoutUnit(1));
|
| return rect;
|
| }
|
|
|