1 files changed, 49 insertions, 19 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h
index 6fccc2e7fe..3f1e8ac992 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformwindow.h
@@ -7,17 +7,32 @@
 #include <qobject.h>
 #include <qrect.h>
 #include <qpa/qplatformwindow.h>
+#include <QtCore/qjnienvironment.h>
+#include <QtCore/qjniobject.h>
+#include <QtCore/qjnitypes.h>
+#include <QtCore/qloggingcategory.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qwaitcondition.h>
+#include <jni.h>
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(lcQpaWindow)
+Q_DECLARE_JNI_CLASS(QtWindow, "org/qtproject/qt/android/QtWindow")
+Q_DECLARE_JNI_CLASS(Surface, "android/view/Surface")
+
 class QAndroidPlatformScreen;
-class QAndroidPlatformBackingStore;
 
 class QAndroidPlatformWindow: public QPlatformWindow
 {
 public:
-    explicit QAndroidPlatformWindow(QWindow *window);
+    enum class SurfaceContainer {
+        SurfaceView,
+        TextureView
+    };
 
+    explicit QAndroidPlatformWindow(QWindow *window);
+    ~QAndroidPlatformWindow();
     void lower() override;
     void raise() override;
 
@@ -27,7 +42,8 @@ public:
     void setWindowFlags(Qt::WindowFlags flags) override;
     Qt::WindowFlags windowFlags() const;
     void setParent(const QPlatformWindow *window) override;
-    WId winId() const override { return m_windowId; }
+
+    WId winId() const override;
 
     bool setMouseGrabEnabled(bool grab) override { Q_UNUSED(grab); return false; }
     bool setKeyboardGrabEnabled(bool grab) override { Q_UNUSED(grab); return false; }
@@ -39,32 +55,46 @@ public:
     void propagateSizeHints() override;
     void requestActivateWindow() override;
     void updateSystemUiVisibility();
-    inline bool isRaster() const {
-        if (isForeignWindow())
-            return false;
-
-        return window()->surfaceType() == QSurface::RasterSurface
-            || window()->surfaceType() == QSurface::RasterGLSurface;
-    }
+    inline bool isRaster() const { return m_isRaster; }
     bool isExposed() const override;
+    QtJniTypes::QtWindow nativeWindow() const { return m_nativeQtWindow; }
 
     virtual void applicationStateChanged(Qt::ApplicationState);
+    int nativeViewId() const { return m_nativeViewId; }
 
-    void setBackingStore(QAndroidPlatformBackingStore *store) { m_backingStore = store; }
-    QAndroidPlatformBackingStore *backingStore() const { return m_backingStore; }
-
-    virtual void repaint(const QRegion &) { }
+    static bool registerNatives(QJniEnvironment &env);
+    void onSurfaceChanged(QtJniTypes::Surface surface);
 
 protected:
     void setGeometry(const QRect &rect) override;
+    void lockSurface() { m_surfaceMutex.lock(); }
+    void unlockSurface() { m_surfaceMutex.unlock(); }
+    void createSurface();
+    void destroySurface();
+    void setNativeGeometry(const QRect &geometry);
+    void sendExpose() const;
+    bool blockedByModal() const;
+    bool isEmbeddingContainer() const;
 
-protected:
     Qt::WindowFlags m_windowFlags;
     Qt::WindowStates m_windowState;
-
-    WId m_windowId;
-
-    QAndroidPlatformBackingStore *m_backingStore = nullptr;
+    bool m_isRaster;
+
+    int m_nativeViewId = -1;
+    QtJniTypes::QtWindow m_nativeQtWindow;
+    SurfaceContainer m_surfaceContainerType = SurfaceContainer::SurfaceView;
+    QtJniTypes::QtWindow m_nativeParentQtWindow;
+    // The Android Surface, accessed from multiple threads, guarded by m_surfaceMutex
+    QtJniTypes::Surface m_androidSurfaceObject;
+    QWaitCondition m_surfaceWaitCondition;
+    bool m_surfaceCreated = false;
+    QMutex m_surfaceMutex;
+
+private:
+    static void setSurface(JNIEnv *env, jobject obj, jint windowId, QtJniTypes::Surface surface);
+    Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(setSurface)
+    static void windowFocusChanged(JNIEnv *env, jobject object, jboolean focus, jint windowId);
+    Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(windowFocusChanged)
 };
 
 QT_END_NAMESPACE