content/browser/renderer_host/render_widget_host_view_android.cc - Issue 632283004: Remove implicit conversions from scoped_refptr to T* in content/

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 632283004: Remove implicit conversions from scoped_refptr to T* in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/java/gin_java_bridge_dispatcher_host.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('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 89efe4e959f2dd372ea837973aaa609541cc834d..e7336e28507d7b642b2e5d92abf23f454822a89b 100644

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

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

@@ -1160,7 +1160,7 @@ scoped_ptr<TouchHandleDrawable> RenderWidgetHostViewAndroid::CreateDrawable() {

return content_view_core_->CreatePopupTouchHandleDrawable();

return scoped_ptr<TouchHandleDrawable>(new CompositedTouchHandleDrawable(

- content_view_core_->GetLayer(),

+ content_view_core_->GetLayer().get(),

content_view_core_->GetDpiScale(),

base::android::GetApplicationContext()));

}

@@ -1518,7 +1518,7 @@ void RenderWidgetHostViewAndroid::DidOverscroll(

if (overscroll_effect_ &&

overscroll_effect_->OnOverscrolled(

- content_view_core_->GetLayer(),

+ content_view_core_->GetLayer().get(),

base::TimeTicks::Now(),

gfx::ScaleVector2d(params.accumulated_overscroll,

device_scale_factor),