Restructure contents of blimp/client.

blimp/client/android/blimp_view.cc

Index: blimp/client/android/blimp_view.cc
diff --git a/blimp/client/android/blimp_view.cc b/blimp/client/android/blimp_view.cc
deleted file mode 100644
index 91e5de994f66667b7cb325b0d2ecb0ccde0269ec..0000000000000000000000000000000000000000
--- a/blimp/client/android/blimp_view.cc
+++ /dev/null
@@ -1,181 +0,0 @@
-// 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/android/blimp_view.h"
-
-#include <android/native_window_jni.h>
-
-#include "blimp/client/compositor/blimp_compositor_android.h"
-#include "blimp/client/session/blimp_client_session_android.h"
-#include "jni/BlimpView_jni.h"
-#include "ui/events/android/motion_event_android.h"
-#include "ui/gfx/geometry/size.h"
-
-namespace blimp {
-namespace client {
-
-static jlong Init(JNIEnv* env,
-                  const JavaParamRef<jobject>& jobj,
-                  const JavaParamRef<jobject>& blimp_client_session,
-                  jint real_width,
-                  jint real_height,
-                  jint width,
-                  jint height,
-                  jfloat dp_to_px) {
-  BlimpClientSession* client_session =
-      BlimpClientSessionAndroid::FromJavaObject(env,
-                                                blimp_client_session.obj());
-
-  // TODO(dtrainor): Pull the feature object from the BlimpClientSession and
-  // pass it through to the BlimpCompositor.
-  ALLOW_UNUSED_LOCAL(client_session);
-
-  return reinterpret_cast<intptr_t>(new BlimpView(
-      env, jobj, gfx::Size(real_width, real_height), gfx::Size(width, height),
-      dp_to_px, client_session->GetRenderWidgetFeature()));
-}
-
-// static
-bool BlimpView::RegisterJni(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-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)
-    : device_scale_factor_(dp_to_px),
-      compositor_(BlimpCompositorAndroid::Create(real_size,
-                                                 size,
-                                                 dp_to_px,
-                                                 render_widget_feature)),
-      current_surface_format_(0),
-      window_(gfx::kNullAcceleratedWidget) {
-  java_obj_.Reset(env, jobj);
-}
-
-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_->SetAcceleratedWidget(window_);
-      compositor_->SetVisible(true);
-    }
-  }
-
-  compositor_->SetSize(gfx::Size(width, height));
-}
-
-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_->SetVisible(visible);
-}
-
-void BlimpView::ReleaseAcceleratedWidget() {
-  if (window_ == gfx::kNullAcceleratedWidget)
-    return;
-
-  compositor_->ReleaseAcceleratedWidget();
-  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,
-                                 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 compositor_->OnTouchEvent(event);
-}
-
-}  // namespace client
-}  // namespace blimp