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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 819953002: Mac: Update scrollbar size and input position during impl-overscroll (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Peure virtual Created 6 years 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 | « Source/web/WebPluginScrollbarImpl.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 5e21123d026f58b4ec1f0cfb3f5fde7051ac52ba..979a54dd8efe30cf60b7b1844cdc3f8a1b9e9274 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -4307,7 +4307,10 @@ void WebViewImpl::applyViewportDeltas(
{
ASSERT(pinchVirtualViewportEnabled());
- if (!mainFrameImpl() || !mainFrameImpl()->frameView())
+ if (!mainFrameImpl())
+ return;
+ FrameView* frameView = mainFrameImpl()->frameView();
+ if (!frameView)
return;
setTopControlsContentOffset(m_topControlsContentOffset + topControlsDelta);
@@ -4319,6 +4322,8 @@ void WebViewImpl::applyViewportDeltas(
if (pageScaleDelta != 1)
m_doubleTapZoomPending = false;
+ frameView->setElasticOverscroll(elasticOverscrollDelta + frameView->elasticOverscroll());
+
IntPoint mainFrameScrollOffset = IntPoint(mainFrame()->scrollOffset());
mainFrameScrollOffset.move(mainFrameDelta.width, mainFrameDelta.height);
updateMainFrameScrollPosition(mainFrameScrollOffset, false);
« no previous file with comments | « Source/web/WebPluginScrollbarImpl.cpp ('k') | Source/web/tests/WebInputEventConversionTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698