Add BlimpDocument, pull out functions in BlimpCompositor.

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 "base/memory/ptr_util.h"
 #include "blimp/client/app/android/blimp_client_session_android.h"
 #include "blimp/client/app/compositor/browser_compositor.h"
 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
-#include "blimp/client/core/compositor/blimp_compositor_manager.h"
+#include "blimp/client/core/render_widget/blimp_document_manager.h"
 #include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "blimp/client/support/compositor/compositor_dependencies_impl.h"
 #include "jni/BlimpView_jni.h"
 #include "ui/events/android/motion_event_android.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace {
 const int kDummyBlimpContentsId = 0;
 }  // namespace
 
@@ skipping 38 matching lines @@
       window_(gfx::kNullAcceleratedWidget),
       weak_ptr_factory_(this) {
   compositor_dependencies_ = base::MakeUnique<BlimpCompositorDependencies>(
       base::MakeUnique<CompositorDependenciesImpl>());
 
   compositor_ = base::MakeUnique<BrowserCompositor>(
       compositor_dependencies_->GetEmbedderDependencies());
   compositor_->set_did_complete_swap_buffers_callback(base::Bind(
       &BlimpView::OnSwapBuffersCompleted, weak_ptr_factory_.GetWeakPtr()));
 
-  compositor_manager_ = base::MakeUnique<BlimpCompositorManager>(
+  document_manager_ = base::MakeUnique<BlimpDocumentManager>(
       kDummyBlimpContentsId, render_widget_feature,
       compositor_dependencies_.get());
-  compositor_->SetContentLayer(compositor_manager_->layer());
+  compositor_->SetContentLayer(document_manager_->layer());
 
   java_obj_.Reset(env, jobj);
 }
 
 BlimpView::~BlimpView() {
   SetSurface(nullptr);
 
   // Destroy the BrowserCompositor and the BlimpCompositorManager before the
   // BlimpCompositorDependencies.
   compositor_.reset();
-  compositor_manager_.reset();
+  document_manager_.reset();
   compositor_dependencies_.reset();
 }
 
 void BlimpView::Destroy(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
 void BlimpView::OnContentAreaSizeChanged(
     JNIEnv* env,
@@ skipping 32 matching lines @@
     const base::android::JavaParamRef<jobject>& jobj) {
   current_surface_format_ = 0 /** PixelFormat.UNKNOWN */;
   SetSurface(nullptr);
 }
 
 void BlimpView::SetSurface(jobject surface) {
   JNIEnv* env = base::android::AttachCurrentThread();
   // Release all references to the old surface.
   if (window_ != gfx::kNullAcceleratedWidget) {
     compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
-    compositor_manager_->SetVisible(false);
+    document_manager_->SetVisible(false);
     ANativeWindow_release(window_);
     window_ = gfx::kNullAcceleratedWidget;
   }
 
   if (surface) {
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
     window_ = ANativeWindow_fromSurface(env, surface);
     compositor_->SetAcceleratedWidget(window_);
-    compositor_manager_->SetVisible(true);
+    document_manager_->SetVisible(true);
   }
 }
 
 jboolean BlimpView::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,
@@ 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);
+  return document_manager_->OnTouchEvent(event);
 }
 
 void BlimpView::OnSwapBuffersCompleted() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_BlimpView_onSwapBuffersCompleted(env, java_obj_);
 }
 
 }  // namespace app
 }  // namespace client
 }  // namespace blimp