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

Commit ef9e7b1

Browse files
authored
Revert "Lift restriction that embedders may not trample the render thread OpenGL context in composition callbacks. (#16653)" (#16674)
This reverts commit 110c1c9.
1 parent 40e3ab1 commit ef9e7b1

18 files changed

+263
-835
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ FILE: ../../../flutter/fml/file_unittest.cc
126126
FILE: ../../../flutter/fml/gpu_thread_merger.cc
127127
FILE: ../../../flutter/fml/gpu_thread_merger.h
128128
FILE: ../../../flutter/fml/gpu_thread_merger_unittests.cc
129-
FILE: ../../../flutter/fml/hash_combine.h
130-
FILE: ../../../flutter/fml/hash_combine_unittests.cc
131129
FILE: ../../../flutter/fml/icu_util.cc
132130
FILE: ../../../flutter/fml/icu_util.h
133131
FILE: ../../../flutter/fml/log_level.h
@@ -915,20 +913,15 @@ FILE: ../../../flutter/shell/platform/embedder/embedder_engine.cc
915913
FILE: ../../../flutter/shell/platform/embedder/embedder_engine.h
916914
FILE: ../../../flutter/shell/platform/embedder/embedder_external_texture_gl.cc
917915
FILE: ../../../flutter/shell/platform/embedder/embedder_external_texture_gl.h
918-
FILE: ../../../flutter/shell/platform/embedder/embedder_external_view.cc
919-
FILE: ../../../flutter/shell/platform/embedder/embedder_external_view.h
920916
FILE: ../../../flutter/shell/platform/embedder/embedder_external_view_embedder.cc
921917
FILE: ../../../flutter/shell/platform/embedder/embedder_external_view_embedder.h
922918
FILE: ../../../flutter/shell/platform/embedder/embedder_include.c
923-
FILE: ../../../flutter/shell/platform/embedder/embedder_include2.c
924919
FILE: ../../../flutter/shell/platform/embedder/embedder_layers.cc
925920
FILE: ../../../flutter/shell/platform/embedder/embedder_layers.h
926921
FILE: ../../../flutter/shell/platform/embedder/embedder_platform_message_response.cc
927922
FILE: ../../../flutter/shell/platform/embedder/embedder_platform_message_response.h
928923
FILE: ../../../flutter/shell/platform/embedder/embedder_render_target.cc
929924
FILE: ../../../flutter/shell/platform/embedder/embedder_render_target.h
930-
FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.cc
931-
FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.h
932925
FILE: ../../../flutter/shell/platform/embedder/embedder_safe_access.h
933926
FILE: ../../../flutter/shell/platform/embedder/embedder_surface.cc
934927
FILE: ../../../flutter/shell/platform/embedder/embedder_surface.h

fml/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ source_set("fml") {
2626
"file.h",
2727
"gpu_thread_merger.cc",
2828
"gpu_thread_merger.h",
29-
"hash_combine.h",
3029
"icu_util.cc",
3130
"icu_util.h",
3231
"log_level.h",
@@ -233,7 +232,6 @@ executable("fml_unittests") {
233232
"command_line_unittest.cc",
234233
"file_unittest.cc",
235234
"gpu_thread_merger_unittests.cc",
236-
"hash_combine_unittests.cc",
237235
"memory/ref_counted_unittest.cc",
238236
"memory/weak_ptr_unittest.cc",
239237
"message_loop_task_queues_merge_unmerge_unittests.cc",

fml/hash_combine.h

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

fml/hash_combine_unittests.cc

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

shell/common/canvas_spy.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ class CanvasSpy {
2626
public:
2727
CanvasSpy(SkCanvas* target_canvas);
2828

29-
//----------------------------------------------------------------------------
30-
/// @brief Returns true if any non transparent content has been drawn
29+
//------------------------------------------------------------------------------
30+
/// @brief Returns true if any non trasnparent content has been drawn
3131
/// into
3232
/// the spying canvas. Note that this class does tries to detect
3333
/// empty canvases but in some cases may return true even for
3434
/// empty canvases (e.g when a transparent image is drawn into the
3535
/// canvas).
3636
bool DidDrawIntoCanvas();
3737

38-
//----------------------------------------------------------------------------
38+
//------------------------------------------------------------------------------
3939
/// @brief The returned canvas delegate all operations to the target
4040
/// canvas
4141
/// while spying on them.

shell/platform/embedder/BUILD.gn

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,15 @@ template("embedder_source_set") {
2929
"embedder_engine.h",
3030
"embedder_external_texture_gl.cc",
3131
"embedder_external_texture_gl.h",
32-
"embedder_external_view.cc",
33-
"embedder_external_view.h",
3432
"embedder_external_view_embedder.cc",
3533
"embedder_external_view_embedder.h",
3634
"embedder_include.c",
37-
"embedder_include2.c",
3835
"embedder_layers.cc",
3936
"embedder_layers.h",
4037
"embedder_platform_message_response.cc",
4138
"embedder_platform_message_response.h",
4239
"embedder_render_target.cc",
4340
"embedder_render_target.h",
44-
"embedder_render_target_cache.cc",
45-
"embedder_render_target_cache.h",
4641
"embedder_safe_access.h",
4742
"embedder_surface.cc",
4843
"embedder_surface.h",

shell/platform/embedder/embedder_external_view.cc

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

shell/platform/embedder/embedder_external_view.h

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

0 commit comments

Comments
 (0)