| Index: blimp/client/app/android/blimp_view.cc
|
| diff --git a/blimp/client/app/android/blimp_view.cc b/blimp/client/app/android/blimp_view.cc
|
| index 37db8ed0de5ae31539dfedb12b0bf5f8ba7cbc4f..62cf8958c979df1a234dc519b8897d27c8cc2710 100644
|
| --- a/blimp/client/app/android/blimp_view.cc
|
| +++ b/blimp/client/app/android/blimp_view.cc
|
| @@ -7,6 +7,7 @@
|
| #include <android/native_window_jni.h>
|
|
|
| #include "blimp/client/app/android/blimp_client_session_android.h"
|
| +#include "blimp/client/app/android/blimp_compositor_manager_android.h"
|
| #include "jni/BlimpView_jni.h"
|
| #include "ui/events/android/motion_event_android.h"
|
| #include "ui/gfx/geometry/size.h"
|
| @@ -47,11 +48,9 @@
|
| float dp_to_px,
|
| RenderWidgetFeature* render_widget_feature)
|
| : device_scale_factor_(dp_to_px),
|
| - compositor_manager_(
|
| - BlimpCompositorManagerAndroid::Create(real_size,
|
| - size,
|
| - render_widget_feature,
|
| - this)),
|
| + compositor_manager_(BlimpCompositorManagerAndroid::Create(real_size,
|
| + size,
|
| + render_widget_feature)),
|
| current_surface_format_(0),
|
| window_(gfx::kNullAcceleratedWidget) {
|
| java_obj_.Reset(env, jobj);
|
| @@ -175,10 +174,5 @@
|
| return compositor_manager_->OnTouchEvent(event);
|
| }
|
|
|
| -void BlimpView::OnSwapBuffersCompleted() {
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - Java_BlimpView_onSwapBuffersCompleted(env, java_obj_.obj());
|
| -}
|
| -
|
| } // namespace client
|
| } // namespace blimp
|
|
|