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

Side by Side 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: Pass overflow:hidden via metadata 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/overscroll_controller_android.h" 5 #include "content/browser/android/overscroll_controller_android.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/output/compositor_frame_metadata.h" 10 #include "cc/output/compositor_frame_metadata.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 const float scale_factor = 224 const float scale_factor =
225 frame_metadata.page_scale_factor * frame_metadata.device_scale_factor; 225 frame_metadata.page_scale_factor * frame_metadata.device_scale_factor;
226 gfx::SizeF viewport_size = 226 gfx::SizeF viewport_size =
227 gfx::ScaleSize(frame_metadata.scrollable_viewport_size, scale_factor); 227 gfx::ScaleSize(frame_metadata.scrollable_viewport_size, scale_factor);
228 gfx::SizeF content_size = 228 gfx::SizeF content_size =
229 gfx::ScaleSize(frame_metadata.root_layer_size, scale_factor); 229 gfx::ScaleSize(frame_metadata.root_layer_size, scale_factor);
230 gfx::Vector2dF content_scroll_offset = 230 gfx::Vector2dF content_scroll_offset =
231 gfx::ScaleVector2d(frame_metadata.root_scroll_offset, scale_factor); 231 gfx::ScaleVector2d(frame_metadata.root_scroll_offset, scale_factor);
232 232
233 if (refresh_effect_) 233 if (refresh_effect_) {
234 refresh_effect_->UpdateDisplay(viewport_size, content_scroll_offset); 234 refresh_effect_->UpdateDisplay(viewport_size, content_scroll_offset,
235 frame_metadata.root_overflow_y_hidden);
236 }
235 237
236 if (glow_effect_) { 238 if (glow_effect_) {
237 glow_effect_->UpdateDisplay(viewport_size, content_size, 239 glow_effect_->UpdateDisplay(viewport_size, content_size,
238 content_scroll_offset); 240 content_scroll_offset);
239 } 241 }
240 } 242 }
241 243
242 void OverscrollControllerAndroid::Enable() { 244 void OverscrollControllerAndroid::Enable() {
243 enabled_ = true; 245 enabled_ = true;
244 } 246 }
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 291
290 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() { 292 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() {
291 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); 293 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_);
292 } 294 }
293 295
294 void OverscrollControllerAndroid::SetNeedsAnimate() { 296 void OverscrollControllerAndroid::SetNeedsAnimate() {
295 compositor_->SetNeedsAnimate(); 297 compositor_->SetNeedsAnimate();
296 } 298 }
297 299
298 } // namespace content 300 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698