Make //blimp/client/app a real embedder of //blimp/client/public

blimp/client/app/android/blimp_contents_display.cc

Index: blimp/client/app/android/blimp_contents_display.cc
diff --git a/blimp/client/app/android/blimp_contents_display.cc b/blimp/client/app/android/blimp_contents_display.cc
index 6eebee8fb3f81530a40146b5a38690eee544ba65..d15a49a89945bc53a10226b28dbda3f40adb1a3f 100644
--- a/blimp/client/app/android/blimp_contents_display.cc
+++ b/blimp/client/app/android/blimp_contents_display.cc
@@ -6,21 +6,19 @@
 
 #include <android/native_window_jni.h>
 
+#include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "blimp/client/app/android/blimp_client_session_android.h"
+#include "blimp/client/app/android/blimp_environment.h"
 #include "blimp/client/app/compositor/browser_compositor.h"
-#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
-#include "blimp/client/core/render_widget/blimp_document_manager.h"
-#include "blimp/client/core/render_widget/render_widget_feature.h"
+#include "blimp/client/public/compositor/compositor_dependencies.h"
+#include "blimp/client/public/contents/blimp_contents.h"
+#include "blimp/client/public/contents/blimp_contents_view.h"
 #include "blimp/client/support/compositor/compositor_dependencies_impl.h"
 #include "jni/BlimpContentsDisplay_jni.h"
+#include "ui/android/view_android.h"
 #include "ui/events/android/motion_event_android.h"
 #include "ui/gfx/geometry/size.h"
 
-namespace {
-const int kDummyBlimpContentsId = 0;
-}  // namespace
-
 namespace blimp {
 namespace client {
 namespace app {
@@ -28,22 +26,19 @@ namespace app {
 static jlong Init(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jobj,
-    const base::android::JavaParamRef<jobject>& blimp_client_session,
+    const base::android::JavaParamRef<jobject>& jblimp_environment,
+    const base::android::JavaParamRef<jobject>& jblimp_contents,
     jint real_width,
     jint real_height,
     jint width,
-    jint height,
-    jfloat dp_to_px) {
-  BlimpClientSession* client_session =
-      BlimpClientSessionAndroid::FromJavaObject(env, blimp_client_session);
-
-  // TODO(dtrainor): Pull the feature object from the BlimpClientSession and
-  // pass it through to the BlimpCompositor.
-  ALLOW_UNUSED_LOCAL(client_session);
-
+    jint height) {
+  BlimpEnvironment* blimp_environment =
+      BlimpEnvironment::FromJavaObject(env, jblimp_environment);
+  BlimpContents* blimp_contents =
+      BlimpContents::FromJavaObject(env, jblimp_contents);
   return reinterpret_cast<intptr_t>(new BlimpContentsDisplay(
       env, jobj, gfx::Size(real_width, real_height), gfx::Size(width, height),
-      dp_to_px, client_session->GetRenderWidgetFeature()));
+      blimp_environment, blimp_contents));
 }
 
 // static
@@ -56,25 +51,24 @@ BlimpContentsDisplay::BlimpContentsDisplay(
     const base::android::JavaParamRef<jobject>& jobj,
     const gfx::Size& real_size,
     const gfx::Size& size,
-    float dp_to_px,
-    blimp::client::RenderWidgetFeature* render_widget_feature)
-    : device_scale_factor_(dp_to_px),
+    BlimpEnvironment* blimp_environment,
+    BlimpContents* blimp_contents)
+    : blimp_contents_(blimp_contents),
       current_surface_format_(0),
       window_(gfx::kNullAcceleratedWidget),
       weak_ptr_factory_(this) {
-  compositor_dependencies_ = base::MakeUnique<BlimpCompositorDependencies>(
-      base::MakeUnique<CompositorDependenciesImpl>());
+  DCHECK(blimp_contents_);
+
+  compositor_dependencies_ = blimp_environment->CreateCompositorDepencencies();
 
-  compositor_ = base::MakeUnique<BrowserCompositor>(
-      compositor_dependencies_->GetEmbedderDependencies());
+  compositor_ =
+      base::MakeUnique<BrowserCompositor>(compositor_dependencies_.get());
   compositor_->set_did_complete_swap_buffers_callback(
       base::Bind(&BlimpContentsDisplay::OnSwapBuffersCompleted,
                  weak_ptr_factory_.GetWeakPtr()));
 
-  document_manager_ = base::MakeUnique<BlimpDocumentManager>(
-      kDummyBlimpContentsId, render_widget_feature,
-      compositor_dependencies_.get());
-  compositor_->SetContentLayer(document_manager_->layer());
+  compositor_->SetContentLayer(
+      blimp_contents_->GetView()->GetNativeView()->GetLayer());
 
   java_obj_.Reset(env, jobj);
 }
@@ -82,10 +76,8 @@ BlimpContentsDisplay::BlimpContentsDisplay(
 BlimpContentsDisplay::~BlimpContentsDisplay() {
   SetSurface(nullptr);
 
-  // Destroy the BrowserCompositor and the BlimpCompositorManager before the
-  // BlimpCompositorDependencies.
+  // Destroy the BrowserCompositor before the BlimpCompositorDependencies.
   compositor_.reset();
-  document_manager_.reset();
   compositor_dependencies_.reset();
 }
 
@@ -111,13 +103,15 @@ void BlimpContentsDisplay::OnSurfaceChanged(
     jint width,
     jint height,
     const base::android::JavaParamRef<jobject>& jsurface) {
-  if (current_surface_format_ != format) {
-    current_surface_format_ = format;
-    SetSurface(nullptr);
+  if (current_surface_format_ == format) {
+    return;
+  }
 
-    if (jsurface) {
-      SetSurface(jsurface);
-    }
+  current_surface_format_ = format;
+  SetSurface(nullptr);
+
+  if (jsurface) {
+    SetSurface(jsurface);
   }
 }
 
@@ -139,7 +133,7 @@ void BlimpContentsDisplay::SetSurface(jobject surface) {
   // Release all references to the old surface.
   if (window_ != gfx::kNullAcceleratedWidget) {
     compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
-    document_manager_->SetVisible(false);
+    blimp_contents_->Hide();
     ANativeWindow_release(window_);
     window_ = gfx::kNullAcceleratedWidget;
   }
@@ -148,54 +142,10 @@ void BlimpContentsDisplay::SetSurface(jobject surface) {
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
     window_ = ANativeWindow_fromSurface(env, surface);
     compositor_->SetAcceleratedWidget(window_);
-    document_manager_->SetVisible(true);
+    blimp_contents_->Show();
   }
 }
 
-jboolean BlimpContentsDisplay::OnTouchEvent(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj,
-    const base::android::JavaParamRef<jobject>& motion_event,
-    jlong time_ms,
-    jint android_action,
-    jint pointer_count,
-    jint history_size,
-    jint action_index,
-    jfloat pos_x_0,
-    jfloat pos_y_0,
-    jfloat pos_x_1,
-    jfloat pos_y_1,
-    jint pointer_id_0,
-    jint pointer_id_1,
-    jfloat touch_major_0,
-    jfloat touch_major_1,
-    jfloat touch_minor_0,
-    jfloat touch_minor_1,
-    jfloat orientation_0,
-    jfloat orientation_1,
-    jfloat tilt_0,
-    jfloat tilt_1,
-    jfloat raw_pos_x,
-    jfloat raw_pos_y,
-    jint android_tool_type_0,
-    jint android_tool_type_1,
-    jint android_button_state,
-    jint android_meta_state) {
-  ui::MotionEventAndroid::Pointer pointer0(
-      pointer_id_0, pos_x_0, pos_y_0, touch_major_0, touch_minor_0,
-      orientation_0, tilt_0, android_tool_type_0);
-  ui::MotionEventAndroid::Pointer pointer1(
-      pointer_id_1, pos_x_1, pos_y_1, touch_major_1, touch_minor_1,
-      orientation_1, tilt_1, android_tool_type_1);
-  ui::MotionEventAndroid event(1.f / device_scale_factor_, env, motion_event,
-                               time_ms, android_action, pointer_count,
-                               history_size, action_index, android_button_state,
-                               android_meta_state, raw_pos_x - pos_x_0,
-                               raw_pos_y - pos_y_0, &pointer0, &pointer1);
-
-  return document_manager_->OnTouchEvent(event);
-}
-
 void BlimpContentsDisplay::OnSwapBuffersCompleted() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_BlimpContentsDisplay_onSwapBuffersCompleted(env, java_obj_);