DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert add createOverlaySurface JNI #19040 (flutter/engine#19075)

Browse Source
This commit is contained in:
Emmanuel Garcia 2020-06-16 14:06:15 -07:00 committed by GitHub
parent 3d304e3088
commit f44a132c1b
9 changed files with 0 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/src/flutter/ci/licenses_golden/licenses_flutter
View File

@ -702,7 +702,6 @@ 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

1
engine/src/flutter/shell/platform/android/BUILD.gn
View File

@ -150,7 +150,6 @@ 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",

11
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
View File

@ -827,17 +827,6 @@ public class FlutterJNI {
}
platformViewsController.onEndFrame();
}
@SuppressWarnings("unused")
@UiThread
public FlutterOverlaySurface createOverlaySurface() {
ensureRunningOnMainThread();
if (platformViewsController == null) {
throw new RuntimeException(
"platformViewsController must be set before attempting to position an overlay surface");
}
return platformViewsController.createOverlaySurface();
}
// ----- End Engine Lifecycle Support ----
// ----- Start Localization Support ----

29
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java
View File

@ -1,29 +0,0 @@
// 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;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
public class FlutterOverlaySurface {
@NonNull private final Surface surface;
private final long id;
@Keep
public FlutterOverlaySurface(long id, @NonNull Surface surface) {
this.id = id;
this.surface = surface;
}
public long getId() {
return id;
}
public Surface getSurface() {
return surface;
}
}

6
engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
View File

@ -17,7 +17,6 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.UiThread;
import androidx.annotation.VisibleForTesting;
import io.flutter.embedding.engine.FlutterOverlaySurface;
import io.flutter.embedding.engine.dart.DartExecutor;
import io.flutter.embedding.engine.systemchannels.PlatformViewsChannel;
import io.flutter.plugin.editing.TextInputPlugin;
@ -550,9 +549,4 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
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;
}
}

8
engine/src/flutter/shell/platform/android/jni/platform_view_android_jni.h
View File

@ -130,7 +130,6 @@ class PlatformViewAndroidJNI {
int y,
int width,
int height) = 0;
//----------------------------------------------------------------------------
/// @brief Initiates a frame if using hybrid composition.
///
@ -147,13 +146,6 @@ class PlatformViewAndroidJNI {
///
virtual void FlutterViewEndFrame() = 0;
//----------------------------------------------------------------------------
/// @brief Instantiates an overlay surface in hybrid composition.
///
/// @note Must be called from the platform thread.
///
virtual void FlutterViewCreateOverlaySurface() = 0;
//----------------------------------------------------------------------------
/// @brief Computes the locale Android would select.
///

32
engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.cc
View File

@ -24,7 +24,6 @@
#include "flutter/shell/platform/android/android_shell_holder.h"
#include "flutter/shell/platform/android/apk_asset_provider.h"
#include "flutter/shell/platform/android/flutter_main.h"
#include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
#include "flutter/shell/platform/android/platform_view_android.h"
#define ANDROID_SHELL_HOLDER \
@ -81,8 +80,6 @@ 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_on_begin_frame_method = nullptr;
static jmethodID g_on_end_frame_method = nullptr;
@ -689,10 +686,6 @@ 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;
}
@ -717,10 +710,6 @@ 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()) {
@ -752,14 +741,6 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
return false;
}
g_create_overlay_surface_method = env->GetMethodID(
g_flutter_jni_class->obj(), "createOverlaySurface", "()V");
if (g_create_overlay_surface_method == nullptr) {
FML_LOG(ERROR) << "Could not locate createOverlaySurface method";
return false;
}
g_on_display_overlay_surface_method = env->GetMethodID(
g_flutter_jni_class->obj(), "onDisplayOverlaySurface", "(IIIII)V");
@ -1111,19 +1092,6 @@ void PlatformViewAndroidJNIImpl::FlutterViewEndFrame() {
FML_CHECK(CheckException(env));
}
void PlatformViewAndroidJNIImpl::FlutterViewCreateOverlaySurface() {
JNIEnv* env = fml::jni::AttachCurrentThread();
auto java_object = java_object_.get(env);
if (java_object.is_null()) {
return;
}
env->CallVoidMethod(java_object.obj(), g_create_overlay_surface_method);
FML_CHECK(CheckException(env));
}
std::unique_ptr<std::vector<std::string>>
PlatformViewAndroidJNIImpl::FlutterViewComputePlatformResolvedLocale(
std::vector<std::string> supported_locales_data) {

2
engine/src/flutter/shell/platform/android/platform_view_android_jni_impl.h
View File

@ -66,8 +66,6 @@ class PlatformViewAndroidJNIImpl final : public PlatformViewAndroidJNI {
void FlutterViewEndFrame() override;
void FlutterViewCreateOverlaySurface() override;
std::unique_ptr<std::vector<std::string>>
FlutterViewComputePlatformResolvedLocale(
std::vector<std::string> supported_locales_data) override;

14
engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/FlutterJNITest.java
View File

@ -201,18 +201,4 @@ public class FlutterJNITest {
// --- Verify Results ---
verify(platformViewsController, times(1)).onEndFrame();
}
@Test
public void createOverlaySurface__callsPlatformViewsController() {
PlatformViewsController platformViewsController = mock(PlatformViewsController.class);
FlutterJNI flutterJNI = new FlutterJNI();
flutterJNI.setPlatformViewsController(platformViewsController);
// --- Execute Test ---
flutterJNI.createOverlaySurface();
// --- Verify Results ---
verify(platformViewsController, times(1)).createOverlaySurface();
}
}