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

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: 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 const float scale_factor = 246 const float scale_factor =
247 frame_metadata.page_scale_factor * frame_metadata.device_scale_factor; 247 frame_metadata.page_scale_factor * frame_metadata.device_scale_factor;
248 gfx::SizeF viewport_size = 248 gfx::SizeF viewport_size =
249 gfx::ScaleSize(frame_metadata.scrollable_viewport_size, scale_factor); 249 gfx::ScaleSize(frame_metadata.scrollable_viewport_size, scale_factor);
250 gfx::SizeF content_size = 250 gfx::SizeF content_size =
251 gfx::ScaleSize(frame_metadata.root_layer_size, scale_factor); 251 gfx::ScaleSize(frame_metadata.root_layer_size, scale_factor);
252 gfx::Vector2dF content_scroll_offset = 252 gfx::Vector2dF content_scroll_offset =
253 gfx::ScaleVector2d(frame_metadata.root_scroll_offset, scale_factor); 253 gfx::ScaleVector2d(frame_metadata.root_scroll_offset, scale_factor);
254 254
255 if (refresh_effect_) 255 if (refresh_effect_) {
256 refresh_effect_->UpdateDisplay(viewport_size, content_scroll_offset); 256 refresh_effect_->UpdateDisplay(viewport_size, content_scroll_offset,
257 frame_metadata.root_overflow_y_hidden);
258 }
257 259
258 if (glow_effect_) { 260 if (glow_effect_) {
259 glow_effect_->UpdateDisplay(viewport_size, content_size, 261 glow_effect_->UpdateDisplay(viewport_size, content_size,
260 content_scroll_offset); 262 content_scroll_offset);
261 } 263 }
262 } 264 }
263 265
264 void OverscrollControllerAndroid::Enable() { 266 void OverscrollControllerAndroid::Enable() {
265 enabled_ = true; 267 enabled_ = true;
266 } 268 }
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 313
312 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() { 314 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() {
313 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); 315 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_);
314 } 316 }
315 317
316 void OverscrollControllerAndroid::SetNeedsAnimate() { 318 void OverscrollControllerAndroid::SetNeedsAnimate() {
317 compositor_->SetNeedsAnimate(); 319 compositor_->SetNeedsAnimate();
318 } 320 }
319 321
320 } // namespace content 322 } // namespace content
OLDNEW
« 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