From b9ceb829db33f1d0e1f3fee512995adac3fc6dd6 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Tue, 4 Aug 2020 13:59:55 -0400 Subject: [PATCH 1/2] Migrate a few last places to GrDirectContext This is a followup to #19962 to cover a few places where we were still using GrContext. No functional impact. --- flow/raster_cache.h | 2 +- flow/skia_gpu_object.cc | 2 +- flow/skia_gpu_object.h | 4 ++-- lib/ui/painting/multi_frame_codec.cc | 4 ++-- lib/ui/painting/multi_frame_codec.h | 4 ++-- lib/ui/ui_dart_state.cc | 2 +- lib/ui/ui_dart_state.h | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flow/raster_cache.h b/flow/raster_cache.h index 138ce673c58d7..ace5a0c958b58 100644 --- a/flow/raster_cache.h +++ b/flow/raster_cache.h @@ -60,7 +60,7 @@ class RasterCache { * to be stored in the cache. * * @param picture the SkPicture object to be cached. - * @param context the GrContext used for rendering. + * @param context the GrDirectContext used for rendering. * @param ctm the transformation matrix used for rendering. * @param dst_color_space the destination color space that the cached * rendering will be drawn into diff --git a/flow/skia_gpu_object.cc b/flow/skia_gpu_object.cc index aadb4e3b72f71..7415916d77954 100644 --- a/flow/skia_gpu_object.cc +++ b/flow/skia_gpu_object.cc @@ -11,7 +11,7 @@ namespace flutter { SkiaUnrefQueue::SkiaUnrefQueue(fml::RefPtr task_runner, fml::TimeDelta delay, - fml::WeakPtr context) + fml::WeakPtr context) : task_runner_(std::move(task_runner)), drain_delay_(delay), drain_pending_(false), diff --git a/flow/skia_gpu_object.h b/flow/skia_gpu_object.h index ef7cb596f1a36..662d560fc9eff 100644 --- a/flow/skia_gpu_object.h +++ b/flow/skia_gpu_object.h @@ -35,14 +35,14 @@ class SkiaUnrefQueue : public fml::RefCountedThreadSafe { std::mutex mutex_; std::deque objects_; bool drain_pending_; - fml::WeakPtr context_; + fml::WeakPtr context_; // The `GrDirectContext* context` is only used for signaling Skia to // performDeferredCleanup. It can be nullptr when such signaling is not needed // (e.g., in unit tests). SkiaUnrefQueue(fml::RefPtr task_runner, fml::TimeDelta delay, - fml::WeakPtr context = {}); + fml::WeakPtr context = {}); ~SkiaUnrefQueue(); diff --git a/lib/ui/painting/multi_frame_codec.cc b/lib/ui/painting/multi_frame_codec.cc index 4965bd924b215..c40561836011a 100644 --- a/lib/ui/painting/multi_frame_codec.cc +++ b/lib/ui/painting/multi_frame_codec.cc @@ -75,7 +75,7 @@ static bool CopyToBitmap(SkBitmap* dst, } sk_sp MultiFrameCodec::State::GetNextFrameImage( - fml::WeakPtr resourceContext) { + fml::WeakPtr resourceContext) { SkBitmap bitmap = SkBitmap(); SkImageInfo info = generator_->getInfo().makeColorType(kN32_SkColorType); if (info.alphaType() == kUnpremul_SkAlphaType) { @@ -136,7 +136,7 @@ sk_sp MultiFrameCodec::State::GetNextFrameImage( void MultiFrameCodec::State::GetNextFrameAndInvokeCallback( std::unique_ptr callback, fml::RefPtr ui_task_runner, - fml::WeakPtr resourceContext, + fml::WeakPtr resourceContext, fml::RefPtr unref_queue, size_t trace_id) { fml::RefPtr frameInfo = NULL; diff --git a/lib/ui/painting/multi_frame_codec.h b/lib/ui/painting/multi_frame_codec.h index 5843876046e31..80d92e7cf8953 100644 --- a/lib/ui/painting/multi_frame_codec.h +++ b/lib/ui/painting/multi_frame_codec.h @@ -53,12 +53,12 @@ class MultiFrameCodec : public Codec { // The index of the last decoded required frame. int lastRequiredFrameIndex_ = -1; - sk_sp GetNextFrameImage(fml::WeakPtr resourceContext); + sk_sp GetNextFrameImage(fml::WeakPtr resourceContext); void GetNextFrameAndInvokeCallback( std::unique_ptr callback, fml::RefPtr ui_task_runner, - fml::WeakPtr resourceContext, + fml::WeakPtr resourceContext, fml::RefPtr unref_queue, size_t trace_id); }; diff --git a/lib/ui/ui_dart_state.cc b/lib/ui/ui_dart_state.cc index 4b1a35b980e73..b43a442f849e0 100644 --- a/lib/ui/ui_dart_state.cc +++ b/lib/ui/ui_dart_state.cc @@ -136,7 +136,7 @@ fml::WeakPtr UIDartState::GetSnapshotDelegate() const { return snapshot_delegate_; } -fml::WeakPtr UIDartState::GetResourceContext() const { +fml::WeakPtr UIDartState::GetResourceContext() const { if (!io_manager_) { return {}; } diff --git a/lib/ui/ui_dart_state.h b/lib/ui/ui_dart_state.h index 116b5716c3be7..71755931a30d1 100644 --- a/lib/ui/ui_dart_state.h +++ b/lib/ui/ui_dart_state.h @@ -60,7 +60,7 @@ class UIDartState : public tonic::DartState { fml::WeakPtr GetSnapshotDelegate() const; - fml::WeakPtr GetResourceContext() const; + fml::WeakPtr GetResourceContext() const; fml::WeakPtr GetImageDecoder() const; From c6634ad48dd537da0828a623dfae9c326d72998e Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Tue, 4 Aug 2020 14:11:05 -0400 Subject: [PATCH 2/2] Formatting --- lib/ui/painting/multi_frame_codec.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ui/painting/multi_frame_codec.h b/lib/ui/painting/multi_frame_codec.h index 80d92e7cf8953..428d67c0bfeda 100644 --- a/lib/ui/painting/multi_frame_codec.h +++ b/lib/ui/painting/multi_frame_codec.h @@ -53,7 +53,8 @@ class MultiFrameCodec : public Codec { // The index of the last decoded required frame. int lastRequiredFrameIndex_ = -1; - sk_sp GetNextFrameImage(fml::WeakPtr resourceContext); + sk_sp GetNextFrameImage( + fml::WeakPtr resourceContext); void GetNextFrameAndInvokeCallback( std::unique_ptr callback,