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

Unified Diff: content/browser/android/overscroll_refresh.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
Index: content/browser/android/overscroll_refresh.cc
diff --git a/content/browser/android/overscroll_refresh.cc b/content/browser/android/overscroll_refresh.cc
index 13b2329db873240fae4805c88cf258d9e244b042..58962f6356ecfbe02fcd43984416ae843daffaca 100644
--- a/content/browser/android/overscroll_refresh.cc
+++ b/content/browser/android/overscroll_refresh.cc
@@ -412,6 +412,7 @@ OverscrollRefresh::OverscrollRefresh(ui::ResourceManager* resource_manager,
bool mirror)
: client_(client),
scrolled_to_top_(true),
+ overflow_y_hidden_(false),
scroll_consumption_state_(DISABLED),
effect_(new Effect(resource_manager, target_drag_offset_pixels, mirror)) {
DCHECK(client);
@@ -427,7 +428,7 @@ void OverscrollRefresh::Reset() {
void OverscrollRefresh::OnScrollBegin() {
ReleaseWithoutActivation();
- if (scrolled_to_top_)
+ if (scrolled_to_top_ && !overflow_y_hidden_)
scroll_consumption_state_ = AWAITING_SCROLL_UPDATE_ACK;
}
@@ -495,9 +496,11 @@ bool OverscrollRefresh::IsAwaitingScrollUpdateAck() const {
void OverscrollRefresh::UpdateDisplay(
const gfx::SizeF& viewport_size,
- const gfx::Vector2dF& content_scroll_offset) {
+ const gfx::Vector2dF& content_scroll_offset,
+ bool root_overflow_y_hidden) {
viewport_size_ = viewport_size;
scrolled_to_top_ = content_scroll_offset.y() == 0;
+ overflow_y_hidden_ = root_overflow_y_hidden;
}
void OverscrollRefresh::Release(bool allow_activation) {
« no previous file with comments | « content/browser/android/overscroll_refresh.h ('k') | content/browser/android/overscroll_refresh_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698