Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(893)

Unified Diff: Source/core/frame/PinchViewport.cpp

Issue 1167503002: Remove obsolete pinch-zoom related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix for broken SVG layout test Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698