| Index: Source/core/rendering/RenderLayerScrollableArea.cpp
|
| diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| index 806fdaf31e92388deb1fa0b23ddf41b13abfe004..e6efd178d18fc200563ef4135e762b5317a58379 100644
|
| --- a/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| +++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
|
| @@ -344,11 +344,9 @@ int RenderLayerScrollableArea::scrollSize(ScrollbarOrientation orientation) cons
|
|
|
| void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
|
| {
|
| - if (!box().isMarquee()) {
|
| - // Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
|
| - if (m_scrollDimensionsDirty)
|
| - computeScrollDimensions();
|
| - }
|
| + // Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
|
| + if (m_scrollDimensionsDirty)
|
| + computeScrollDimensions();
|
|
|
| if (scrollOffset() == toIntSize(newScrollOffset))
|
| return;
|
| @@ -388,7 +386,7 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
|
|
|
| bool requiresPaintInvalidation = true;
|
|
|
| - if (!box().isMarquee() && box().view()->compositor()->inCompositingMode()) {
|
| + if (box().view()->compositor()->inCompositingMode()) {
|
| // Hits in virtual/gpu/fast/canvas/canvas-scroll-path-into-view.html.
|
| DisableCompositingQueryAsserts disabler;
|
| bool onlyScrolledCompositedLayers = scrollsOverflow()
|
| @@ -576,13 +574,11 @@ void RenderLayerScrollableArea::updateAfterLayout()
|
|
|
| computeScrollDimensions();
|
|
|
| - if (!box().isMarquee()) {
|
| - // Layout may cause us to be at an invalid scroll position. In this case we need
|
| - // to pull our scroll offsets back to the max (or push them up to the min).
|
| - IntSize clampedScrollOffset = clampScrollOffset(adjustedScrollOffset());
|
| - if (clampedScrollOffset != adjustedScrollOffset())
|
| - scrollToOffset(clampedScrollOffset);
|
| - }
|
| + // Layout may cause us to be at an invalid scroll position. In this case we need
|
| + // to pull our scroll offsets back to the max (or push them up to the min).
|
| + IntSize clampedScrollOffset = clampScrollOffset(adjustedScrollOffset());
|
| + if (clampedScrollOffset != adjustedScrollOffset())
|
| + scrollToOffset(clampedScrollOffset);
|
|
|
| if (originalScrollOffset != adjustedScrollOffset())
|
| scrollToOffsetWithoutAnimation(-scrollOrigin() + adjustedScrollOffset());
|
|
|