blimp: Move compositing, input and render widget feature to client/core.

blimp/client/app/android/blimp_view.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/app/android/blimp_view.h"
 
 #include <android/native_window_jni.h>
 
 #include "blimp/client/app/android/blimp_client_session_android.h"
+#include "blimp/client/core/contents/blimp_contents_impl.h"
+#include "blimp/client/core/render_widget/blimp_render_widget.h"
 #include "jni/BlimpView_jni.h"
 #include "ui/events/android/motion_event_android.h"
 #include "ui/gfx/geometry/size.h"
 
 using base::android::JavaParamRef;
 
 namespace blimp {
 namespace client {
 
 static jlong Init(JNIEnv* env,
@@ skipping 24 matching lines @@
 }
 
 BlimpView::BlimpView(JNIEnv* env,
                      const JavaParamRef<jobject>& jobj,
                      const gfx::Size& real_size,
                      const gfx::Size& size,
                      float dp_to_px,
                      RenderWidgetFeature* render_widget_feature,
                      BlimpConnectionStatistics* blimp_connection_statistics)
     : device_scale_factor_(dp_to_px),
-      compositor_manager_(
-          BlimpCompositorManagerAndroid::Create(real_size,
-                                                size,
-                                                render_widget_feature,
-                                                this)),
+      blimp_contents_manager_(true, render_widget_feature),
       current_surface_format_(0),
       window_(gfx::kNullAcceleratedWidget),
-      blimp_connection_statistics_(blimp_connection_statistics) {
+      // blimp_connection_statistics_(blimp_connection_statistics),
+      weak_ptr_factory_(this) {
   java_obj_.Reset(env, jobj);
+
+  blimp_contents_ = blimp_contents_manager_.CreateBlimpContents();
+
+  blimp_contents_->set_did_complete_swap_buffers_callback(base::Bind(
+      &BlimpView::OnSwapBuffersCompleted, weak_ptr_factory_.GetWeakPtr()));
 }
 
 BlimpView::~BlimpView() {
   ReleaseAcceleratedWidget();
 }
 
 void BlimpView::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
 void BlimpView::SetNeedsComposite(JNIEnv* env,
                                   const JavaParamRef<jobject>& jobj) {}
 
 void BlimpView::OnSurfaceChanged(JNIEnv* env,
                                  const JavaParamRef<jobject>& jobj,
                                  jint format,
                                  jint width,
                                  jint height,
                                  const JavaParamRef<jobject>& jsurface) {
   if (current_surface_format_ != format) {
     current_surface_format_ = format;
     ReleaseAcceleratedWidget();
 
     if (jsurface) {
       base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
       window_ = ANativeWindow_fromSurface(env, jsurface);
-      compositor_manager_->SetAcceleratedWidget(window_);
-      compositor_manager_->SetVisible(true);
+      blimp_contents_->SetAcceleratedWidget(window_);
+      blimp_contents_->SetVisible(true);
     }
   }
 }
 
 void BlimpView::OnSurfaceCreated(JNIEnv* env,
                                  const JavaParamRef<jobject>& jobj) {
   current_surface_format_ = 0 /** PixelFormat.UNKNOWN */;
 }
 
 void BlimpView::OnSurfaceDestroyed(JNIEnv* env,
                                    const JavaParamRef<jobject>& jobj) {
   current_surface_format_ = 0 /** PixelFormat.UNKNOWN */;
   ReleaseAcceleratedWidget();
 }
 
 void BlimpView::SetVisibility(JNIEnv* env,
                               const JavaParamRef<jobject>& jobj,
                               jboolean visible) {
-  compositor_manager_->SetVisible(visible);
+  blimp_contents_->SetVisible(visible);
 }
 
 void BlimpView::ReleaseAcceleratedWidget() {
   if (window_ == gfx::kNullAcceleratedWidget)
     return;
 
-  compositor_manager_->ReleaseAcceleratedWidget();
+  blimp_contents_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
   ANativeWindow_release(window_);
   window_ = gfx::kNullAcceleratedWidget;
 }
 
 jboolean BlimpView::OnTouchEvent(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  const JavaParamRef<jobject>& motion_event,
                                  jlong time_ms,
                                  jint android_action,
                                  jint pointer_count,
@@ skipping 43 matching lines @@
                                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 compositor_manager_->OnTouchEvent(event);
+  if (blimp_contents_->GetActiveWidget())
+    return blimp_contents_->GetActiveWidget()->OnTouchEvent(event);

[nyquist, 2016/08/12 07:34:28]

Opposite of //cc, where curly brackets are ... "optional"... , in //blimp we use
curlies for one-liners like this...

[Khushal, 2016/08/13 00:03:21]

Done.
You know I'm in that land most of the time. :P

+
+  return false;
 }
 
 void BlimpView::OnSwapBuffersCompleted() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_BlimpView_onSwapBuffersCompleted(env, java_obj_.obj());
 }
 
-void BlimpView::DidCommitAndDrawFrame() {
-  DCHECK(blimp_connection_statistics_);
-  blimp_connection_statistics_->Add(BlimpConnectionStatistics::COMMIT, 1);
-}
-
 }  // namespace client
 }  // namespace blimp