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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 377013002: android: Use UIResource for overscroll glow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
« content/browser/android/overscroll_glow.cc ('K') | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/content_browser.gypi » ('j') | ui/base/android/window_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 4a1e4149c0348e5e0f36e7a6d26ace361846e455..eb7d5e364cb5dfb7364f9af7eca45923edb762ff 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1231,9 +1231,19 @@ void RenderWidgetHostViewAndroid::DidOverscroll(
return;
const float device_scale_factor = content_view_core_->GetDpiScale();
+
+ cc::UIResourceId edge_ui_resource =
+ content_view_core_->GetWindowAndroid()->GetSystemUIResource(
+ ui::WindowAndroid::OVERSCROLL_EDGE);
+ cc::UIResourceId glow_ui_resource =
+ content_view_core_->GetWindowAndroid()->GetSystemUIResource(
+ ui::WindowAndroid::OVERSCROLL_GLOW);
+
if (overscroll_effect_->OnOverscrolled(
content_view_core_->GetLayer(),
base::TimeTicks::Now(),
+ edge_ui_resource,
+ glow_ui_resource,
gfx::ScaleVector2d(params.accumulated_overscroll,
device_scale_factor),
gfx::ScaleVector2d(params.latest_overscroll_delta,
« content/browser/android/overscroll_glow.cc ('K') | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/content_browser.gypi » ('j') | ui/base/android/window_android.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698