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

Unified Diff: content/browser/android/overscroll_controller_android.cc

Issue 910373002: [Android] Disable pull-to-refresh with overflow:hidden (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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 | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | content/browser/android/overscroll_refresh.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/overscroll_controller_android.cc
diff --git a/content/browser/android/overscroll_controller_android.cc b/content/browser/android/overscroll_controller_android.cc
index 68c2006f32ab0ea7d3926118fe93663b595f12d9..9091393eb0dbcf9be3d0de075205dc6a0b2f33e9 100644
--- a/content/browser/android/overscroll_controller_android.cc
+++ b/content/browser/android/overscroll_controller_android.cc
@@ -252,8 +252,10 @@ void OverscrollControllerAndroid::OnFrameMetadataUpdated(
gfx::Vector2dF content_scroll_offset =
gfx::ScaleVector2d(frame_metadata.root_scroll_offset, scale_factor);
- if (refresh_effect_)
- refresh_effect_->UpdateDisplay(viewport_size, content_scroll_offset);
+ if (refresh_effect_) {
+ refresh_effect_->UpdateDisplay(viewport_size, content_scroll_offset,
+ frame_metadata.root_overflow_y_hidden);
+ }
if (glow_effect_) {
glow_effect_->UpdateDisplay(viewport_size, content_size,
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | content/browser/android/overscroll_refresh.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698