| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| index cfeedd4c6bbd355bf8b39c708de3956c23141360..413f89baff71570d483a6fafaa8485ecf6c23a62 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| @@ -3722,9 +3722,8 @@ bool LayoutBlockFlow::hitTestFloats(HitTestResult& result,
|
|
|
| LayoutPoint adjustedLocation = accumulatedOffset;
|
| if (isLayoutView()) {
|
| - DoublePoint position =
|
| - toLayoutView(this)->frameView()->scrollPositionDouble();
|
| - adjustedLocation.move(position.x(), position.y());
|
| + ScrollOffset offset = toLayoutView(this)->frameView()->scrollOffset();
|
| + adjustedLocation.move(LayoutSize(offset));
|
| }
|
|
|
| const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
|
| @@ -4019,7 +4018,7 @@ void LayoutBlockFlow::positionDialog() {
|
| FrameView* frameView = document().view();
|
| LayoutUnit top = LayoutUnit((style()->position() == FixedPosition)
|
| ? 0
|
| - : frameView->scrollOffset().height());
|
| + : frameView->scrollOffsetInt().height());
|
| int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height();
|
| if (size().height() < visibleHeight)
|
| top += (visibleHeight - size().height()) / 2;
|
|
|