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

Unified Diff: chrome/browser/android/compositor/compositor_view.cc

Issue 2595263002: Introduce ViewRoot forwarding input/view events to native (Closed)
Patch Set: unittest Created 3 years, 11 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
Index: chrome/browser/android/compositor/compositor_view.cc
diff --git a/chrome/browser/android/compositor/compositor_view.cc b/chrome/browser/android/compositor/compositor_view.cc
index a13ec780730a4f15390e69ce5930e183f09092ed..c881bb8fa5f175c6efbc6898b745bb51b88e97d7 100644
--- a/chrome/browser/android/compositor/compositor_view.cc
+++ b/chrome/browser/android/compositor/compositor_view.cc
@@ -44,12 +44,12 @@ namespace android {
jlong Init(JNIEnv* env,
const JavaParamRef<jobject>& obj,
jboolean low_mem_device,
- jlong native_window_android,
+ jlong native_view_root,
const JavaParamRef<jobject>& jlayer_title_cache,
const JavaParamRef<jobject>& jtab_content_manager) {
CompositorView* view;
- ui::WindowAndroid* window_android =
- reinterpret_cast<ui::WindowAndroid*>(native_window_android);
+ ui::ViewRoot* view_root =
+ reinterpret_cast<ui::ViewRoot*>(native_view_root);
LayerTitleCache* layer_title_cache =
LayerTitleCache::FromJavaObject(jlayer_title_cache);
TabContentManager* tab_content_manager =
@@ -58,7 +58,7 @@ jlong Init(JNIEnv* env,
DCHECK(tab_content_manager);
// TODO(clholgat): Remove the compositor tabstrip flag.
- view = new CompositorView(env, obj, low_mem_device, window_android,
+ view = new CompositorView(env, obj, low_mem_device, view_root,
tab_content_manager);
ui::UIResourceProvider* ui_resource_provider = view->GetUIResourceProvider();
@@ -75,7 +75,7 @@ jlong Init(JNIEnv* env,
CompositorView::CompositorView(JNIEnv* env,
jobject obj,
jboolean low_mem_device,
- ui::WindowAndroid* window_android,
+ ui::ViewRoot* view_root,
TabContentManager* tab_content_manager)
: tab_content_manager_(tab_content_manager),
root_layer_(cc::SolidColorLayer::Create()),
@@ -87,7 +87,7 @@ CompositorView::CompositorView(JNIEnv* env,
weak_factory_(this) {
content::BrowserChildProcessObserver::Add(this);
obj_.Reset(env, obj);
- compositor_.reset(content::Compositor::Create(this, window_android));
+ compositor_.reset(content::Compositor::Create(this, view_root));
root_layer_->SetIsDrawable(true);
root_layer_->SetBackgroundColor(SK_ColorWHITE);
« no previous file with comments | « chrome/browser/android/compositor/compositor_view.h ('k') | chrome/browser/android/vr_shell/vr_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698