Diff
Modified: trunk/Source/WebCore/ChangeLog (194447 => 194448)
--- trunk/Source/WebCore/ChangeLog 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/ChangeLog 2015-12-30 20:15:27 UTC (rev 194448)
@@ -1,3 +1,46 @@
+2015-12-30 Simon Fraser <[email protected]>
+
+ Add explicit conversions between scrollOffset and scrollPostion, and use them in a few places
+ https://bugs.webkit.org/show_bug.cgi?id=152594
+
+ Reviewed by Sam Weinig.
+
+ Add functions to ScrollableArea to convert between scrollPosition and scrollOffset,
+ and use them in places where code did the math with scrollOrigin.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::minimumScrollPosition):
+ (WebCore::FrameView::maximumScrollPosition): totalContentsSize().width() == contentsWidth(),
+ so we can use the base class maximumScrollPosition(), which also clamps.
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::maximumScrollPosition):
+ (WebCore::ScrollView::setScrollOffset):
+ (WebCore::ScrollView::overhangAmount):
+ (WebCore::ScrollView::updateScrollbars):
+ (WebCore::ScrollView::calculateOverhangAreasForPainting):
+ (WebCore::ScrollView::minimumScrollPosition): Deleted. Can use base class implementation.
+ * platform/ScrollView.h:
+ * platform/ScrollableArea.cpp:
+ (WebCore::ScrollableArea::minimumScrollPosition):
+ (WebCore::ScrollableArea::maximumScrollPosition):
+ (WebCore::ScrollableArea::maximumScrollOffset):
+ (WebCore::ScrollableArea::scrollPositionFromOffset):
+ (WebCore::ScrollableArea::scrollOffsetFromPosition):
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::scrollOrigin):
+ (WebCore::ScrollableArea::scrollOriginChanged):
+ * platform/ios/ScrollViewIOS.mm:
+ (WebCore::ScrollView::unobscuredContentRect):
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::pinnedInDirection):
+ (WebCore::ScrollAnimatorMac::absoluteScrollPosition):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollPosition):
+ (WebCore::RenderLayer::maximumScrollPosition):
+ (WebCore::RenderLayer::overhangAmount):
+ (WebCore::RenderLayer::minimumScrollPosition): Deleted.
+ * rendering/RenderLayer.h:
+
2015-12-30 Zalan Bujtas <[email protected]>
Move InlineTextBox's text decoration painting to its own class.
Modified: trunk/Source/WebCore/page/FrameView.cpp (194447 => 194448)
--- trunk/Source/WebCore/page/FrameView.cpp 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-12-30 20:15:27 UTC (rev 194448)
@@ -1853,9 +1853,9 @@
}
#endif
-IntPoint FrameView::minimumScrollPosition() const
+ScrollPosition FrameView::minimumScrollPosition() const
{
- IntPoint minimumPosition(ScrollView::minimumScrollPosition());
+ ScrollPosition minimumPosition = ScrollView::minimumScrollPosition();
if (frame().isMainFrame() && m_scrollPinningBehavior == PinToBottom)
minimumPosition.setY(maximumScrollPosition().y());
@@ -1863,16 +1863,14 @@
return minimumPosition;
}
-IntPoint FrameView::maximumScrollPosition() const
+ScrollPosition FrameView::maximumScrollPosition() const
{
- IntPoint maximumOffset(contentsWidth() - visibleWidth() - scrollOrigin().x(), totalContentsSize().height() - visibleHeight() - scrollOrigin().y());
+ ScrollPosition maximumPosition = ScrollView::maximumScrollPosition();
- maximumOffset.clampNegativeToZero();
-
if (frame().isMainFrame() && m_scrollPinningBehavior == PinToTop)
- maximumOffset.setY(minimumScrollPosition().y());
+ maximumPosition.setY(minimumScrollPosition().y());
- return maximumOffset;
+ return maximumPosition;
}
void FrameView::viewportContentsChanged()
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (194447 => 194448)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2015-12-30 20:15:27 UTC (rev 194448)
@@ -388,16 +388,12 @@
ScrollPosition ScrollView::maximumScrollPosition() const
{
- IntPoint maximumOffset(contentsWidth() - visibleWidth() - scrollOrigin().x(), totalContentsSize().height() - visibleHeight() - scrollOrigin().y());
- maximumOffset.clampNegativeToZero();
- return maximumOffset;
+ ScrollPosition maximumPosition = ScrollableArea::maximumScrollPosition();
+ // FIXME: can this be moved into the base class?
+ maximumPosition.clampNegativeToZero();
+ return maximumPosition;
}
-ScrollPosition ScrollView::minimumScrollPosition() const
-{
- return IntPoint(-scrollOrigin().x(), -scrollOrigin().y());
-}
-
ScrollPosition ScrollView::adjustScrollPositionWithinRange(const ScrollPosition& scrollPoint) const
{
if (!constrainsScrollingToContentEdge())
@@ -441,18 +437,12 @@
void ScrollView::setScrollOffset(const IntPoint& offset)
{
- int horizontalOffset = offset.x();
- int verticalOffset = offset.y();
- if (constrainsScrollingToContentEdge()) {
- horizontalOffset = std::max(std::min(horizontalOffset, contentsWidth() - visibleWidth()), 0);
- verticalOffset = std::max(std::min(verticalOffset, totalContentsSize().height() - visibleHeight()), 0);
- }
+ IntPoint constrainedOffset = offset;
+ if (constrainsScrollingToContentEdge())
+ constrainedOffset = constrainedOffset.constrainedBetween(IntPoint(), maximumScrollOffset());
- IntSize newOffset = m_scrollOffset;
- newOffset.setWidth(horizontalOffset - scrollOrigin().x());
- newOffset.setHeight(verticalOffset - scrollOrigin().y());
-
- scrollTo(newOffset);
+ ScrollPosition newPosition = scrollPositionFromOffset(constrainedOffset);
+ scrollTo(toIntSize(newPosition));
}
void ScrollView::scrollPositionChangedViaPlatformWidget(const IntPoint& oldPosition, const IntPoint& newPosition)
@@ -567,17 +557,17 @@
{
IntSize stretch;
- int physicalScrollY = scrollPosition().y() + scrollOrigin().y();
- if (physicalScrollY < 0)
- stretch.setHeight(physicalScrollY);
- else if (totalContentsSize().height() && physicalScrollY > totalContentsSize().height() - visibleHeight())
- stretch.setHeight(physicalScrollY - (totalContentsSize().height() - visibleHeight()));
+ // FIXME: use maximumScrollOffset()
+ ScrollOffset scrollOffset = scrollOffsetFromPosition(scrollPosition());
+ if (scrollOffset.y() < 0)
+ stretch.setHeight(scrollOffset.y());
+ else if (totalContentsSize().height() && scrollOffset.y() > totalContentsSize().height() - visibleHeight())
+ stretch.setHeight(scrollOffset.y() - (totalContentsSize().height() - visibleHeight()));
- int physicalScrollX = scrollPosition().x() + scrollOrigin().x();
- if (physicalScrollX < 0)
- stretch.setWidth(physicalScrollX);
- else if (contentsWidth() && physicalScrollX > contentsWidth() - visibleWidth())
- stretch.setWidth(physicalScrollX - (contentsWidth() - visibleWidth()));
+ if (scrollOffset.x() < 0)
+ stretch.setWidth(scrollOffset.x());
+ else if (contentsWidth() && scrollOffset.x() > contentsWidth() - visibleWidth())
+ stretch.setWidth(scrollOffset.x() - (contentsWidth() - visibleWidth()));
return stretch;
}
@@ -765,7 +755,7 @@
adjustedScrollPosition = adjustScrollPositionWithinRange(adjustedScrollPosition);
if (adjustedScrollPosition != scrollPosition() || scrollOriginChanged()) {
- ScrollableArea::scrollToOffsetWithoutAnimation(adjustedScrollPosition + toIntSize(scrollOrigin()));
+ ScrollableArea::scrollToOffsetWithoutAnimation(scrollOffsetFromPosition(adjustedScrollPosition));
resetScrollOriginChanged();
}
@@ -1265,30 +1255,30 @@
{
IntSize scrollbarSpace = scrollbarIntrusion();
- int physicalScrollY = scrollPosition().y() + scrollOrigin().y();
- if (physicalScrollY < 0) {
+ // FIXME: use maximumScrollOffset().
+ ScrollOffset scrollOffset = scrollOffsetFromPosition(scrollPosition());
+ if (scrollOffset.y() < 0) {
horizontalOverhangRect = frameRect();
- horizontalOverhangRect.setHeight(-physicalScrollY);
+ horizontalOverhangRect.setHeight(-scrollOffset.y());
horizontalOverhangRect.setWidth(horizontalOverhangRect.width() - scrollbarSpace.width());
- } else if (totalContentsSize().height() && physicalScrollY > totalContentsSize().height() - visibleHeight()) {
- int height = physicalScrollY - (totalContentsSize().height() - visibleHeight());
+ } else if (totalContentsSize().height() && scrollOffset.y() > totalContentsSize().height() - visibleHeight()) {
+ int height = scrollOffset.y() - (totalContentsSize().height() - visibleHeight());
horizontalOverhangRect = frameRect();
horizontalOverhangRect.setY(frameRect().maxY() - height - scrollbarSpace.height());
horizontalOverhangRect.setHeight(height);
horizontalOverhangRect.setWidth(horizontalOverhangRect.width() - scrollbarSpace.width());
}
- int physicalScrollX = scrollPosition().x() + scrollOrigin().x();
- if (physicalScrollX < 0) {
- verticalOverhangRect.setWidth(-physicalScrollX);
+ if (scrollOffset.x() < 0) {
+ verticalOverhangRect.setWidth(-scrollOffset.x());
verticalOverhangRect.setHeight(frameRect().height() - horizontalOverhangRect.height() - scrollbarSpace.height());
verticalOverhangRect.setX(frameRect().x());
if (horizontalOverhangRect.y() == frameRect().y())
verticalOverhangRect.setY(frameRect().y() + horizontalOverhangRect.height());
else
verticalOverhangRect.setY(frameRect().y());
- } else if (contentsWidth() && physicalScrollX > contentsWidth() - visibleWidth()) {
- int width = physicalScrollX - (contentsWidth() - visibleWidth());
+ } else if (contentsWidth() && scrollOffset.x() > contentsWidth() - visibleWidth()) {
+ int width = scrollOffset.x() - (contentsWidth() - visibleWidth());
verticalOverhangRect.setWidth(width);
verticalOverhangRect.setHeight(frameRect().height() - horizontalOverhangRect.height() - scrollbarSpace.height());
verticalOverhangRect.setX(frameRect().maxX() - width - scrollbarSpace.width());
Modified: trunk/Source/WebCore/platform/ScrollView.h (194447 => 194448)
--- trunk/Source/WebCore/platform/ScrollView.h 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/platform/ScrollView.h 2015-12-30 20:15:27 UTC (rev 194448)
@@ -228,7 +228,6 @@
virtual ScrollPosition scrollPosition() const override { return visibleContentRect(LegacyIOSDocumentVisibleRect).location(); }
virtual ScrollPosition maximumScrollPosition() const override; // The maximum position we can be scrolled to.
- virtual ScrollPosition minimumScrollPosition() const override; // The minimum position we can be scrolled to.
// Adjust the passed in scroll position to keep it between the minimum and maximum positions.
ScrollPosition adjustScrollPositionWithinRange(const ScrollPosition&) const;
Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (194447 => 194448)
--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2015-12-30 20:15:27 UTC (rev 194448)
@@ -534,14 +534,29 @@
ScrollPosition ScrollableArea::minimumScrollPosition() const
{
- return IntPoint();
+ return scrollPositionFromOffset(ScrollPosition());
}
ScrollPosition ScrollableArea::maximumScrollPosition() const
{
- return IntPoint(totalContentsSize().width() - visibleWidth(), totalContentsSize().height() - visibleHeight());
+ return scrollPositionFromOffset(ScrollPosition(totalContentsSize() - visibleSize()));
}
+ScrollOffset ScrollableArea::maximumScrollOffset() const
+{
+ return ScrollOffset(totalContentsSize() - visibleSize());
+}
+
+ScrollPosition ScrollableArea::scrollPositionFromOffset(ScrollOffset offset) const
+{
+ return IntPoint(toIntSize(offset) - toIntSize(m_scrollOrigin));
+}
+
+ScrollOffset ScrollableArea::scrollOffsetFromPosition(ScrollPosition position) const
+{
+ return IntPoint(toIntSize(position) + toIntSize(m_scrollOrigin));
+}
+
bool ScrollableArea::scrolledToTop() const
{
return scrollPosition().y() <= minimumScrollPosition().y();
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (194447 => 194448)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2015-12-30 20:15:27 UTC (rev 194448)
@@ -144,9 +144,6 @@
// This getter will return null if the ScrollAnimator hasn't been created yet.
ScrollAnimator* existingScrollAnimator() const { return m_scrollAnimator.get(); }
- const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
- bool scrollOriginChanged() const { return m_scrollOriginChanged; }
-
virtual bool isActive() const = 0;
virtual int scrollSize(ScrollbarOrientation) const = 0;
virtual int scrollPosition(Scrollbar*) const = 0;
@@ -184,10 +181,18 @@
virtual Scrollbar* horizontalScrollbar() const { return 0; }
virtual Scrollbar* verticalScrollbar() const { return 0; }
+ const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
+ bool scrollOriginChanged() const { return m_scrollOriginChanged; }
+
virtual ScrollPosition scrollPosition() const;
virtual ScrollPosition minimumScrollPosition() const;
virtual ScrollPosition maximumScrollPosition() const;
+ ScrollOffset maximumScrollOffset() const;
+
+ WEBCORE_EXPORT ScrollPosition scrollPositionFromOffset(ScrollOffset) const;
+ WEBCORE_EXPORT ScrollOffset scrollOffsetFromPosition(ScrollPosition) const;
+
WEBCORE_EXPORT virtual bool scrolledToTop() const;
WEBCORE_EXPORT virtual bool scrolledToBottom() const;
WEBCORE_EXPORT virtual bool scrolledToLeft() const;
Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (194447 => 194448)
--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2015-12-30 20:15:27 UTC (rev 194448)
@@ -107,8 +107,10 @@
return enclosingIntRect(r);
}
- if (!m_unobscuredContentSize.isEmpty())
+ if (!m_unobscuredContentSize.isEmpty()) {
+ // FIXME: is this correct in RTL documents?
return IntRect(scrollOrigin() + m_scrollOffset, roundedIntSize(m_unobscuredContentSize));
+ }
return unobscuredContentRectInternal();
}
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (194447 => 194448)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-12-30 20:15:27 UTC (rev 194448)
@@ -1154,18 +1154,18 @@
FloatSize limitDelta;
if (fabsf(direction.height()) >= fabsf(direction.width())) {
if (direction.height() < 0) {
- // We are trying to scroll up. Make sure we are not pinned to the top
+ // We are trying to scroll up. Make sure we are not pinned to the top
limitDelta.setHeight(m_scrollableArea.visibleContentRect().y() + m_scrollableArea.scrollOrigin().y());
} else {
- // We are trying to scroll down. Make sure we are not pinned to the bottom
+ // We are trying to scroll down. Make sure we are not pinned to the bottom
limitDelta.setHeight(m_scrollableArea.totalContentsSize().height() - (m_scrollableArea.visibleContentRect().maxY() + m_scrollableArea.scrollOrigin().y()));
}
} else if (direction.width()) {
if (direction.width() < 0) {
- // We are trying to scroll left. Make sure we are not pinned to the left
+ // We are trying to scroll left. Make sure we are not pinned to the left
limitDelta.setWidth(m_scrollableArea.visibleContentRect().x() + m_scrollableArea.scrollOrigin().x());
} else {
- // We are trying to scroll right. Make sure we are not pinned to the right
+ // We are trying to scroll right. Make sure we are not pinned to the right
limitDelta.setWidth(m_scrollableArea.totalContentsSize().width() - (m_scrollableArea.visibleContentRect().maxX() + m_scrollableArea.scrollOrigin().x()));
}
}
@@ -1284,7 +1284,8 @@
IntPoint ScrollAnimatorMac::absoluteScrollPosition()
{
- return m_scrollableArea.visibleContentRect().location() + m_scrollableArea.scrollOrigin();
+ // FIXME: can this use m_scrollableArea.scrollPosition()?
+ return m_scrollableArea.scrollOffsetFromPosition(m_scrollableArea.visibleContentRect().location());
}
void ScrollAnimatorMac::immediateScrollByWithoutContentEdgeConstraints(const FloatSize& delta)
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (194447 => 194448)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-12-30 20:15:27 UTC (rev 194448)
@@ -2742,18 +2742,14 @@
ScrollPosition RenderLayer::scrollPosition() const
{
+ // FIXME: This needs scrollOffset/scrollPosition disambiguation.
return ScrollPosition(m_scrollOffset);
}
-ScrollPosition RenderLayer::minimumScrollPosition() const
-{
- return -scrollOrigin();
-}
-
ScrollPosition RenderLayer::maximumScrollPosition() const
{
// FIXME: m_scrollSize may not be up-to-date if m_scrollDimensionsDirty is true.
- return -scrollOrigin() + roundedIntSize(m_scrollSize) - visibleContentRectIncludingScrollbars(ContentsVisibleRect).size();
+ return scrollPositionFromOffset(roundedIntPoint(m_scrollSize) - visibleContentRectIncludingScrollbars(ContentsVisibleRect).size());
}
IntRect RenderLayer::visibleContentRectInternal(VisibleContentRectIncludesScrollbars scrollbarInclusion, VisibleContentRectBehavior) const
@@ -2773,17 +2769,17 @@
IntSize stretch;
- int physicalScrollY = scrollPosition().y() + scrollOrigin().y();
- if (physicalScrollY < 0)
- stretch.setHeight(physicalScrollY);
- else if (scrollableContentsSize().height() && physicalScrollY > scrollableContentsSize().height() - visibleHeight())
- stretch.setHeight(physicalScrollY - (scrollableContentsSize().height() - visibleHeight()));
+ // FIXME: use maximumScrollOffset()
+ ScrollOffset scrollOffset = scrollOffsetFromPosition(scrollOrigin());
+ if (scrollOffset.y() < 0)
+ stretch.setHeight(scrollOffset.y());
+ else if (scrollableContentsSize().height() && scrollOffset.y() > scrollableContentsSize().height() - visibleHeight())
+ stretch.setHeight(scrollOffset.y() - (scrollableContentsSize().height() - visibleHeight()));
- int physicalScrollX = scrollPosition().x() + scrollOrigin().x();
- if (physicalScrollX < 0)
- stretch.setWidth(physicalScrollX);
- else if (scrollableContentsSize().width() && physicalScrollX > scrollableContentsSize().width() - visibleWidth())
- stretch.setWidth(physicalScrollX - (scrollableContentsSize().width() - visibleWidth()));
+ if (scrollOffset.x() < 0)
+ stretch.setWidth(scrollOffset.x());
+ else if (scrollableContentsSize().width() && scrollOffset.x() > scrollableContentsSize().width() - visibleWidth())
+ stretch.setWidth(scrollOffset.x() - (scrollableContentsSize().width() - visibleWidth()));
return stretch;
#else
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (194447 => 194448)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2015-12-30 20:15:27 UTC (rev 194448)
@@ -864,9 +864,10 @@
virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override;
virtual int scrollSize(ScrollbarOrientation) const override;
virtual void setScrollOffset(const IntPoint&) override;
+
virtual ScrollPosition scrollPosition() const override;
- virtual ScrollPosition minimumScrollPosition() const override;
virtual ScrollPosition maximumScrollPosition() const override;
+
virtual IntRect visibleContentRectInternal(VisibleContentRectIncludesScrollbars, VisibleContentRectBehavior) const override;
virtual IntSize visibleSize() const override;
virtual IntSize contentsSize() const override;
Modified: trunk/Source/WebKit2/ChangeLog (194447 => 194448)
--- trunk/Source/WebKit2/ChangeLog 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-30 20:15:27 UTC (rev 194448)
@@ -1,3 +1,18 @@
+2015-12-30 Simon Fraser <[email protected]>
+
+ Add explicit conversions between scrollOffset and scrollPostion, and use them in a few places
+ https://bugs.webkit.org/show_bug.cgi?id=152594
+
+ Reviewed by Sam Weinig.
+
+ Add functions to ScrollableArea to convert between scrollPosition and scrollOffset,
+ and use them in places where code did the math with scrollOrigin.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::updateScrolledExposedRect):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::updateScrolledExposedRect):
+
2015-12-30 Zan Dobersek <[email protected]>
[TexMap] Clean up TextureMapperAnimation, TextureMapperAnimations
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (194447 => 194448)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-12-30 20:15:27 UTC (rev 194448)
@@ -270,8 +270,8 @@
#if !PLATFORM(IOS)
if (!m_exposedRect.isInfinite()) {
- IntPoint scrollPositionWithOrigin = frameView->scrollPosition() + toIntSize(frameView->scrollOrigin());
- m_scrolledExposedRect.moveBy(scrollPositionWithOrigin);
+ ScrollOffset scrollOffset = frameView->scrollOffsetFromPosition(frameView->scrollPosition());
+ m_scrolledExposedRect.moveBy(scrollOffset);
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (194447 => 194448)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-12-30 17:19:03 UTC (rev 194447)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-12-30 20:15:27 UTC (rev 194448)
@@ -512,8 +512,8 @@
#if !PLATFORM(IOS)
if (!m_exposedRect.isInfinite()) {
- IntPoint scrollPositionWithOrigin = frameView->scrollPosition() + toIntSize(frameView->scrollOrigin());
- m_scrolledExposedRect.moveBy(scrollPositionWithOrigin);
+ ScrollOffset scrollOffset = frameView->scrollOffsetFromPosition(frameView->scrollPosition());
+ m_scrolledExposedRect.moveBy(scrollOffset);
}
#endif
