createOverlaySurface JNI

Author: cg021

.gradle/6.5/fileChanges/last-build.bin

@@ -0,0 +1,2 @@
+#Fri Jun 05 11:53:05 CDT 2020
+gradle.version=6.5

.gradle/6.5/gc.properties

@@ -11,6 +11,8 @@ LIBRARY: txt
 ORIGIN: ../../../flutter/LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../flutter/.clang-tidy
+FILE: ../../../flutter/.gradle/6.5/fileChanges/last-build.bin
+FILE: ../../../flutter/.gradle/buildOutputCleanup/cache.properties
 FILE: ../../../flutter/DEPS
 FILE: ../../../flutter/assets/asset_manager.cc
 FILE: ../../../flutter/assets/asset_manager.h
@@ -702,6 +704,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/Flutte
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java

.gradle/buildOutputCleanup/cache.properties

@@ -150,6 +150,7 @@ android_java_sources = [
   "io/flutter/embedding/engine/FlutterEngineCache.java",
   "io/flutter/embedding/engine/FlutterEnginePluginRegistry.java",
   "io/flutter/embedding/engine/FlutterJNI.java",
+  "io/flutter/embedding/engine/FlutterOverlaySurface.java",
   "io/flutter/embedding/engine/FlutterShellArgs.java",
   "io/flutter/embedding/engine/dart/DartExecutor.java",
   "io/flutter/embedding/engine/dart/DartMessenger.java",

.gradle/vcs-1/gc.properties

@@ -0,0 +1,25 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.embedding.engine;
+
+import android.view.Surface;
+
+public class FlutterOverlaySurface {
+  private final Surface surface;
+  private final long id;
+
+  public FlutterOverlaySurface(long id, Surface surface) {
+    this.id = id;
+    this.surface = surface;
+  }
+
+  public long getId() {
+    return id;
+  }
+
+  public Surface getSurface() {
+    return surface;
+  }
+}

ci/licenses_golden/licenses_flutter

@@ -19,6 +19,7 @@
 import androidx.annotation.VisibleForTesting;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.systemchannels.PlatformViewsChannel;
+import io.flutter.embedding.engine.FlutterOverlaySurface;
 import io.flutter.plugin.editing.TextInputPlugin;
 import io.flutter.view.AccessibilityBridge;
 import io.flutter.view.TextureRegistry;
@@ -541,4 +542,17 @@ public void onDisplayPlatformView(int viewId, int x, int y, int width, int heigh
   public void onDisplayOverlaySurface(int id, int x, int y, int width, int height) {
     // TODO: Implement this method. https://github.com/flutter/flutter/issues/58288
   }
-}
+
+  public void onBeginFrame() {
+    // TODO: Implement this method. https://github.com/flutter/flutter/issues/58288
+  }
+
+  public void onEndFrame() {
+    // TODO: Implement this method. https://github.com/flutter/flutter/issues/58288
+  }
+
+  public FlutterOverlaySurface createOverlaySurface() {
+    // TODO: Implement this method. https://github.com/flutter/flutter/issues/58288
+    return null;
+  }
+}

shell/platform/android/BUILD.gn

@@ -0,0 +1,69 @@
+// Copyright 2013 The Flutter 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 FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_
+
+#include <jni.h>
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/android/platform_view_android.h"
+
+namespace flutter {
+
+void FlutterViewHandlePlatformMessage(JNIEnv* env,
+                                      jobject obj,
+                                      jstring channel,
+                                      jobject message,
+                                      jint responseId);
+
+void FlutterViewHandlePlatformMessageResponse(JNIEnv* env,
+                                              jobject obj,
+                                              jint responseId,
+                                              jobject response);
+
+void FlutterViewUpdateSemantics(JNIEnv* env,
+                                jobject obj,
+                                jobject buffer,
+                                jobjectArray strings);
+
+void FlutterViewUpdateCustomAccessibilityActions(JNIEnv* env,
+                                                 jobject obj,
+                                                 jobject buffer,
+                                                 jobjectArray strings);
+
+void FlutterViewOnFirstFrame(JNIEnv* env, jobject obj);
+
+void FlutterViewOnPreEngineRestart(JNIEnv* env, jobject obj);
+
+class AndroidFlutterOverlaySurface {
+ public:
+  AndroidFlutterOverlaySurface(long id, fml::RefPtr<AndroidNativeWindow> window)
+      : id_(id), window_(std::move(window)){};
+
+  long GetId() { return id_; }
+
+  fml::RefPtr<AndroidNativeWindow> GetWindow() { return window_; }
+
+ private:
+  long id_;
+  fml::RefPtr<AndroidNativeWindow> window_;
+};
+
+std::unique_ptr<AndroidFlutterOverlaySurface> FlutterViewCreateOverlaySurface(
+    JNIEnv* env,
+    jobject obj);
+
+void SurfaceTextureAttachToGLContext(JNIEnv* env, jobject obj, jint textureId);
+
+void SurfaceTextureUpdateTexImage(JNIEnv* env, jobject obj);
+
+void SurfaceTextureGetTransformMatrix(JNIEnv* env,
+                                      jobject obj,
+                                      jfloatArray result);
+
+void SurfaceTextureDetachFromGLContext(JNIEnv* env, jobject obj);
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_JNI_H_

shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java

@@ -80,6 +80,26 @@ static jmethodID g_on_first_frame_method = nullptr;
 
 static jmethodID g_on_engine_restart_method = nullptr;
 
+static jmethodID g_create_overlay_surface_method = nullptr;
+static jmethodID g_flutter_overlay_layer_get_id_method = nullptr;
+static jmethodID g_flutter_overlay_layer_get_surface_method = nullptr;
+
+std::unique_ptr<AndroidFlutterOverlaySurface> FlutterViewCreateOverlaySurface(
+    JNIEnv* env,
+    jobject obj) {
+  jobject joverlay_layer =
+      env->CallObjectMethod(obj, g_create_overlay_surface_method);
+  jlong layer_id = env->CallLongMethod(joverlay_layer,
+                                       g_flutter_overlay_layer_get_id_method);
+  jobject surface = env->CallObjectMethod(
+      joverlay_layer, g_flutter_overlay_layer_get_surface_method);
+
+  FML_CHECK(CheckException(env));
+  return std::make_unique<AndroidFlutterOverlaySurface>(
+      layer_id, fml::MakeRefCounted<AndroidNativeWindow>(
+                    ANativeWindow_fromSurface(env, surface)));
+}
+
 static jmethodID g_attach_to_gl_context_method = nullptr;
 
 static jmethodID g_update_tex_image_method = nullptr;
@@ -679,6 +699,10 @@ bool RegisterApi(JNIEnv* env) {
     return false;
   }
 
+  g_create_overlay_surface_method =
+      env->GetMethodID(g_flutter_jni_class->obj(), "createOverlaySurface",
+                       "()Lio/flutter/embedding/engine/FlutterOverlaySurface;");
+
   return true;
 }
 
@@ -703,6 +727,10 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     return false;
   }
 
+  g_create_overlay_surface_method =
+      env->GetMethodID(g_flutter_jni_class->obj(), "createOverlaySurface",
+                       "()Lio/flutter/embedding/engine/FlutterOverlaySurface;");
+
   g_flutter_jni_class = new fml::jni::ScopedJavaGlobalRef<jclass>(
       env, env->FindClass("io/flutter/embedding/engine/FlutterJNI"));
   if (g_flutter_jni_class->is_null()) {