content/browser/renderer_host/render_widget_host_view_android.cc - Issue 2179563003: Android: Remove ContentViewCore::GetLayer() from public interface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2179563003: Android: Remove ContentViewCore::GetLayer() from public interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments Created 4 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

« no previous file with comments | « content/browser/android/content_view_render_view.cc ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 b24c300e752f01801ee6a52ba40cc18acb143f33..5d56ec10e8005ee90c648ba4baa2129583176a8c 100644

--- a/content/browser/renderer_host/render_widget_host_view_android.cc

+++ b/content/browser/renderer_host/render_widget_host_view_android.cc

@@ -1171,7 +1171,7 @@ RenderWidgetHostViewAndroid::CreateDrawable() {

return std::unique_ptr<

ui::TouchHandleDrawable>(new CompositedTouchHandleDrawable(

- content_view_core_->GetLayer(),

+ content_view_core_->GetViewAndroid()->GetLayer(),

ui::GetScaleFactorForNativeView(GetNativeView()),

// Use the activity context (instead of the application context) to ensure

// proper handle theming.

@@ -1424,7 +1424,7 @@ bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) {

bool needs_animate = false;

if (overscroll_controller_) {

needs_animate |= overscroll_controller_->Animate(

- frame_time, content_view_core_->GetLayer());

+ frame_time, content_view_core_->GetViewAndroid()->GetLayer());

}

if (selection_controller_)

needs_animate |= selection_controller_->Animate(frame_time);