Index: content/browser/android/content_view_render_view.cc |
diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc |
index db42223b18ae88eeb2374d18bcb9818cfb76be2b..7da5009882f2dd22bc89786af6e8e22a8873cfb6 100644 |
--- a/content/browser/android/content_view_render_view.cc |
+++ b/content/browser/android/content_view_render_view.cc |
@@ -56,13 +56,13 @@ void ContentViewRenderView::Destroy(JNIEnv* env, jobject obj) { |
delete this; |
} |
-void ContentViewRenderView::SetCurrentContentView( |
- JNIEnv* env, jobject obj, jlong native_content_view) { |
+void ContentViewRenderView::SetCurrentContentViewCore( |
+ JNIEnv* env, jobject obj, jlong native_content_view_core) { |
InitCompositor(); |
- ContentViewCoreImpl* content_view = |
- reinterpret_cast<ContentViewCoreImpl*>(native_content_view); |
- if (content_view) |
- compositor_->SetRootLayer(content_view->GetLayer()); |
+ ContentViewCoreImpl* content_view_core = |
+ reinterpret_cast<ContentViewCoreImpl*>(native_content_view_core); |
+ if (content_view_core) |
+ compositor_->SetRootLayer(content_view_core->GetLayer()); |
else |
compositor_->SetRootLayer(cc::Layer::Create()); |
} |