From 40aa579a6919f2ae6a69ca706b414e0791ded359 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Fri, 16 Jul 2021 10:07:15 -0700 Subject: [PATCH 01/11] Use a Pbuffer surface for snapshotting when in background --- BUILD.gn | 4 + ci/firebase_testlab.py | 60 +++++++----- shell/common/platform_view.cc | 5 +- shell/common/platform_view.h | 20 +++- shell/common/rasterizer.cc | 31 ++++-- shell/common/rasterizer.h | 10 ++ shell/common/rasterizer_unittests.cc | 1 + shell/common/shell.cc | 13 +++ shell/common/shell.h | 3 + shell/platform/android/android_context_gl.cc | 10 ++ shell/platform/android/android_context_gl.h | 8 ++ shell/platform/android/android_surface_gl.cc | 12 +++ shell/platform/android/android_surface_gl.h | 3 + .../platform/android/platform_view_android.cc | 8 ++ .../platform/android/platform_view_android.h | 3 + .../android/surface/android_surface.cc | 4 + .../android/surface/android_surface.h | 2 + testing/android_background_image/.gitignore | 11 +++ testing/android_background_image/BUILD.gn | 37 +++++++ testing/android_background_image/README.md | 3 + .../android/.gitignore | 15 +++ .../android_background_image/android/BUILD.gn | 44 +++++++++ .../android/app/.gitignore | 1 + .../android/app/build.gradle | 47 +++++++++ .../android/app/proguard-rules.pro | 21 ++++ .../android/app/src/main/AndroidManifest.xml | 27 ++++++ .../MainActivity.java | 42 ++++++++ .../android/build.gradle | 36 +++++++ .../android/gradle-home/.vpython | 11 +++ .../android/gradle-home/bin/python | 14 +++ .../android/gradle.properties | 4 + .../gradle/wrapper/gradle-wrapper.properties | 6 ++ .../android/settings.gradle | 1 + .../android_background_image/lib/main.dart | 59 ++++++++++++ testing/android_background_image/pubspec.yaml | 22 +++++ .../.gradle/6.5/fileChanges/last-build.bin | Bin 0 -> 1 bytes testing/rules/.gradle/6.5/gc.properties | 0 testing/rules/.gradle/vcs-1/gc.properties | 0 testing/rules/android.gni | 41 ++++++++ .../android => rules}/run_gradle.py | 6 +- .../{scenario_app => rules}/runtime_mode.gni | 0 testing/scenario_app/BUILD.gn | 2 +- testing/scenario_app/android/BUILD.gn | 90 +++++++----------- testing/scenario_app/android/app/build.gradle | 2 +- testing/scenario_app/ios/BUILD.gn | 2 +- tools/pub_get_offline.py | 1 + 46 files changed, 644 insertions(+), 98 deletions(-) create mode 100644 testing/android_background_image/.gitignore create mode 100644 testing/android_background_image/BUILD.gn create mode 100644 testing/android_background_image/README.md create mode 100644 testing/android_background_image/android/.gitignore create mode 100644 testing/android_background_image/android/BUILD.gn create mode 100644 testing/android_background_image/android/app/.gitignore create mode 100644 testing/android_background_image/android/app/build.gradle create mode 100644 testing/android_background_image/android/app/proguard-rules.pro create mode 100644 testing/android_background_image/android/app/src/main/AndroidManifest.xml create mode 100644 testing/android_background_image/android/app/src/main/java/dev/flutter/android_background_image/MainActivity.java create mode 100644 testing/android_background_image/android/build.gradle create mode 100644 testing/android_background_image/android/gradle-home/.vpython create mode 100755 testing/android_background_image/android/gradle-home/bin/python create mode 100644 testing/android_background_image/android/gradle.properties create mode 100644 testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 testing/android_background_image/android/settings.gradle create mode 100644 testing/android_background_image/lib/main.dart create mode 100644 testing/android_background_image/pubspec.yaml create mode 100644 testing/rules/.gradle/6.5/fileChanges/last-build.bin create mode 100644 testing/rules/.gradle/6.5/gc.properties create mode 100644 testing/rules/.gradle/vcs-1/gc.properties create mode 100644 testing/rules/android.gni rename testing/{scenario_app/android => rules}/run_gradle.py (81%) rename testing/{scenario_app => rules}/runtime_mode.gni (100%) diff --git a/BUILD.gn b/BUILD.gn index 7a0e6db7ac758..18447f78aca5f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -121,6 +121,10 @@ group("flutter") { public_deps += [ "//flutter/testing/scenario_app" ] } + if (is_android && flutter_runtime_mode == "profile") { + public_deps += [ "//flutter/testing/android_background_image" ] + } + # Compile all unittests targets if enabled. if (enable_unittests) { public_deps += [ diff --git a/ci/firebase_testlab.py b/ci/firebase_testlab.py index 2b5f440a436cb..7aef50c37918b 100755 --- a/ci/firebase_testlab.py +++ b/ci/firebase_testlab.py @@ -19,28 +19,28 @@ def RunFirebaseTest(apk, results_dir): - try: - # game-loop tests are meant for OpenGL apps. - # This type of test will give the application a handle to a file, and - # we'll write the timeline JSON to that file. - # See https://firebase.google.com/docs/test-lab/android/game-loop - # Pixel 4. As of this commit, this is a highly available device in FTL. - subprocess.check_output([ - 'gcloud', - '--project', 'flutter-infra', - 'firebase', 'test', 'android', 'run', - '--type', 'game-loop', - '--app', apk, - '--timeout', '2m', - '--results-bucket', bucket, - '--results-dir', results_dir, - '--device', 'model=flame,version=29', - ]) - except subprocess.CalledProcessError as ex: - print(ex.output) - # Recipe will retry return codes from firebase that indicate an infra - # failure. - sys.exit(ex.returncode) + # game-loop tests are meant for OpenGL apps. + # This type of test will give the application a handle to a file, and + # we'll write the timeline JSON to that file. + # See https://firebase.google.com/docs/test-lab/android/game-loop + # Pixel 4. As of this commit, this is a highly available device in FTL. + process = subprocess.Popen( + [ + 'gcloud', + '--project', 'flutter-infra', + 'firebase', 'test', 'android', 'run', + '--type', 'game-loop', + '--app', apk, + '--timeout', '2m', + '--results-bucket', bucket, + '--results-dir', results_dir, + '--device', 'model=flame,version=29', + ], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True, + ) + return process def CheckLogcat(results_dir): @@ -87,13 +87,25 @@ def main(): git_revision = subprocess.check_output( ['git', 'rev-parse', 'HEAD'], cwd=script_dir).strip() + results = [] for apk in apks: results_dir = '%s/%s/%s' % (os.path.basename(apk), git_revision, args.build_id) - - RunFirebaseTest(apk, results_dir) + process = RunFirebaseTest(apk, results_dir) + results.append((results_dir, process)) + + for results_dir, process in results: + for line in iter(process.stdout.readline, ""): + print(line.strip()) + return_code = process.wait() + if return_code != 0: + print('Firebase test failed ' + returncode) + sys.exit(process.returncode) + + print('Checking logcat for %s' % results_dir) CheckLogcat(results_dir) # scenario_app produces a timeline, but the android image test does not. if 'scenario' in apk: + print('Checking timeline for %s' % results_dir) CheckTimeline(results_dir) return 0 diff --git a/shell/common/platform_view.cc b/shell/common/platform_view.cc index b2c552599e547..938dc5caf43dd 100644 --- a/shell/common/platform_view.cc +++ b/shell/common/platform_view.cc @@ -67,7 +67,6 @@ void PlatformView::SetViewportMetrics(const ViewportMetrics& metrics) { void PlatformView::NotifyCreated() { std::unique_ptr surface; - // Threading: We want to use the platform view on the non-platform thread. // Using the weak pointer is illegal. But, we are going to introduce a latch // so that the platform view is not collected till the surface is obtained. @@ -182,4 +181,8 @@ void PlatformView::UpdateAssetResolverByType( delegate_.UpdateAssetResolverByType(std::move(updated_asset_resolver), type); } +std::unique_ptr PlatformView::CreateRasterSnapshotSurface() { + return nullptr; +} + } // namespace flutter diff --git a/shell/common/platform_view.h b/shell/common/platform_view.h index 186237b02ad33..fef98fcacecd0 100644 --- a/shell/common/platform_view.h +++ b/shell/common/platform_view.h @@ -62,7 +62,7 @@ class PlatformView { /// Metal, Vulkan) specific. This is usually a sign to the /// rasterizer to set up and begin rendering to that surface. /// - /// @param[in] surface The surface + /// @param[in] surface The surface /// virtual void OnPlatformViewCreated(std::unique_ptr surface) = 0; @@ -796,6 +796,22 @@ class PlatformView { std::unique_ptr updated_asset_resolver, AssetResolver::AssetResolverType type); + //-------------------------------------------------------------------------- + /// @brief Creates a Surface suitable for raster snapshotting. The + /// rasterizer will request this surface if no on screen surface + /// is currently available and a snapshot has been requested + /// by the framework, e.g. if `Scene.toImage` or `Picture.toImage` + /// are called while the application is in the background. + /// + /// Not all backends support this kind of surface usage, and the + /// default implementation returns nullptr. Platforms should + /// override this if they can support GPU operations in the + /// background and support GPU resource context usage. + /// + /// This is the only public method of this interface called on the + /// raster task runner. + virtual std::unique_ptr CreateRasterSnapshotSurface(); + protected: PlatformView::Delegate& delegate_; const TaskRunners task_runners_; @@ -804,7 +820,7 @@ class PlatformView { SkISize size_; fml::WeakPtrFactory weak_factory_; - // Unlike all other methods on the platform view, this is called on the + // This and CreateRasterSnapshotSurface are the only methods called on the // raster task runner. virtual std::unique_ptr CreateRenderingSurface(); diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc index 8a149bebd5b2f..c405720cac1f5 100644 --- a/shell/common/rasterizer.cc +++ b/shell/common/rasterizer.cc @@ -258,11 +258,19 @@ sk_sp Rasterizer::DoMakeRasterSnapshot( sk_sp result; SkImageInfo image_info = SkImageInfo::MakeN32Premul( size.width(), size.height(), SkColorSpace::MakeSRGB()); - if (surface_ == nullptr || surface_->GetContext() == nullptr) { + + std::unique_ptr pbuffer_surface; + if (!surface_) { + pbuffer_surface = delegate_.CreateSnapshotSurface(); + } + + if ((surface_ == nullptr || surface_->GetContext() == nullptr) && + (pbuffer_surface == nullptr || + pbuffer_surface->GetContext() == nullptr)) { // Raster surface is fine if there is no on screen surface. This might // happen in case of software rendering. - sk_sp surface = SkSurface::MakeRaster(image_info); - result = DrawSnapshot(surface, draw_callback); + sk_sp sk_surface = SkSurface::MakeRaster(image_info); + result = DrawSnapshot(sk_surface, draw_callback); } else { delegate_.GetIsGpuDisabledSyncSwitch()->Execute( fml::SyncSwitch::Handlers() @@ -271,12 +279,17 @@ sk_sp Rasterizer::DoMakeRasterSnapshot( result = DrawSnapshot(surface, draw_callback); }) .SetIfFalse([&] { - auto context_switch = surface_->MakeRenderContextCurrent(); + Surface* surface = surface_.get(); + if (!surface) { + surface = pbuffer_surface.get(); + } + FML_DCHECK(surface); + auto context_switch = surface->MakeRenderContextCurrent(); if (!context_switch->GetResult()) { return; } - GrRecordingContext* context = surface_->GetContext(); + GrRecordingContext* context = surface->GetContext(); auto max_size = context->maxRenderTargetSize(); double scale_factor = std::min( 1.0, static_cast(max_size) / @@ -294,19 +307,19 @@ sk_sp Rasterizer::DoMakeRasterSnapshot( // When there is an on screen surface, we need a render target // SkSurface because we want to access texture backed images. - sk_sp surface = + sk_sp sk_surface = SkSurface::MakeRenderTarget(context, // context SkBudgeted::kNo, // budgeted image_info // image info ); - if (!surface) { + if (!sk_surface) { FML_LOG(ERROR) << "DoMakeRasterSnapshot can not create GPU render target"; return; } - surface->getCanvas()->scale(scale_factor, scale_factor); - result = DrawSnapshot(surface, draw_callback); + sk_surface->getCanvas()->scale(scale_factor, scale_factor); + result = DrawSnapshot(sk_surface, draw_callback); })); } diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.h index aa7334179e970..c8ee34bd0cab5 100644 --- a/shell/common/rasterizer.h +++ b/shell/common/rasterizer.h @@ -90,6 +90,16 @@ class Rasterizer final : public SnapshotDelegate { /// is critical that GPU operations are not processed. virtual std::shared_ptr GetIsGpuDisabledSyncSwitch() const = 0; + + /// Called by the Rasterizer if a snapshot is requested while no surface + /// is currently available, for example after a platform has torn down + /// the surface. + /// + /// For some rendering backends or some platforms, using a GPU surface for + /// snapshotting while in the background may not be possible or necessary. + /// In that case, this method must return nullptr and the rasterizer will + /// attempt to use a CPU based raster surface for snapshotting. + virtual std::unique_ptr CreateSnapshotSurface() = 0; }; //---------------------------------------------------------------------------- diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc index 0ecc3d576253a..cb54fef27a097 100644 --- a/shell/common/rasterizer_unittests.cc +++ b/shell/common/rasterizer_unittests.cc @@ -30,6 +30,7 @@ class MockDelegate : public Rasterizer::Delegate { MOCK_CONST_METHOD0(GetTaskRunners, const TaskRunners&()); MOCK_CONST_METHOD0(GetIsGpuDisabledSyncSwitch, std::shared_ptr()); + MOCK_METHOD0(CreateSnapshotSurface, std::unique_ptr()); }; class MockSurface : public Surface { diff --git a/shell/common/shell.cc b/shell/common/shell.cc index beea55e86736e..dba4833bdf927 100644 --- a/shell/common/shell.cc +++ b/shell/common/shell.cc @@ -1362,6 +1362,19 @@ void Shell::ReportTimings() { }); } +std::unique_ptr Shell::CreateSnapshotSurface() { + FML_DCHECK(is_setup_); + FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread()); + // Threading: This is safe because the dtor resets the rasterizer before + // the platform_view. This method is private to the rasterizer delegate + // and cannot be called without a valid rasterizer. + // See also: PlatformView::NotifyCreated + if (!platform_view_) { + return nullptr; + } + return platform_view_->CreateRasterSnapshotSurface(); +} + size_t Shell::UnreportedFramesCount() const { // Check that this is running on the raster thread to avoid race conditions. FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread()); diff --git a/shell/common/shell.h b/shell/common/shell.h index 374a0968bbf05..b535b58f0c06f 100644 --- a/shell/common/shell.h +++ b/shell/common/shell.h @@ -590,6 +590,9 @@ class Shell final : public PlatformView::Delegate, // |Rasterizer::Delegate| fml::TimePoint GetLatestFrameTargetTime() const override; + // |Rasterizer::Delegate| + std::unique_ptr CreateSnapshotSurface() override; + // |ServiceProtocol::Handler| fml::RefPtr GetServiceProtocolHandlerTaskRunner( std::string_view method) const override; diff --git a/shell/platform/android/android_context_gl.cc b/shell/platform/android/android_context_gl.cc index 04e8b43d902be..ee056925d05a4 100644 --- a/shell/platform/android/android_context_gl.cc +++ b/shell/platform/android/android_context_gl.cc @@ -227,6 +227,16 @@ std::unique_ptr AndroidContextGL::CreateOffscreenSurface() resource_context_); } +std::unique_ptr AndroidContextGL::CreatePbufferSurface() + const { + EGLDisplay display = environment_->Display(); + + const EGLint attribs[] = {EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE}; + + EGLSurface surface = eglCreatePbufferSurface(display, config_, attribs); + return std::make_unique(surface, display, context_); +} + fml::RefPtr AndroidContextGL::Environment() const { return environment_; } diff --git a/shell/platform/android/android_context_gl.h b/shell/platform/android/android_context_gl.h index b888409ac22b0..b9e34ecf6f854 100644 --- a/shell/platform/android/android_context_gl.h +++ b/shell/platform/android/android_context_gl.h @@ -93,6 +93,14 @@ class AndroidContextGL : public AndroidContext { /// std::unique_ptr CreateOffscreenSurface() const; + //---------------------------------------------------------------------------- + /// @brief Allocates an 1x1 pbuffer surface that is used for making the + /// onscreen context current for snapshotting. + /// + /// @return The pbuffer surface. + /// + std::unique_ptr CreatePbufferSurface() const; + //---------------------------------------------------------------------------- /// @return The Android environment that contains a reference to the /// display. diff --git a/shell/platform/android/android_surface_gl.cc b/shell/platform/android/android_surface_gl.cc index f8a933dedeb69..224b2280d22e2 100644 --- a/shell/platform/android/android_surface_gl.cc +++ b/shell/platform/android/android_surface_gl.cc @@ -175,4 +175,16 @@ AndroidContextGL* AndroidSurfaceGL::GLContextPtr() const { return reinterpret_cast(android_context_.get()); } +std::unique_ptr AndroidSurfaceGL::CreatePbufferSurface() { + onscreen_surface_ = GLContextPtr()->CreatePbufferSurface(); + sk_sp main_skia_context = + GLContextPtr()->GetMainSkiaContext(); + if (!main_skia_context) { + main_skia_context = GPUSurfaceGL::MakeGLContext(this); + GLContextPtr()->SetMainSkiaContext(main_skia_context); + } + + return std::make_unique(main_skia_context, this, true); +} + } // namespace flutter diff --git a/shell/platform/android/android_surface_gl.h b/shell/platform/android/android_surface_gl.h index 8db60f3176b3e..31ea82727bf52 100644 --- a/shell/platform/android/android_surface_gl.h +++ b/shell/platform/android/android_surface_gl.h @@ -48,6 +48,9 @@ class AndroidSurfaceGL final : public GPUSurfaceGLDelegate, // |AndroidSurface| bool SetNativeWindow(fml::RefPtr window) override; + // |AndroidSurface| + virtual std::unique_ptr CreatePbufferSurface() override; + // |GPUSurfaceGLDelegate| std::unique_ptr GLContextMakeCurrent() override; diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc index 0cb40991f0f2b..234d068d2bfb3 100644 --- a/shell/platform/android/platform_view_android.cc +++ b/shell/platform/android/platform_view_android.cc @@ -404,4 +404,12 @@ void PlatformViewAndroid::FireFirstFrameCallback() { jni_facade_->FlutterViewOnFirstFrame(); } +std::unique_ptr PlatformViewAndroid::CreateRasterSnapshotSurface() { + FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread()); + if (!android_surface_) { + return nullptr; + } + return android_surface_->CreatePbufferSurface(); +} + } // namespace flutter diff --git a/shell/platform/android/platform_view_android.h b/shell/platform/android/platform_view_android.h index 725b0f077c7a3..5c7d3311be753 100644 --- a/shell/platform/android/platform_view_android.h +++ b/shell/platform/android/platform_view_android.h @@ -117,6 +117,9 @@ class PlatformViewAndroid final : public PlatformView { return android_context_; } + // |PlatformView| + std::unique_ptr CreateRasterSnapshotSurface() override; + private: const std::shared_ptr jni_facade_; std::shared_ptr android_context_; diff --git a/shell/platform/android/surface/android_surface.cc b/shell/platform/android/surface/android_surface.cc index afa4a1ba73479..22162544f88b5 100644 --- a/shell/platform/android/surface/android_surface.cc +++ b/shell/platform/android/surface/android_surface.cc @@ -15,4 +15,8 @@ AndroidSurface::AndroidSurface( AndroidSurface::~AndroidSurface() = default; +std::unique_ptr AndroidSurface::CreatePbufferSurface() { + return nullptr; +} + } // namespace flutter diff --git a/shell/platform/android/surface/android_surface.h b/shell/platform/android/surface/android_surface.h index 74b3fe0efe656..70cee01bfe380 100644 --- a/shell/platform/android/surface/android_surface.h +++ b/shell/platform/android/surface/android_surface.h @@ -37,6 +37,8 @@ class AndroidSurface { virtual bool SetNativeWindow(fml::RefPtr window) = 0; + virtual std::unique_ptr CreatePbufferSurface(); + protected: explicit AndroidSurface( const std::shared_ptr& android_context); diff --git a/testing/android_background_image/.gitignore b/testing/android_background_image/.gitignore new file mode 100644 index 0000000000000..7da18b117ef65 --- /dev/null +++ b/testing/android_background_image/.gitignore @@ -0,0 +1,11 @@ +.packages +pubspec.lock # This only has local dependencies in it. +build/ + +ios/Scenarios/*.framework/ +ios/Scenarios/*.xcframework/ +android/app/libs/flutter.jar +android/app/src/main/jniLibs/arm64-v8a/libapp.so +android/gradle-home/.cache + +!.vpython diff --git a/testing/android_background_image/BUILD.gn b/testing/android_background_image/BUILD.gn new file mode 100644 index 0000000000000..6be88bd4e2c90 --- /dev/null +++ b/testing/android_background_image/BUILD.gn @@ -0,0 +1,37 @@ +# 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. + +import("//flutter/build/dart/rules.gni") +import("//flutter/testing/rules/runtime_mode.gni") + +assert(is_android) + +dart_snapshot("android_background_image_snapshot") { + main_dart = "lib/main.dart" + package_config = ".dart_tool/package_config.json" +} + +if (!is_aot) { + copy("copy_jit_assets") { + visibility = [ ":*" ] + sources = [ + "$target_gen_dir/isolate_snapshot_data", + "$target_gen_dir/isolate_snapshot_instr", + "$target_gen_dir/kernel_blob.bin", + ] + outputs = [ "$root_out_dir/android_background_image/app/assets/flutter_assets/{{source_file_part}}" ] + deps = [ ":android_background_image_snapshot" ] + } +} + +group("android_background_image") { + deps = [ + ":android_background_image_snapshot", + "android", + ] + + if (!is_aot) { + deps += [ ":copy_jit_assets" ] + } +} diff --git a/testing/android_background_image/README.md b/testing/android_background_image/README.md new file mode 100644 index 0000000000000..fcc6359532ef0 --- /dev/null +++ b/testing/android_background_image/README.md @@ -0,0 +1,3 @@ +# Android Background Image + +A test application that verifies Picture.toImage in the background on Android. diff --git a/testing/android_background_image/android/.gitignore b/testing/android_background_image/android/.gitignore new file mode 100644 index 0000000000000..88b214e75574c --- /dev/null +++ b/testing/android_background_image/android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +.settings +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cache diff --git a/testing/android_background_image/android/BUILD.gn b/testing/android_background_image/android/BUILD.gn new file mode 100644 index 0000000000000..273d1a82ac9d6 --- /dev/null +++ b/testing/android_background_image/android/BUILD.gn @@ -0,0 +1,44 @@ +# 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. + +import("//flutter/testing/rules/android.gni") + +_android_sources = [ + "app/build.gradle", + "app/src/main/AndroidManifest.xml", + "app/src/main/java/dev/flutter/android_background_image/MainActivity.java", + "build.gradle", +] + +gradle_task("android_lint") { + app_name = "android_background_image" + task = "lint" + gradlew_dir = rebase_path(".") + sources = _android_sources + outputs = [ + "$root_out_dir/android_background_image/build/reports/lint-results.html", + "$root_out_dir/android_background_image/build/reports/lint-results.xml", + ] + + deps = [ "//flutter/testing/android_background_image:android_background_image_snapshot" ] +} + +gradle_task("build_apk") { + app_name = "android_background_image" + task = "assembleDebug" + gradlew_dir = rebase_path(".") + sources = _android_sources + outputs = [ "$root_out_dir/android_background_image/app/outputs/apk/debug/app-debug.apk" ] + + deps = [ + ":android_lint", + "//flutter/testing/android_background_image:android_background_image_snapshot", + ] +} + +copy("android") { + sources = get_target_outputs(":build_apk") + outputs = [ "$root_out_dir/firebase_apks/android_background_image.apk" ] + deps = [ ":build_apk" ] +} diff --git a/testing/android_background_image/android/app/.gitignore b/testing/android_background_image/android/app/.gitignore new file mode 100644 index 0000000000000..796b96d1c4023 --- /dev/null +++ b/testing/android_background_image/android/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/testing/android_background_image/android/app/build.gradle b/testing/android_background_image/android/app/build.gradle new file mode 100644 index 0000000000000..a14505436f3df --- /dev/null +++ b/testing/android_background_image/android/app/build.gradle @@ -0,0 +1,47 @@ +apply plugin: 'com.android.application' + +android { + lintOptions { + abortOnError true + checkAllWarnings true + showAll true + warningsAsErrors true + checkTestSources true + // UnpackedNativeCode can break stack unwinding - see b/193408481 + // NewerVersionAvailable and GradleDependency need to be taken care of + // by a roller rather than as part of CI. + // The others are irrelevant for a test application. + disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable' + } + compileSdkVersion 30 + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + defaultConfig { + applicationId 'dev.flutter.android_background_image' + minSdkVersion 16 + targetSdkVersion 30 + versionCode 1 + versionName '1.0' + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + sourceSets.main { + assets.srcDirs += "${project.buildDir}/assets" + if (project.hasProperty('libapp')) { + jni.srcDirs = [] + jniLibs.srcDirs = [project.property('libapp')] + } + } +} + +dependencies { + implementation files(project.property('flutter_jar')) + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01' +} diff --git a/testing/android_background_image/android/app/proguard-rules.pro b/testing/android_background_image/android/app/proguard-rules.pro new file mode 100644 index 0000000000000..f1b424510da51 --- /dev/null +++ b/testing/android_background_image/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/testing/android_background_image/android/app/src/main/AndroidManifest.xml b/testing/android_background_image/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000..dd5e4aae259cc --- /dev/null +++ b/testing/android_background_image/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + diff --git a/testing/android_background_image/android/app/src/main/java/dev/flutter/android_background_image/MainActivity.java b/testing/android_background_image/android/app/src/main/java/dev/flutter/android_background_image/MainActivity.java new file mode 100644 index 0000000000000..73001786ba308 --- /dev/null +++ b/testing/android_background_image/android/app/src/main/java/dev/flutter/android_background_image/MainActivity.java @@ -0,0 +1,42 @@ +// 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 dev.flutter.android_background_image; + +import android.content.Intent; +import android.util.Log; +import androidx.annotation.NonNull; +import io.flutter.embedding.android.FlutterActivity; +import io.flutter.embedding.engine.FlutterEngine; +import io.flutter.plugin.common.BinaryMessenger; +import java.nio.ByteBuffer; + +public class MainActivity extends FlutterActivity { + @NonNull + private final BinaryMessenger.BinaryMessageHandler finishHandler = + new BinaryMessenger.BinaryMessageHandler() { + @Override + public void onMessage(ByteBuffer message, final BinaryMessenger.BinaryReply callback) { + if (message != null) { + // Make CI see that there is an error in the logs from Flutter. + Log.e("flutter", "Images did not match."); + } + final Intent intent = new Intent(MainActivity.this, MainActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + MainActivity.this.startActivity(intent); + MainActivity.this.finish(); + } + }; + + @Override + public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { + flutterEngine.getDartExecutor().getBinaryMessenger().setMessageHandler("finish", finishHandler); + + final boolean moved = moveTaskToBack(true); + if (!moved) { + Log.e("flutter", "Failed to move to back."); + finish(); + } + } +} diff --git a/testing/android_background_image/android/build.gradle b/testing/android_background_image/android/build.gradle new file mode 100644 index 0000000000000..f67dda3d18b84 --- /dev/null +++ b/testing/android_background_image/android/build.gradle @@ -0,0 +1,36 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:4.1.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = project.hasProperty('out_dir') + ? project.property('out_dir') + : '../build' + +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/testing/android_background_image/android/gradle-home/.vpython b/testing/android_background_image/android/gradle-home/.vpython new file mode 100644 index 0000000000000..741711e4e06bc --- /dev/null +++ b/testing/android_background_image/android/gradle-home/.vpython @@ -0,0 +1,11 @@ +# +# "vpython" specification file for build +# +# Pillow is required by com.facebook.testing.screenshot. + +python_version: "2.7" + +wheel: < + name: "infra/python/wheels/pillow/${vpython_platform}" + version: "version:6.0.0" +> diff --git a/testing/android_background_image/android/gradle-home/bin/python b/testing/android_background_image/android/gradle-home/bin/python new file mode 100755 index 0000000000000..367e9b679d413 --- /dev/null +++ b/testing/android_background_image/android/gradle-home/bin/python @@ -0,0 +1,14 @@ +#!/bin/bash + +# This script is added to the PATH on LUCI when executing the junit tests. +# The Python scripts used to compare the screenshots are contained in a jar file. +# As a result, vpython cannot find the .vpython spec file because it's outside +# of the jar file. + +set -e + +SCRIPT_DIR="$( dirname "${BASH_SOURCE[0]}" )" + +echo "Running from $SCRIPT_DIR/bin/python" + +vpython -vpython-spec "$SCRIPT_DIR/../.vpython" "$@" diff --git a/testing/android_background_image/android/gradle.properties b/testing/android_background_image/android/gradle.properties new file mode 100644 index 0000000000000..38c8d4544ff1c --- /dev/null +++ b/testing/android_background_image/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx1536M +android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties b/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000..37c1aa69ad8a7 --- /dev/null +++ b/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Jul 22 20:16:02 PDT 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/testing/android_background_image/android/settings.gradle b/testing/android_background_image/android/settings.gradle new file mode 100644 index 0000000000000..e7b4def49cb53 --- /dev/null +++ b/testing/android_background_image/android/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/testing/android_background_image/lib/main.dart b/testing/android_background_image/lib/main.dart new file mode 100644 index 0000000000000..6335b51ea2c0f --- /dev/null +++ b/testing/android_background_image/lib/main.dart @@ -0,0 +1,59 @@ +// 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. + +import 'dart:async'; +import 'dart:typed_data'; +import 'dart:ui'; + +final Completer _completer = Completer(); + +Future main() async { + channelBuffers.setListener('flutter/lifecycle', _lifecycle); + final bool success = await _completer.future; + final Uint8List? message = success ? null : Uint8List.fromList(const [1]); + PlatformDispatcher.instance.sendPlatformMessage('finish', message?.buffer.asByteData(), null); +} + +Future _lifecycle(ByteData? data, PlatformMessageResponseCallback? callback) async { + final String lifecycleState = String.fromCharCodes(data!.buffer.asUint8List()); + if (lifecycleState == AppLifecycleState.paused.toString()) { + await _testImage(); + } +} + +Future _testImage() async { + // A single pixel image. + final Uint8List pixels = Uint8List.fromList(const [0, 1, 2, 3]); + + // As long as we're using the GL backend, this will go down a path that uses + // a cross context image. + final Completer imageCompleter = Completer(); + decodeImageFromPixels( + pixels, + 1, + 1, + PixelFormat.rgba8888, + (Image image) { + imageCompleter.complete(image); + }, + ); + final Image image = await imageCompleter.future; + final PictureRecorder recorder = PictureRecorder(); + final Canvas canvas = Canvas(recorder); + canvas.drawImage(image, Offset.zero, Paint()); + final Picture picture = recorder.endRecording(); + final Image newImage = await picture.toImage(1, 1); + final ByteData imageData = (await newImage.toByteData())!; + final Uint32List newPixels = imageData.buffer.asUint32List(); + + if (pixels.buffer.asUint32List()[0] != newPixels[0]) { + print('Pixels do not match'); + print('original pixels: $pixels'); + print('new pixels: ${newPixels.buffer.asUint8List()}'); + _completer.complete(false); + } else { + print('Images are identical!'); + _completer.complete(true); + } +} diff --git a/testing/android_background_image/pubspec.yaml b/testing/android_background_image/pubspec.yaml new file mode 100644 index 0000000000000..361922d8fd21f --- /dev/null +++ b/testing/android_background_image/pubspec.yaml @@ -0,0 +1,22 @@ +# 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. + +name: android_background_image +publish_to: none +environment: + sdk: '>=2.12.0 <3.0.0' + +# Do not add any dependencies that require more than what is provided in +# //third_party/dart/pkg, //third_party/dart/third_party/pkg, or +# //third_party/pkg. In particular, package:test is not usable here. + +# If you do add packages here, make sure you can run `pub get --offline`, and +# check the .packages and .package_config to make sure all the paths are +# relative to this directory into //third_party/dart, or //third_party/pkg +dependencies: + sky_engine: any + +dependency_overrides: + sky_engine: + path: ../../sky/packages/sky_engine diff --git a/testing/rules/.gradle/6.5/fileChanges/last-build.bin b/testing/rules/.gradle/6.5/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/testing/rules/.gradle/6.5/gc.properties b/testing/rules/.gradle/6.5/gc.properties new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/testing/rules/.gradle/vcs-1/gc.properties b/testing/rules/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/testing/rules/android.gni b/testing/rules/android.gni new file mode 100644 index 0000000000000..ee0c2b18a6bfd --- /dev/null +++ b/testing/rules/android.gni @@ -0,0 +1,41 @@ +# 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. + +import("//flutter/testing/rules/runtime_mode.gni") + +template("gradle_task") { + action(target_name) { + assert(defined(invoker.task), "task is a required parmaeter") + assert(defined(invoker.outputs), "outputs is a required parameter") + assert(defined(invoker.sources), "sources is a required parameter") + assert(defined(invoker.gradlew_dir), + "gradlew_dir is required (normally: rebase_path(\".\"") + assert(defined(invoker.app_name), "app_name is a required parameter") + + script = "//flutter/testing/rules/run_gradle.py" + + inputs = [ "$root_out_dir/flutter.jar" ] + sources = invoker.sources + outputs = invoker.outputs + + args = [ + invoker.gradlew_dir, + invoker.task, + "--no-daemon", + "-Pflutter_jar=" + rebase_path("$root_out_dir/flutter.jar"), + "-Pout_dir=" + rebase_path("$root_out_dir/${invoker.app_name}"), + ] + + if (is_aot) { + args += [ "-Plibapp=" + rebase_path("$target_gen_dir/libs") ] + inputs += [ "$target_gen_dir/libs/$android_app_abi/libapp.so" ] + } + + deps = [ "//flutter/shell/platform/android:android_jar" ] + + if (defined(invoker.deps)) { + deps += invoker.deps + } + } +} diff --git a/testing/scenario_app/android/run_gradle.py b/testing/rules/run_gradle.py similarity index 81% rename from testing/scenario_app/android/run_gradle.py rename to testing/rules/run_gradle.py index 2163c54670bee..41bb007ea6cc9 100644 --- a/testing/scenario_app/android/run_gradle.py +++ b/testing/rules/run_gradle.py @@ -12,7 +12,7 @@ import subprocess SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__)) -ANDROID_HOME = os.path.join(SCRIPT_PATH, '..', '..', '..', '..', 'third_party', +ANDROID_HOME = os.path.join(SCRIPT_PATH, '..', '..', '..', 'third_party', 'android_tools', 'sdk') def main(): @@ -20,10 +20,10 @@ def main(): raise Exception('%s (ANDROID_HOME) is not a directory' % ANDROID_HOME) BAT = '.bat' if sys.platform.startswith(('cygwin', 'win')) else '' - android_dir = os.path.abspath(os.path.dirname(__file__)) + android_dir = sys.argv[1] gradle_bin = os.path.join('.', 'gradlew%s' % BAT) result = subprocess.check_output( - args=[gradle_bin] + sys.argv[1:], + args=[gradle_bin] + sys.argv[2:], cwd=android_dir, env=dict(os.environ, ANDROID_HOME=ANDROID_HOME), ) diff --git a/testing/scenario_app/runtime_mode.gni b/testing/rules/runtime_mode.gni similarity index 100% rename from testing/scenario_app/runtime_mode.gni rename to testing/rules/runtime_mode.gni diff --git a/testing/scenario_app/BUILD.gn b/testing/scenario_app/BUILD.gn index 10b9bcf8191ea..ac9a8adb497f4 100644 --- a/testing/scenario_app/BUILD.gn +++ b/testing/scenario_app/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//flutter/build/dart/rules.gni") -import("//flutter/testing/scenario_app/runtime_mode.gni") +import("//flutter/testing/rules/runtime_mode.gni") dart_snapshot("scenario_app_snapshot") { main_dart = "lib/main.dart" diff --git a/testing/scenario_app/android/BUILD.gn b/testing/scenario_app/android/BUILD.gn index 43014b2276245..10d908e53df43 100644 --- a/testing/scenario_app/android/BUILD.gn +++ b/testing/scenario_app/android/BUILD.gn @@ -2,74 +2,52 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/testing/scenario_app/runtime_mode.gni") - -template("gradle_task") { - action(target_name) { - assert(defined(invoker.task), "task is a required parmaeter") - assert(defined(invoker.outputs), "outputs is a required parameter") - - script = "run_gradle.py" - - inputs = [ "$root_out_dir/flutter.jar" ] - sources = [ - "app/build.gradle", - "app/src/androidTest/java/dev/flutter/TestRunner.java", - "app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java", - "app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java", - "app/src/androidTest/java/dev/flutter/scenariosui/MemoryLeakTests.java", - "app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java", - "app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java", - "app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java", - "app/src/androidTest/java/dev/flutter/scenariosui/SpawnEngineTests.java", - "app/src/main/AndroidManifest.xml", - "app/src/main/java/dev/flutter/scenarios/SpawnedEngineActivity.java", - "app/src/main/java/dev/flutter/scenarios/StrictModeFlutterActivity.java", - "app/src/main/java/dev/flutter/scenarios/TestActivity.java", - "app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java", - "app/src/main/java/dev/flutter/scenarios/TextPlatformView.java", - "app/src/main/java/dev/flutter/scenarios/TextPlatformViewActivity.java", - "app/src/main/java/dev/flutter/scenarios/TextPlatformViewFactory.java", - "build.gradle", - ] - - outputs = invoker.outputs - - args = [ - invoker.task, - "--no-daemon", - "-Pflutter_jar=" + rebase_path("$root_out_dir/flutter.jar"), - "-Pout_dir=" + rebase_path("$root_out_dir/scenario_app"), - ] - - if (is_aot) { - args += [ "-Plibapp=" + rebase_path("$target_gen_dir/libs") ] - inputs += [ "$target_gen_dir/libs/$android_app_abi/libapp.so" ] - } - - deps = [ - "//flutter/shell/platform/android:android_jar", - "//flutter/testing/scenario_app:scenario_app_snapshot", - ] - - if (defined(invoker.deps)) { - deps += invoker.deps - } - } -} +import("//flutter/testing/rules/android.gni") + +_android_sources = [ + "app/build.gradle", + "app/src/androidTest/java/dev/flutter/TestRunner.java", + "app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java", + "app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java", + "app/src/androidTest/java/dev/flutter/scenariosui/MemoryLeakTests.java", + "app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java", + "app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java", + "app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java", + "app/src/androidTest/java/dev/flutter/scenariosui/SpawnEngineTests.java", + "app/src/main/AndroidManifest.xml", + "app/src/main/java/dev/flutter/scenarios/SpawnedEngineActivity.java", + "app/src/main/java/dev/flutter/scenarios/StrictModeFlutterActivity.java", + "app/src/main/java/dev/flutter/scenarios/TestActivity.java", + "app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java", + "app/src/main/java/dev/flutter/scenarios/TextPlatformView.java", + "app/src/main/java/dev/flutter/scenarios/TextPlatformViewActivity.java", + "app/src/main/java/dev/flutter/scenarios/TextPlatformViewFactory.java", + "build.gradle", +] gradle_task("android_lint") { + app_name = "scenario_app" task = "lint" + gradlew_dir = rebase_path(".") + sources = _android_sources outputs = [ "$root_out_dir/scenario_app/build/reports/lint-results.html", "$root_out_dir/scenario_app/build/reports/lint-results.xml", ] + deps = [ "//flutter/testing/scenario_app:scenario_app_snapshot" ] } gradle_task("build_apk") { + app_name = "scenario_app" task = "assembleDebug" + gradlew_dir = rebase_path(".") + sources = _android_sources outputs = [ "$root_out_dir/scenario_app/app/outputs/apk/debug/app-debug.apk" ] - deps = [ ":android_lint" ] + + deps = [ + ":android_lint", + "//flutter/testing/scenario_app:scenario_app_snapshot", + ] } copy("android") { diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index adb67a80e27a7..cded6070e75b8 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -19,7 +19,7 @@ android { // NewerVersionAvailable and GradleDependency need to be taken care of // by a roller rather than as part of CI. // The others are irrelevant for a test application. - disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable' + disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } compileSdkVersion 30 compileOptions { diff --git a/testing/scenario_app/ios/BUILD.gn b/testing/scenario_app/ios/BUILD.gn index 5209d480d4f4f..605de6f33dce1 100644 --- a/testing/scenario_app/ios/BUILD.gn +++ b/testing/scenario_app/ios/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/testing/scenario_app/runtime_mode.gni") +import("//flutter/testing/rules/runtime_mode.gni") import("//third_party/dart/build/dart/copy_tree.gni") _app_framework_dir = "$root_out_dir/scenario_app/Scenarios/App.framework" diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py index 5eb20b27806d0..f8a1d2f7b3242 100644 --- a/tools/pub_get_offline.py +++ b/tools/pub_get_offline.py @@ -20,6 +20,7 @@ os.path.join("src", "flutter", "testing", "benchmark"), os.path.join("src", "flutter", "testing", "dart"), os.path.join("src", "flutter", "testing", "litetest"), + os.path.join("src", "flutter", "testing", "android_background_image"), os.path.join("src", "flutter", "testing", "scenario_app"), os.path.join("src", "flutter", "testing", "smoke_test_failure"), os.path.join("src", "flutter", "testing", "symbols"), From 46baeac78c89e1892c4ad69065f68804a3ae23c9 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 19 Jul 2021 13:43:37 -0700 Subject: [PATCH 02/11] Jason review --- ci/licenses_golden/licenses_flutter | 3 ++ shell/common/BUILD.gn | 1 + shell/common/platform_view.cc | 2 +- shell/common/platform_view.h | 19 ++++++------ shell/common/rasterizer.cc | 29 +++++++++++-------- shell/common/rasterizer.h | 25 +++++++++------- shell/common/shell.cc | 15 ++-------- shell/common/shell.h | 3 -- shell/common/snapshot_surface_producer.h | 22 ++++++++++++++ .../platform/android/platform_view_android.cc | 18 +++++++----- .../platform/android/platform_view_android.h | 10 ++++--- shell/platform/android/surface/BUILD.gn | 3 ++ .../surface/snapshot_surface_producer.cc | 21 ++++++++++++++ .../surface/snapshot_surface_producer.h | 28 ++++++++++++++++++ 14 files changed, 137 insertions(+), 62 deletions(-) create mode 100644 shell/common/snapshot_surface_producer.h create mode 100644 shell/platform/android/surface/snapshot_surface_producer.cc create mode 100644 shell/platform/android/surface/snapshot_surface_producer.h diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 7ca5eb91bec4b..7a1d28f642db6 100755 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -703,6 +703,7 @@ FILE: ../../../flutter/shell/common/run_configuration.cc FILE: ../../../flutter/shell/common/run_configuration.h FILE: ../../../flutter/shell/common/serialization_callbacks.cc FILE: ../../../flutter/shell/common/serialization_callbacks.h +FILE: ../../../flutter/shell/common/snapshot_surface_producer.h FILE: ../../../flutter/shell/common/shell.cc FILE: ../../../flutter/shell/common/shell.h FILE: ../../../flutter/shell/common/shell_benchmarks.cc @@ -767,6 +768,8 @@ FILE: ../../../flutter/shell/platform/android/android_surface_software.cc FILE: ../../../flutter/shell/platform/android/android_surface_software.h FILE: ../../../flutter/shell/platform/android/android_surface_vulkan.cc FILE: ../../../flutter/shell/platform/android/android_surface_vulkan.h +FILE: ../../../flutter/shell/platform/android/snapshot_surface_producer.cc +FILE: ../../../flutter/shell/platform/android/snapshot_surface_producer.h FILE: ../../../flutter/shell/platform/android/apk_asset_provider.cc FILE: ../../../flutter/shell/platform/android/apk_asset_provider.h FILE: ../../../flutter/shell/platform/android/context/android_context.cc diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index d7c4f09eabf49..dcb28e800b6d7 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -89,6 +89,7 @@ source_set("common") { "shell_io_manager.h", "skia_event_tracer_impl.cc", "skia_event_tracer_impl.h", + "snapshot_surface_producer.h", "switches.cc", "switches.h", "thread_host.cc", diff --git a/shell/common/platform_view.cc b/shell/common/platform_view.cc index 938dc5caf43dd..f0cdbe277e082 100644 --- a/shell/common/platform_view.cc +++ b/shell/common/platform_view.cc @@ -181,7 +181,7 @@ void PlatformView::UpdateAssetResolverByType( delegate_.UpdateAssetResolverByType(std::move(updated_asset_resolver), type); } -std::unique_ptr PlatformView::CreateRasterSnapshotSurface() { +std::unique_ptr PlatformView::CreateSnapshotSurfaceProducer() { return nullptr; } diff --git a/shell/common/platform_view.h b/shell/common/platform_view.h index fef98fcacecd0..1cbf73ce4abea 100644 --- a/shell/common/platform_view.h +++ b/shell/common/platform_view.h @@ -797,20 +797,20 @@ class PlatformView { AssetResolver::AssetResolverType type); //-------------------------------------------------------------------------- - /// @brief Creates a Surface suitable for raster snapshotting. The - /// rasterizer will request this surface if no on screen surface - /// is currently available and a snapshot has been requested - /// by the framework, e.g. if `Scene.toImage` or `Picture.toImage` - /// are called while the application is in the background. + /// @brief Creates an object that produces surfaces suitable for raster + /// snapshotting. The rasterizer will request this surface if no + /// on screen surface is currently available when an application + /// requests a snapshot, e.g. if `Scene.toImage` or + /// `Picture.toImage` are called while the application is in the + /// background. /// /// Not all backends support this kind of surface usage, and the /// default implementation returns nullptr. Platforms should /// override this if they can support GPU operations in the /// background and support GPU resource context usage. /// - /// This is the only public method of this interface called on the - /// raster task runner. - virtual std::unique_ptr CreateRasterSnapshotSurface(); + virtual std::unique_ptr + CreateSnapshotSurfaceProducer(); protected: PlatformView::Delegate& delegate_; @@ -820,8 +820,7 @@ class PlatformView { SkISize size_; fml::WeakPtrFactory weak_factory_; - // This and CreateRasterSnapshotSurface are the only methods called on the - // raster task runner. + // This is the only method called on the raster task runner. virtual std::unique_ptr CreateRenderingSurface(); private: diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc index c405720cac1f5..89f47ace61dc1 100644 --- a/shell/common/rasterizer.cc +++ b/shell/common/rasterizer.cc @@ -260,13 +260,16 @@ sk_sp Rasterizer::DoMakeRasterSnapshot( size.width(), size.height(), SkColorSpace::MakeSRGB()); std::unique_ptr pbuffer_surface; - if (!surface_) { - pbuffer_surface = delegate_.CreateSnapshotSurface(); + Surface* snapshot_surface = nullptr; + if (surface_ && surface_->GetContext()) { + snapshot_surface = surface_.get(); + } else if (snapshot_surface_producer_) { + pbuffer_surface = snapshot_surface_producer_->CreateSnapshotSurface(); + if (pbuffer_surface && pbuffer_surface->GetContext()) + snapshot_surface = pbuffer_surface.get(); } - if ((surface_ == nullptr || surface_->GetContext() == nullptr) && - (pbuffer_surface == nullptr || - pbuffer_surface->GetContext() == nullptr)) { + if (!snapshot_surface) { // Raster surface is fine if there is no on screen surface. This might // happen in case of software rendering. sk_sp sk_surface = SkSurface::MakeRaster(image_info); @@ -279,17 +282,14 @@ sk_sp Rasterizer::DoMakeRasterSnapshot( result = DrawSnapshot(surface, draw_callback); }) .SetIfFalse([&] { - Surface* surface = surface_.get(); - if (!surface) { - surface = pbuffer_surface.get(); - } - FML_DCHECK(surface); - auto context_switch = surface->MakeRenderContextCurrent(); + FML_DCHECK(snapshot_surface); + auto context_switch = + snapshot_surface->MakeRenderContextCurrent(); if (!context_switch->GetResult()) { return; } - GrRecordingContext* context = surface->GetContext(); + GrRecordingContext* context = snapshot_surface->GetContext(); auto max_size = context->maxRenderTargetSize(); double scale_factor = std::min( 1.0, static_cast(max_size) / @@ -713,6 +713,11 @@ void Rasterizer::SetExternalViewEmbedder( external_view_embedder_ = view_embedder; } +void Rasterizer::SetSnapshotSurfaceProducer( + std::unique_ptr producer) { + snapshot_surface_producer_ = std::move(producer); +} + void Rasterizer::FireNextFrameCallbackIfPresent() { if (!next_frame_callback_) { return; diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.h index c8ee34bd0cab5..311428802d386 100644 --- a/shell/common/rasterizer.h +++ b/shell/common/rasterizer.h @@ -24,6 +24,7 @@ #include "flutter/fml/time/time_point.h" #include "flutter/lib/ui/snapshot_delegate.h" #include "flutter/shell/common/pipeline.h" +#include "flutter/shell/common/snapshot_surface_producer.h" namespace flutter { @@ -90,16 +91,6 @@ class Rasterizer final : public SnapshotDelegate { /// is critical that GPU operations are not processed. virtual std::shared_ptr GetIsGpuDisabledSyncSwitch() const = 0; - - /// Called by the Rasterizer if a snapshot is requested while no surface - /// is currently available, for example after a platform has torn down - /// the surface. - /// - /// For some rendering backends or some platforms, using a GPU surface for - /// snapshotting while in the background may not be possible or necessary. - /// In that case, this method must return nullptr and the rasterizer will - /// attempt to use a CPU based raster surface for snapshotting. - virtual std::unique_ptr CreateSnapshotSurface() = 0; }; //---------------------------------------------------------------------------- @@ -108,7 +99,7 @@ class Rasterizer final : public SnapshotDelegate { /// currently only created by the shell (which also sets itself up /// as the rasterizer delegate). /// - /// @param[in] delegate The rasterizer delegate. + /// @param[in] delegate The rasterizer delegate. /// Rasterizer(Delegate& delegate); @@ -359,6 +350,17 @@ class Rasterizer final : public SnapshotDelegate { void SetExternalViewEmbedder( const std::shared_ptr& view_embedder); + //---------------------------------------------------------------------------- + /// @brief Set the snapshot surface producer. This is done on shell + /// initialization. This is non-null on platforms that support taking + /// GPU accelerated raster snapshots in the background. + /// + /// @param[in] producer A surface producer for raster snapshotting when the + /// onscreen surface is not available. + /// + void SetSnapshotSurfaceProducer( + std::unique_ptr producer); + //---------------------------------------------------------------------------- /// @brief Returns a pointer to the compositor context used by this /// rasterizer. This pointer will never be `nullptr`. @@ -444,6 +446,7 @@ class Rasterizer final : public SnapshotDelegate { private: Delegate& delegate_; std::unique_ptr surface_; + std::unique_ptr snapshot_surface_producer_; std::unique_ptr compositor_context_; // This is the last successfully rasterized layer tree. std::unique_ptr last_layer_tree_; diff --git a/shell/common/shell.cc b/shell/common/shell.cc index dba4833bdf927..01b85075ad344 100644 --- a/shell/common/shell.cc +++ b/shell/common/shell.cc @@ -634,6 +634,8 @@ bool Shell::Setup(std::unique_ptr platform_view, // Set the external view embedder for the rasterizer. auto view_embedder = platform_view_->CreateExternalViewEmbedder(); rasterizer_->SetExternalViewEmbedder(view_embedder); + rasterizer_->SetSnapshotSurfaceProducer( + platform_view_->CreateSnapshotSurfaceProducer()); // The weak ptr must be generated in the platform thread which owns the unique // ptr. @@ -1362,19 +1364,6 @@ void Shell::ReportTimings() { }); } -std::unique_ptr Shell::CreateSnapshotSurface() { - FML_DCHECK(is_setup_); - FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread()); - // Threading: This is safe because the dtor resets the rasterizer before - // the platform_view. This method is private to the rasterizer delegate - // and cannot be called without a valid rasterizer. - // See also: PlatformView::NotifyCreated - if (!platform_view_) { - return nullptr; - } - return platform_view_->CreateRasterSnapshotSurface(); -} - size_t Shell::UnreportedFramesCount() const { // Check that this is running on the raster thread to avoid race conditions. FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread()); diff --git a/shell/common/shell.h b/shell/common/shell.h index b535b58f0c06f..374a0968bbf05 100644 --- a/shell/common/shell.h +++ b/shell/common/shell.h @@ -590,9 +590,6 @@ class Shell final : public PlatformView::Delegate, // |Rasterizer::Delegate| fml::TimePoint GetLatestFrameTargetTime() const override; - // |Rasterizer::Delegate| - std::unique_ptr CreateSnapshotSurface() override; - // |ServiceProtocol::Handler| fml::RefPtr GetServiceProtocolHandlerTaskRunner( std::string_view method) const override; diff --git a/shell/common/snapshot_surface_producer.h b/shell/common/snapshot_surface_producer.h new file mode 100644 index 0000000000000..ae505109beda8 --- /dev/null +++ b/shell/common/snapshot_surface_producer.h @@ -0,0 +1,22 @@ +// 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 SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_ +#define SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_ + +#include + +#include "flutter/flow/surface.h" + +namespace flutter { + +class SnapshotSurfaceProducer { + public: + virtual ~SnapshotSurfaceProducer() = default; + + virtual std::unique_ptr CreateSnapshotSurface() = 0; +}; + +} // namespace flutter +#endif // SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_ diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc index 234d068d2bfb3..afce5da3e933c 100644 --- a/shell/platform/android/platform_view_android.cc +++ b/shell/platform/android/platform_view_android.cc @@ -16,6 +16,7 @@ #include "flutter/shell/platform/android/android_surface_software.h" #include "flutter/shell/platform/android/external_view_embedder/external_view_embedder.h" #include "flutter/shell/platform/android/surface/android_surface.h" +#include "flutter/shell/platform/android/surface/snapshot_surface_producer.h" #if SHELL_ENABLE_VULKAN #include "flutter/shell/platform/android/android_surface_vulkan.h" @@ -316,6 +317,15 @@ PlatformViewAndroid::CreateExternalViewEmbedder() { *android_context_, jni_facade_, surface_factory_); } +// |PlatformView| +std::unique_ptr +PlatformViewAndroid::CreateSnapshotSurfaceProducer() { + if (!android_surface_) { + return nullptr; + } + return std::make_unique(android_surface_); +} + // |PlatformView| sk_sp PlatformViewAndroid::CreateResourceContext() const { if (!android_surface_) { @@ -404,12 +414,4 @@ void PlatformViewAndroid::FireFirstFrameCallback() { jni_facade_->FlutterViewOnFirstFrame(); } -std::unique_ptr PlatformViewAndroid::CreateRasterSnapshotSurface() { - FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread()); - if (!android_surface_) { - return nullptr; - } - return android_surface_->CreatePbufferSurface(); -} - } // namespace flutter diff --git a/shell/platform/android/platform_view_android.h b/shell/platform/android/platform_view_android.h index 5c7d3311be753..ebd00f5ae43c4 100644 --- a/shell/platform/android/platform_view_android.h +++ b/shell/platform/android/platform_view_android.h @@ -15,6 +15,7 @@ #include "flutter/fml/platform/android/scoped_java_ref.h" #include "flutter/lib/ui/window/platform_message.h" #include "flutter/shell/common/platform_view.h" +#include "flutter/shell/common/snapshot_surface_producer.h" #include "flutter/shell/platform/android/context/android_context.h" #include "flutter/shell/platform/android/jni/platform_view_android_jni.h" #include "flutter/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.h" @@ -117,9 +118,6 @@ class PlatformViewAndroid final : public PlatformView { return android_context_; } - // |PlatformView| - std::unique_ptr CreateRasterSnapshotSurface() override; - private: const std::shared_ptr jni_facade_; std::shared_ptr android_context_; @@ -127,7 +125,7 @@ class PlatformViewAndroid final : public PlatformView { PlatformViewAndroidDelegate platform_view_android_delegate_; - std::unique_ptr android_surface_; + std::shared_ptr android_surface_; // We use id 0 to mean that no response is expected. int next_response_id_ = 1; std::unordered_map> @@ -154,6 +152,10 @@ class PlatformViewAndroid final : public PlatformView { // |PlatformView| std::shared_ptr CreateExternalViewEmbedder() override; + // |PlatformView| + std::unique_ptr CreateSnapshotSurfaceProducer() + override; + // |PlatformView| sk_sp CreateResourceContext() const override; diff --git a/shell/platform/android/surface/BUILD.gn b/shell/platform/android/surface/BUILD.gn index 7764b932a9eac..73cab0833c192 100644 --- a/shell/platform/android/surface/BUILD.gn +++ b/shell/platform/android/surface/BUILD.gn @@ -6,6 +6,8 @@ source_set("surface") { sources = [ "android_surface.cc", "android_surface.h", + "snapshot_surface_producer.cc", + "snapshot_surface_producer.h", ] public_configs = [ "//flutter:config" ] @@ -14,6 +16,7 @@ source_set("surface") { ":native_window", "//flutter/flow", "//flutter/fml", + "//flutter/shell/common", "//flutter/shell/platform/android/context", "//flutter/shell/platform/android/jni", "//third_party/skia", diff --git a/shell/platform/android/surface/snapshot_surface_producer.cc b/shell/platform/android/surface/snapshot_surface_producer.cc new file mode 100644 index 0000000000000..8a5fac0ff737c --- /dev/null +++ b/shell/platform/android/surface/snapshot_surface_producer.cc @@ -0,0 +1,21 @@ +// 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. + +#include "flutter/shell/platform/android/surface/snapshot_surface_producer.h" + +namespace flutter { + +AndroidSnapshotSurfaceProducer::AndroidSnapshotSurfaceProducer( + std::shared_ptr android_surface) + : android_surface_(std::move(android_surface)) {} + +std::unique_ptr +AndroidSnapshotSurfaceProducer::CreateSnapshotSurface() { + if (!android_surface_) { + return nullptr; + } + return android_surface_->CreatePbufferSurface(); +} + +} // namespace flutter diff --git a/shell/platform/android/surface/snapshot_surface_producer.h b/shell/platform/android/surface/snapshot_surface_producer.h new file mode 100644 index 0000000000000..f8a7249d32d5e --- /dev/null +++ b/shell/platform/android/surface/snapshot_surface_producer.h @@ -0,0 +1,28 @@ +// 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 SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_ +#define SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_ + +#include + +#include "flutter/flow/surface.h" +#include "flutter/shell/common/snapshot_surface_producer.h" +#include "flutter/shell/platform/android/surface/android_surface.h" + +namespace flutter { + +class AndroidSnapshotSurfaceProducer : public SnapshotSurfaceProducer { + public: + explicit AndroidSnapshotSurfaceProducer(std::shared_ptr android_surface); + + // |SnapshotSurfaceProducer| + std::unique_ptr CreateSnapshotSurface() override; + + private: + std::shared_ptr android_surface_; +}; + +} // namespace flutter +#endif // SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_ From 38c703e701b8238f11f9cd824df715b9af4fd0e6 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 19 Jul 2021 13:45:44 -0700 Subject: [PATCH 03/11] missing files --- shell/common/platform_view.cc | 3 ++- shell/platform/android/surface/snapshot_surface_producer.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/shell/common/platform_view.cc b/shell/common/platform_view.cc index f0cdbe277e082..d48442604ff5c 100644 --- a/shell/common/platform_view.cc +++ b/shell/common/platform_view.cc @@ -181,7 +181,8 @@ void PlatformView::UpdateAssetResolverByType( delegate_.UpdateAssetResolverByType(std::move(updated_asset_resolver), type); } -std::unique_ptr PlatformView::CreateSnapshotSurfaceProducer() { +std::unique_ptr +PlatformView::CreateSnapshotSurfaceProducer() { return nullptr; } diff --git a/shell/platform/android/surface/snapshot_surface_producer.h b/shell/platform/android/surface/snapshot_surface_producer.h index f8a7249d32d5e..eed8cce17a57c 100644 --- a/shell/platform/android/surface/snapshot_surface_producer.h +++ b/shell/platform/android/surface/snapshot_surface_producer.h @@ -15,12 +15,13 @@ namespace flutter { class AndroidSnapshotSurfaceProducer : public SnapshotSurfaceProducer { public: - explicit AndroidSnapshotSurfaceProducer(std::shared_ptr android_surface); + explicit AndroidSnapshotSurfaceProducer( + std::shared_ptr android_surface); // |SnapshotSurfaceProducer| std::unique_ptr CreateSnapshotSurface() override; - private: + private: std::shared_ptr android_surface_; }; From 2d34f96c50b8948692de37c0cecbc579c531db45 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 19 Jul 2021 15:25:42 -0700 Subject: [PATCH 04/11] adjust lint rules, fix license ordering --- ci/licenses_golden/licenses_flutter | 6 +++--- testing/android_background_image/android/BUILD.gn | 5 +---- testing/scenario_app/android/BUILD.gn | 5 +---- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index e8674ec34c1ee..7e52124912e24 100755 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -703,7 +703,6 @@ FILE: ../../../flutter/shell/common/run_configuration.cc FILE: ../../../flutter/shell/common/run_configuration.h FILE: ../../../flutter/shell/common/serialization_callbacks.cc FILE: ../../../flutter/shell/common/serialization_callbacks.h -FILE: ../../../flutter/shell/common/snapshot_surface_producer.h FILE: ../../../flutter/shell/common/shell.cc FILE: ../../../flutter/shell/common/shell.h FILE: ../../../flutter/shell/common/shell_benchmarks.cc @@ -726,6 +725,7 @@ FILE: ../../../flutter/shell/common/shell_unittests.cc FILE: ../../../flutter/shell/common/skia_event_tracer_impl.cc FILE: ../../../flutter/shell/common/skia_event_tracer_impl.h FILE: ../../../flutter/shell/common/skp_shader_warmup_unittests.cc +FILE: ../../../flutter/shell/common/snapshot_surface_producer.h FILE: ../../../flutter/shell/common/switches.cc FILE: ../../../flutter/shell/common/switches.h FILE: ../../../flutter/shell/common/thread_host.cc @@ -768,8 +768,6 @@ FILE: ../../../flutter/shell/platform/android/android_surface_software.cc FILE: ../../../flutter/shell/platform/android/android_surface_software.h FILE: ../../../flutter/shell/platform/android/android_surface_vulkan.cc FILE: ../../../flutter/shell/platform/android/android_surface_vulkan.h -FILE: ../../../flutter/shell/platform/android/snapshot_surface_producer.cc -FILE: ../../../flutter/shell/platform/android/snapshot_surface_producer.h FILE: ../../../flutter/shell/platform/android/apk_asset_provider.cc FILE: ../../../flutter/shell/platform/android/apk_asset_provider.h FILE: ../../../flutter/shell/platform/android/context/android_context.cc @@ -935,6 +933,8 @@ FILE: ../../../flutter/shell/platform/android/surface/android_surface.cc FILE: ../../../flutter/shell/platform/android/surface/android_surface.h FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.cc FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.h +FILE: ../../../flutter/shell/platform/android/surface/snapshot_surface_producer.cc +FILE: ../../../flutter/shell/platform/android/surface/snapshot_surface_producer.h FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.cc FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.h FILE: ../../../flutter/shell/platform/common/accessibility_bridge.cc diff --git a/testing/android_background_image/android/BUILD.gn b/testing/android_background_image/android/BUILD.gn index 273d1a82ac9d6..cb82db53a9f3c 100644 --- a/testing/android_background_image/android/BUILD.gn +++ b/testing/android_background_image/android/BUILD.gn @@ -16,10 +16,7 @@ gradle_task("android_lint") { task = "lint" gradlew_dir = rebase_path(".") sources = _android_sources - outputs = [ - "$root_out_dir/android_background_image/build/reports/lint-results.html", - "$root_out_dir/android_background_image/build/reports/lint-results.xml", - ] + outputs = [ "$root_out_dir/android_background_image/build/reports" ] deps = [ "//flutter/testing/android_background_image:android_background_image_snapshot" ] } diff --git a/testing/scenario_app/android/BUILD.gn b/testing/scenario_app/android/BUILD.gn index 10d908e53df43..27a64aec5a19f 100644 --- a/testing/scenario_app/android/BUILD.gn +++ b/testing/scenario_app/android/BUILD.gn @@ -30,10 +30,7 @@ gradle_task("android_lint") { task = "lint" gradlew_dir = rebase_path(".") sources = _android_sources - outputs = [ - "$root_out_dir/scenario_app/build/reports/lint-results.html", - "$root_out_dir/scenario_app/build/reports/lint-results.xml", - ] + outputs = [ "$root_out_dir/scenario_app/build/reports" ] deps = [ "//flutter/testing/scenario_app:scenario_app_snapshot" ] } From e376c256e8a55d4bea639bc26417fb0f9d9a3300 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 20 Jul 2021 09:21:10 -0700 Subject: [PATCH 05/11] unignore gradlew --- .../android/.gitignore | 4 + .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes .../android_background_image/android/gradlew | 172 ++++++++++++++++++ .../android/gradlew.bat | 84 +++++++++ testing/scenario_app/android/.gitignore | 4 + 5 files changed, 264 insertions(+) create mode 100644 testing/android_background_image/android/gradle/wrapper/gradle-wrapper.jar create mode 100755 testing/android_background_image/android/gradlew create mode 100644 testing/android_background_image/android/gradlew.bat diff --git a/testing/android_background_image/android/.gitignore b/testing/android_background_image/android/.gitignore index 88b214e75574c..9a6a5bef7fbe6 100644 --- a/testing/android_background_image/android/.gitignore +++ b/testing/android_background_image/android/.gitignore @@ -13,3 +13,7 @@ /captures .externalNativeBuild .cache + +!gradlew +!gradlew.bat +!gradle/wrapper/** diff --git a/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.jar b/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f6b961fd5a86aa5fbfe90f707c3138408be7c718 GIT binary patch literal 54329 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

<5G2M1WZP5 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 F{|7XC?P&l2 literal 0 HcmV?d00001 diff --git a/testing/android_background_image/android/gradlew b/testing/android_background_image/android/gradlew new file mode 100755 index 0000000000000..cccdd3d517fc5 --- /dev/null +++ b/testing/android_background_image/android/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/testing/android_background_image/android/gradlew.bat b/testing/android_background_image/android/gradlew.bat new file mode 100644 index 0000000000000..e95643d6a2ca6 --- /dev/null +++ b/testing/android_background_image/android/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/testing/scenario_app/android/.gitignore b/testing/scenario_app/android/.gitignore index 88b214e75574c..9a6a5bef7fbe6 100644 --- a/testing/scenario_app/android/.gitignore +++ b/testing/scenario_app/android/.gitignore @@ -13,3 +13,7 @@ /captures .externalNativeBuild .cache + +!gradlew +!gradlew.bat +!gradle/wrapper/** From 62bf039e054a437de30d41e1d000bcbfff5f563b Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 20 Jul 2021 09:45:19 -0700 Subject: [PATCH 06/11] specify gradle_user_home/project_cache_dir --- testing/rules/android.gni | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testing/rules/android.gni b/testing/rules/android.gni index ee0c2b18a6bfd..1d34b1fd24d9c 100644 --- a/testing/rules/android.gni +++ b/testing/rules/android.gni @@ -18,13 +18,15 @@ template("gradle_task") { inputs = [ "$root_out_dir/flutter.jar" ] sources = invoker.sources outputs = invoker.outputs - + out_dir = rebase_path("$root_out_dir/${invoker.app_name}") args = [ invoker.gradlew_dir, invoker.task, "--no-daemon", "-Pflutter_jar=" + rebase_path("$root_out_dir/flutter.jar"), - "-Pout_dir=" + rebase_path("$root_out_dir/${invoker.app_name}"), + "-Pout_dir=$out_dir", + "--project-cache-dir=\"$out_dir/.gradle\"", + "--gradle-user-home=\"$out_dir/.gradle\"", ] if (is_aot) { From 1b42c62f137c444631f9ea5bde82e04e25e3228d Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 20 Jul 2021 10:45:52 -0700 Subject: [PATCH 07/11] AGP 4.2.0, gradle 6.7.1 --- testing/android_background_image/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- testing/rules/android.gni | 4 ++-- testing/scenario_app/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/android_background_image/android/build.gradle b/testing/android_background_image/android/build.gradle index f67dda3d18b84..b6931a6ee732f 100644 --- a/testing/android_background_image/android/build.gradle +++ b/testing/android_background_image/android/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties b/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties index 37c1aa69ad8a7..56db662b86061 100644 --- a/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties +++ b/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip diff --git a/testing/rules/android.gni b/testing/rules/android.gni index 1d34b1fd24d9c..53b096b1364a8 100644 --- a/testing/rules/android.gni +++ b/testing/rules/android.gni @@ -25,8 +25,8 @@ template("gradle_task") { "--no-daemon", "-Pflutter_jar=" + rebase_path("$root_out_dir/flutter.jar"), "-Pout_dir=$out_dir", - "--project-cache-dir=\"$out_dir/.gradle\"", - "--gradle-user-home=\"$out_dir/.gradle\"", + "--project-cache-dir=$out_dir/.gradle", + "--gradle-user-home=$out_dir/.gradle", ] if (is_aot) { diff --git a/testing/scenario_app/android/build.gradle b/testing/scenario_app/android/build.gradle index 9e1b24001d0d7..da806b25697b5 100644 --- a/testing/scenario_app/android/build.gradle +++ b/testing/scenario_app/android/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath 'com.facebook.testing.screenshot:plugin:0.12.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties b/testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties index 37c1aa69ad8a7..56db662b86061 100644 --- a/testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip From 966cdeb6080ccf392189f8380ff8a7bf7580b9b5 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 20 Jul 2021 12:44:54 -0700 Subject: [PATCH 08/11] only on arm64 --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 18447f78aca5f..db6a2948be819 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -121,7 +121,7 @@ group("flutter") { public_deps += [ "//flutter/testing/scenario_app" ] } - if (is_android && flutter_runtime_mode == "profile") { + if (is_android && flutter_runtime_mode == "profile" && target_cpu = "arm64") { public_deps += [ "//flutter/testing/android_background_image" ] } From a7781d45e131286af02340b3f54ccb150d5c8190 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 20 Jul 2021 13:13:40 -0700 Subject: [PATCH 09/11] current_cpu --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 691b8fb684424..fe1135605fc13 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -122,7 +122,7 @@ group("flutter") { } if (is_android && flutter_runtime_mode == "profile" && - target_cpu == "arm64") { + current_cpu == "arm64") { public_deps += [ "//flutter/testing/android_background_image" ] } From d9010940f9de628e830618db93f6171768be30b0 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 20 Jul 2021 14:03:03 -0700 Subject: [PATCH 10/11] weak_ptr for AndroidSurface --- shell/platform/android/platform_view_android.h | 2 ++ shell/platform/android/surface/snapshot_surface_producer.cc | 5 +++-- shell/platform/android/surface/snapshot_surface_producer.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/shell/platform/android/platform_view_android.h b/shell/platform/android/platform_view_android.h index ebd00f5ae43c4..42399b1da0360 100644 --- a/shell/platform/android/platform_view_android.h +++ b/shell/platform/android/platform_view_android.h @@ -125,7 +125,9 @@ class PlatformViewAndroid final : public PlatformView { PlatformViewAndroidDelegate platform_view_android_delegate_; + // This must only be shared with non-platform threads as a weak_ptr. std::shared_ptr android_surface_; + // We use id 0 to mean that no response is expected. int next_response_id_ = 1; std::unordered_map> diff --git a/shell/platform/android/surface/snapshot_surface_producer.cc b/shell/platform/android/surface/snapshot_surface_producer.cc index 8a5fac0ff737c..53c71a2ba7e34 100644 --- a/shell/platform/android/surface/snapshot_surface_producer.cc +++ b/shell/platform/android/surface/snapshot_surface_producer.cc @@ -12,10 +12,11 @@ AndroidSnapshotSurfaceProducer::AndroidSnapshotSurfaceProducer( std::unique_ptr AndroidSnapshotSurfaceProducer::CreateSnapshotSurface() { - if (!android_surface_) { + std::shared_ptr android_surface = android_surface_.lock(); + if (!android_surface) { return nullptr; } - return android_surface_->CreatePbufferSurface(); + return android_surface->CreatePbufferSurface(); } } // namespace flutter diff --git a/shell/platform/android/surface/snapshot_surface_producer.h b/shell/platform/android/surface/snapshot_surface_producer.h index eed8cce17a57c..0701bd81e7ded 100644 --- a/shell/platform/android/surface/snapshot_surface_producer.h +++ b/shell/platform/android/surface/snapshot_surface_producer.h @@ -22,7 +22,7 @@ class AndroidSnapshotSurfaceProducer : public SnapshotSurfaceProducer { std::unique_ptr CreateSnapshotSurface() override; private: - std::shared_ptr android_surface_; + std::weak_ptr android_surface_; }; } // namespace flutter From aa948b54de369e3256e1484222549a8f2ad2c372 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 20 Jul 2021 14:07:37 -0700 Subject: [PATCH 11/11] ref --- shell/platform/android/platform_view_android.cc | 2 +- shell/platform/android/platform_view_android.h | 3 +-- .../android/surface/snapshot_surface_producer.cc | 10 +++------- .../android/surface/snapshot_surface_producer.h | 7 ++----- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc index afce5da3e933c..698aee991478e 100644 --- a/shell/platform/android/platform_view_android.cc +++ b/shell/platform/android/platform_view_android.cc @@ -323,7 +323,7 @@ PlatformViewAndroid::CreateSnapshotSurfaceProducer() { if (!android_surface_) { return nullptr; } - return std::make_unique(android_surface_); + return std::make_unique(*android_surface_); } // |PlatformView| diff --git a/shell/platform/android/platform_view_android.h b/shell/platform/android/platform_view_android.h index 42399b1da0360..6ea2abb8a1a19 100644 --- a/shell/platform/android/platform_view_android.h +++ b/shell/platform/android/platform_view_android.h @@ -125,8 +125,7 @@ class PlatformViewAndroid final : public PlatformView { PlatformViewAndroidDelegate platform_view_android_delegate_; - // This must only be shared with non-platform threads as a weak_ptr. - std::shared_ptr android_surface_; + std::unique_ptr android_surface_; // We use id 0 to mean that no response is expected. int next_response_id_ = 1; diff --git a/shell/platform/android/surface/snapshot_surface_producer.cc b/shell/platform/android/surface/snapshot_surface_producer.cc index 53c71a2ba7e34..5ec41e85471ee 100644 --- a/shell/platform/android/surface/snapshot_surface_producer.cc +++ b/shell/platform/android/surface/snapshot_surface_producer.cc @@ -7,16 +7,12 @@ namespace flutter { AndroidSnapshotSurfaceProducer::AndroidSnapshotSurfaceProducer( - std::shared_ptr android_surface) - : android_surface_(std::move(android_surface)) {} + AndroidSurface& android_surface) + : android_surface_(android_surface) {} std::unique_ptr AndroidSnapshotSurfaceProducer::CreateSnapshotSurface() { - std::shared_ptr android_surface = android_surface_.lock(); - if (!android_surface) { - return nullptr; - } - return android_surface->CreatePbufferSurface(); + return android_surface_.CreatePbufferSurface(); } } // namespace flutter diff --git a/shell/platform/android/surface/snapshot_surface_producer.h b/shell/platform/android/surface/snapshot_surface_producer.h index 0701bd81e7ded..5ec8c68b2f457 100644 --- a/shell/platform/android/surface/snapshot_surface_producer.h +++ b/shell/platform/android/surface/snapshot_surface_producer.h @@ -5,8 +5,6 @@ #ifndef SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_ #define SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_ -#include - #include "flutter/flow/surface.h" #include "flutter/shell/common/snapshot_surface_producer.h" #include "flutter/shell/platform/android/surface/android_surface.h" @@ -15,14 +13,13 @@ namespace flutter { class AndroidSnapshotSurfaceProducer : public SnapshotSurfaceProducer { public: - explicit AndroidSnapshotSurfaceProducer( - std::shared_ptr android_surface); + explicit AndroidSnapshotSurfaceProducer(AndroidSurface& android_surface); // |SnapshotSurfaceProducer| std::unique_ptr CreateSnapshotSurface() override; private: - std::weak_ptr android_surface_; + AndroidSurface& android_surface_; }; } // namespace flutter