Chromium Code Reviews| Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp |
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp |
| index 42bae0b72a85e2141f46a13709ba8223a6526927..5529d4b831590eb5623e2651513692373b0f3baf 100644 |
| --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp |
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp |
| @@ -86,6 +86,12 @@ |
| namespace blink { |
| +static LayoutRect localToAbsolute(LayoutBox& offset, LayoutRect rect) { |
| + return LayoutRect( |
| + offset.localToAbsoluteQuad(FloatQuad(FloatRect(rect)), UseTransforms) |
| + .boundingBox()); |
| +} |
| + |
| PaintLayerScrollableAreaRareData::PaintLayerScrollableAreaRareData() {} |
| const int ResizerControlExpandRatioForTouch = 2; |
| @@ -1644,24 +1650,18 @@ LayoutRect PaintLayerScrollableArea::scrollIntoView( |
| ScrollOffset newScrollOffset(clampScrollOffset(roundedIntSize( |
| toScrollOffset(FloatPoint(r.location()) + oldScrollOffset)))); |
| - if (newScrollOffset == oldScrollOffset) { |
| - return LayoutRect( |
| - box() |
| - .localToAbsoluteQuad(FloatQuad(FloatRect(intersection( |
| - layerBounds, localExposeRect))), |
| - UseTransforms) |
| - .boundingBox()); |
| + if (newScrollOffset != oldScrollOffset) { |
|
bokan
2017/01/04 19:41:24
I think there's no reason to keep the `if`, it's s
|
| + setScrollOffset(newScrollOffset, scrollType, ScrollBehaviorInstant); |
| + ScrollOffset scrollOffsetDifference = getScrollOffset() - oldScrollOffset; |
| + localExposeRect.move(-LayoutSize(scrollOffsetDifference)); |
| } |
| - |
| - setScrollOffset(newScrollOffset, scrollType, ScrollBehaviorInstant); |
| - ScrollOffset scrollOffsetDifference = getScrollOffset() - oldScrollOffset; |
| - localExposeRect.move(-LayoutSize(scrollOffsetDifference)); |
| - return LayoutRect( |
| - box() |
| - .localToAbsoluteQuad( |
| - FloatQuad(FloatRect(intersection(layerBounds, localExposeRect))), |
| - UseTransforms) |
| - .boundingBox()); |
| + LayoutRect intersect = |
| + localToAbsolute(box(), intersection(layerBounds, localExposeRect)); |
| + if (intersect.isEmpty() && !layerBounds.isEmpty() && |
| + !localExposeRect.isEmpty()) { |
| + return localToAbsolute(box(), localExposeRect); |
| + } |
| + return intersect; |
| } |
| void PaintLayerScrollableArea::updateScrollableAreaSet(bool hasOverflow) { |