| Index: Source/core/frame/PinchViewport.cpp
|
| diff --git a/Source/core/frame/PinchViewport.cpp b/Source/core/frame/PinchViewport.cpp
|
| index 57da03677006090e1639d12cac367c0c09ce580d..859d5d1a447e2094966f31aba5d23b2a4175e832 100644
|
| --- a/Source/core/frame/PinchViewport.cpp
|
| +++ b/Source/core/frame/PinchViewport.cpp
|
| @@ -198,25 +198,15 @@ void PinchViewport::setScaleAndLocation(float scale, const FloatPoint& location)
|
| frameHost().chrome().client().pageScaleFactorChanged();
|
| }
|
|
|
| - // Old-style pinch sets scale here but we shouldn't call into the
|
| - // location code below. Can be removed when there's no old-style pinch.
|
| - // FIXME(bokan): Remove when cleaning up old pinch code.
|
| - if (!m_innerViewportScrollLayer) {
|
| - if (valuesChanged)
|
| - mainFrame()->loader().saveScrollState();
|
| -
|
| - return;
|
| - }
|
| -
|
| FloatPoint clampedOffset(clampOffsetToBoundaries(location));
|
|
|
| if (clampedOffset != m_offset) {
|
| m_offset = clampedOffset;
|
| scrollAnimator()->setCurrentPosition(m_offset);
|
|
|
| - ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordinator();
|
| - ASSERT(coordinator);
|
| - coordinator->scrollableAreaScrollLayerDidChange(this);
|
| + // SVG runs with accelerated compositing disabled so no ScrollingCoordinator.
|
| + if (ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordinator())
|
| + coordinator->scrollableAreaScrollLayerDidChange(this);
|
|
|
| Document* document = mainFrame()->document();
|
| document->enqueueScrollEventForNode(document);
|
|
|