Index: blimp/client/app/android/blimp_contents_display.h |
diff --git a/blimp/client/app/android/blimp_contents_display.h b/blimp/client/app/android/blimp_contents_display.h |
deleted file mode 100644 |
index 68d9fcc19da6475af0c5422e382492ce7e5075ec..0000000000000000000000000000000000000000 |
--- a/blimp/client/app/android/blimp_contents_display.h |
+++ /dev/null |
@@ -1,96 +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. |
- |
-#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_CONTENTS_DISPLAY_H_ |
-#define BLIMP_CLIENT_APP_ANDROID_BLIMP_CONTENTS_DISPLAY_H_ |
- |
-#include <memory> |
- |
-#include "base/android/jni_android.h" |
-#include "base/macros.h" |
-#include "base/memory/weak_ptr.h" |
-#include "ui/gfx/native_widget_types.h" |
- |
-namespace gfx { |
-class Size; |
-} |
- |
-namespace blimp { |
-namespace client { |
-class BlimpContents; |
-class CompositorDependencies; |
-class BlimpEnvironment; |
-class BrowserCompositor; |
- |
-namespace app { |
- |
-// The native component of org.chromium.blimp.BlimpContentsDisplay. This builds |
-// and maintains a BlimpCompositorAndroid and handles notifying the compositor |
-// of SurfaceView surface changes (size, creation, destruction, etc.). |
-class BlimpContentsDisplay { |
- 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. |
- BlimpContentsDisplay(JNIEnv* env, |
- const base::android::JavaParamRef<jobject>& jobj, |
- const gfx::Size& real_size, |
- const gfx::Size& size, |
- BlimpEnvironment* blimp_environment, |
- BlimpContents* blimp_contents); |
- |
- // Methods called from Java via JNI. |
- void Destroy(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); |
- |
- private: |
- virtual ~BlimpContentsDisplay(); |
- |
- void OnSwapBuffersCompleted(); |
- |
- void SetSurface(jobject surface); |
- |
- // Reference to the Java object which owns this class. |
- base::android::ScopedJavaGlobalRef<jobject> java_obj_; |
- |
- std::unique_ptr<CompositorDependencies> compositor_dependencies_; |
- std::unique_ptr<BrowserCompositor> compositor_; |
- |
- BlimpContents* blimp_contents_; |
- |
- // The format of the current surface owned by |compositor_|. See |
- // android.graphics.PixelFormat.java. |
- int current_surface_format_; |
- |
- gfx::AcceleratedWidget window_; |
- |
- base::WeakPtrFactory<BlimpContentsDisplay> weak_ptr_factory_; |
- |
- DISALLOW_COPY_AND_ASSIGN(BlimpContentsDisplay); |
-}; |
- |
-} // namespace app |
-} // namespace client |
-} // namespace blimp |
- |
-#endif // BLIMP_CLIENT_APP_ANDROID_BLIMP_CONTENTS_DISPLAY_H_ |