blimp: Move BlimpCompositor to use delegated rendering.

blimp/client/app/android/blimp_view.h

 // 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.
 
 #ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_VIEW_H_
 #define BLIMP_CLIENT_APP_ANDROID_BLIMP_VIEW_H_
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
 #include "blimp/client/app/android/blimp_compositor_manager_android.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace blimp {
 namespace client {
-
+class BrowserCompositor;
 class RenderWidgetFeature;
 
 // The native component of org.chromium.blimp.BlimpView.  This builds and
 // maintains a BlimpCompositorAndroid and handles notifying the compositor of
 // SurfaceView surface changes (size, creation, destruction, etc.).
-class BlimpView : public BlimpCompositorManagerClient {
+class BlimpView {
  public:
   static bool RegisterJni(JNIEnv* env);
 
   // |real_size| is the total display area including system decorations (see
   // android.view.Display.getRealSize()).  |size| is the total display
   // area not including system decorations (see android.view.Display.getSize()).
   // |dp_to_px| is the scale factor that is required to convert dp (device
   // pixels) to px.
   BlimpView(JNIEnv* env,
             const base::android::JavaParamRef<jobject>& jobj,
             const gfx::Size& real_size,
             const gfx::Size& size,
             float dp_to_px,
             RenderWidgetFeature* render_widget_feature);
 
   // Methods called from Java via JNI.
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj);
-  void SetNeedsComposite(JNIEnv* env,
-                         const base::android::JavaParamRef<jobject>& jobj);
+  void OnContentAreaSizeChanged(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& jobj,
+      jint width,
+      jint height,
+      jfloat dpToPx);
   void OnSurfaceChanged(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& jobj,
                         jint format,
                         jint width,
                         jint height,
                         const base::android::JavaParamRef<jobject>& jsurface);
   void OnSurfaceCreated(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& jobj);
   void OnSurfaceDestroyed(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& jobj);
-  void SetVisibility(JNIEnv* env,
-                     const base::android::JavaParamRef<jobject>& jobj,
-                     jboolean visible);
   jboolean 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,
@@ skipping 13 matching lines @@
       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);
 
  private:
   virtual ~BlimpView();
 
-  void ReleaseAcceleratedWidget();
+  void OnSwapBuffersCompleted();
 
-  // BlimpCompositorManagerClient implementation.
-  void OnSwapBuffersCompleted() override;
-  void DidCommitAndDrawFrame() override;
+  void SetSurface(jobject surface);
 
   // Reference to the Java object which owns this class.
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
 
   const float device_scale_factor_;
 
+  std::unique_ptr<BrowserCompositor> compositor_;
+
   std::unique_ptr<BlimpCompositorManagerAndroid> compositor_manager_;
 
   // The format of the current surface owned by |compositor_|.  See
   // android.graphics.PixelFormat.java.
   int current_surface_format_;
 
   gfx::AcceleratedWidget window_;
 
+  base::WeakPtrFactory<BlimpView> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(BlimpView);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_VIEW_H_