Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit d6b962d

Browse files
authored
Revert "[Impeller] Support for rendering Android Platform Views into a HardwareBuffer backed texture." (#44262)
Reverts #44087 Reverting for flutter/flutter#131772
1 parent fbefacd commit d6b962d

36 files changed

+51
-1154
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,11 +1686,8 @@ ORIGIN: ../../../flutter/impeller/toolkit/egl/display.cc + ../../../flutter/LICE
16861686
ORIGIN: ../../../flutter/impeller/toolkit/egl/display.h + ../../../flutter/LICENSE
16871687
ORIGIN: ../../../flutter/impeller/toolkit/egl/egl.cc + ../../../flutter/LICENSE
16881688
ORIGIN: ../../../flutter/impeller/toolkit/egl/egl.h + ../../../flutter/LICENSE
1689-
ORIGIN: ../../../flutter/impeller/toolkit/egl/image.h + ../../../flutter/LICENSE
16901689
ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.cc + ../../../flutter/LICENSE
16911690
ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.h + ../../../flutter/LICENSE
1692-
ORIGIN: ../../../flutter/impeller/toolkit/gles/gles.h + ../../../flutter/LICENSE
1693-
ORIGIN: ../../../flutter/impeller/toolkit/gles/texture.h + ../../../flutter/LICENSE
16941691
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc + ../../../flutter/LICENSE
16951692
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h + ../../../flutter/LICENSE
16961693
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_render_context_skia.cc + ../../../flutter/LICENSE
@@ -2325,8 +2322,6 @@ ORIGIN: ../../../flutter/shell/platform/android/external_view_embedder/surface_p
23252322
ORIGIN: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool.h + ../../../flutter/LICENSE
23262323
ORIGIN: ../../../flutter/shell/platform/android/flutter_main.cc + ../../../flutter/LICENSE
23272324
ORIGIN: ../../../flutter/shell/platform/android/flutter_main.h + ../../../flutter/LICENSE
2328-
ORIGIN: ../../../flutter/shell/platform/android/hardware_buffer_external_texture_gl.cc + ../../../flutter/LICENSE
2329-
ORIGIN: ../../../flutter/shell/platform/android/hardware_buffer_external_texture_gl.h + ../../../flutter/LICENSE
23302325
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java + ../../../flutter/LICENSE
23312326
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/Log.java + ../../../flutter/LICENSE
23322327
ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java + ../../../flutter/LICENSE
@@ -2468,8 +2463,6 @@ ORIGIN: ../../../flutter/shell/platform/android/jni/jni_mock.h + ../../../flutte
24682463
ORIGIN: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.cc + ../../../flutter/LICENSE
24692464
ORIGIN: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.h + ../../../flutter/LICENSE
24702465
ORIGIN: ../../../flutter/shell/platform/android/library_loader.cc + ../../../flutter/LICENSE
2471-
ORIGIN: ../../../flutter/shell/platform/android/ndk_helpers.cc + ../../../flutter/LICENSE
2472-
ORIGIN: ../../../flutter/shell/platform/android/ndk_helpers.h + ../../../flutter/LICENSE
24732466
ORIGIN: ../../../flutter/shell/platform/android/platform_message_handler_android.h + ../../../flutter/LICENSE
24742467
ORIGIN: ../../../flutter/shell/platform/android/platform_message_response_android.cc + ../../../flutter/LICENSE
24752468
ORIGIN: ../../../flutter/shell/platform/android/platform_message_response_android.h + ../../../flutter/LICENSE
@@ -4389,13 +4382,8 @@ FILE: ../../../flutter/impeller/toolkit/egl/display.cc
43894382
FILE: ../../../flutter/impeller/toolkit/egl/display.h
43904383
FILE: ../../../flutter/impeller/toolkit/egl/egl.cc
43914384
FILE: ../../../flutter/impeller/toolkit/egl/egl.h
4392-
FILE: ../../../flutter/impeller/toolkit/egl/image.cc
4393-
FILE: ../../../flutter/impeller/toolkit/egl/image.h
43944385
FILE: ../../../flutter/impeller/toolkit/egl/surface.cc
43954386
FILE: ../../../flutter/impeller/toolkit/egl/surface.h
4396-
FILE: ../../../flutter/impeller/toolkit/gles/gles.h
4397-
FILE: ../../../flutter/impeller/toolkit/gles/texture.cc
4398-
FILE: ../../../flutter/impeller/toolkit/gles/texture.h
43994387
FILE: ../../../flutter/impeller/tools/malioc.json
44004388
FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc
44014389
FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h
@@ -5032,8 +5020,6 @@ FILE: ../../../flutter/shell/platform/android/external_view_embedder/surface_poo
50325020
FILE: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool.h
50335021
FILE: ../../../flutter/shell/platform/android/flutter_main.cc
50345022
FILE: ../../../flutter/shell/platform/android/flutter_main.h
5035-
FILE: ../../../flutter/shell/platform/android/hardware_buffer_external_texture_gl.cc
5036-
FILE: ../../../flutter/shell/platform/android/hardware_buffer_external_texture_gl.h
50375023
FILE: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java
50385024
FILE: ../../../flutter/shell/platform/android/io/flutter/Log.java
50395025
FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
@@ -5151,7 +5137,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextInpu
51515137
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java
51525138
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java
51535139
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java
5154-
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java
51555140
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java
51565141
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
51575142
FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java
@@ -5184,8 +5169,6 @@ FILE: ../../../flutter/shell/platform/android/jni/jni_mock.h
51845169
FILE: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.cc
51855170
FILE: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.h
51865171
FILE: ../../../flutter/shell/platform/android/library_loader.cc
5187-
FILE: ../../../flutter/shell/platform/android/ndk_helpers.cc
5188-
FILE: ../../../flutter/shell/platform/android/ndk_helpers.h
51895172
FILE: ../../../flutter/shell/platform/android/platform_message_handler_android.cc
51905173
FILE: ../../../flutter/shell/platform/android/platform_message_handler_android.h
51915174
FILE: ../../../flutter/shell/platform/android/platform_message_response_android.cc

impeller/toolkit/egl/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ impeller_component("egl") {
1414
"display.h",
1515
"egl.cc",
1616
"egl.h",
17-
"image.cc",
18-
"image.h",
1917
"surface.cc",
2018
"surface.h",
2119
]

impeller/toolkit/egl/egl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
#pragma once
66

77
#include <EGL/egl.h>
8-
#define EGL_EGLEXT_PROTOTYPES
9-
#include <EGL/eglext.h>
108

119
#include <functional>
1210

impeller/toolkit/egl/image.cc

Lines changed: 0 additions & 3 deletions
This file was deleted.

impeller/toolkit/egl/image.h

Lines changed: 0 additions & 74 deletions
This file was deleted.

impeller/toolkit/gles/BUILD.gn

Lines changed: 0 additions & 20 deletions
This file was deleted.

impeller/toolkit/gles/gles.h

Lines changed: 0 additions & 9 deletions
This file was deleted.

impeller/toolkit/gles/texture.cc

Lines changed: 0 additions & 3 deletions
This file was deleted.

impeller/toolkit/gles/texture.h

Lines changed: 0 additions & 39 deletions
This file was deleted.

shell/platform/android/BUILD.gn

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ source_set("flutter_shell_native_src") {
9898
"apk_asset_provider.h",
9999
"flutter_main.cc",
100100
"flutter_main.h",
101-
"hardware_buffer_external_texture_gl.cc",
102-
"hardware_buffer_external_texture_gl.h",
103101
"library_loader.cc",
104-
"ndk_helpers.cc",
105-
"ndk_helpers.h",
106102
"platform_message_handler_android.cc",
107103
"platform_message_handler_android.h",
108104
"platform_message_response_android.cc",
@@ -126,7 +122,6 @@ source_set("flutter_shell_native_src") {
126122
"//flutter/fml",
127123
"//flutter/impeller",
128124
"//flutter/impeller/toolkit/egl",
129-
"//flutter/impeller/toolkit/gles",
130125
"//flutter/lib/ui",
131126
"//flutter/runtime",
132127
"//flutter/runtime:libdart",
@@ -292,7 +287,6 @@ android_java_sources = [
292287
"io/flutter/plugin/localization/LocalizationPlugin.java",
293288
"io/flutter/plugin/mouse/MouseCursorPlugin.java",
294289
"io/flutter/plugin/platform/AccessibilityEventsDelegate.java",
295-
"io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java",
296290
"io/flutter/plugin/platform/PlatformOverlayView.java",
297291
"io/flutter/plugin/platform/PlatformPlugin.java",
298292
"io/flutter/plugin/platform/PlatformView.java",

0 commit comments

Comments
 (0)