| Index: content/browser/android/overscroll_refresh.cc
|
| diff --git a/content/browser/android/overscroll_refresh.cc b/content/browser/android/overscroll_refresh.cc
|
| index 7631d6cd525e4111f6bb872c1d66ff996a3a48f0..de9b232dce19ea533d924b0e99157eea2e427ac6 100644
|
| --- a/content/browser/android/overscroll_refresh.cc
|
| +++ b/content/browser/android/overscroll_refresh.cc
|
| @@ -416,6 +416,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);
|
| @@ -431,7 +432,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;
|
| }
|
|
|
| @@ -499,9 +500,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) {
|
|
|