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

Commit a9549e5

Browse files
committed
revert bad fix
1 parent d252453 commit a9549e5

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <map>
99
#include <memory>
1010
#include <string>
11-
#include <utility>
1211

1312
#include "flutter/common/graphics/persistent_cache.h"
1413
#include "flutter/flow/rtree.h"
@@ -39,7 +38,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
3938

4039
std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewLayerPool::GetLayer(
4140
GrDirectContext* gr_context,
42-
const std::shared_ptr<IOSContext>& ios_context) {
41+
std::shared_ptr<IOSContext> ios_context) {
4342
if (available_layer_index_ >= layers_.size()) {
4443
std::shared_ptr<FlutterPlatformViewLayer> layer;
4544
fml::scoped_nsobject<FlutterOverlayView> overlay_view;
@@ -286,7 +285,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
286285
const int FlutterPlatformViewsController::kDefaultMergedLeaseDuration;
287286

288287
PostPrerollResult FlutterPlatformViewsController::PostPrerollAction(
289-
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
288+
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
290289
// TODO(cyanglaz): https://github.com/flutter/flutter/issues/56474
291290
// Rename `has_platform_view` to `view_mutated` when the above issue is resolved.
292291
if (!HasPlatformViewThisOrNextFrame()) {
@@ -315,14 +314,14 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
315314

316315
void FlutterPlatformViewsController::EndFrame(
317316
bool should_resubmit_frame,
318-
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
317+
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
319318
if (should_resubmit_frame) {
320319
raster_thread_merger->MergeWithLease(kDefaultMergedLeaseDuration);
321320
}
322321
}
323322

324323
void FlutterPlatformViewsController::PushFilterToVisitedPlatformViews(
325-
const std::shared_ptr<const DlImageFilter>& filter,
324+
std::shared_ptr<const DlImageFilter> filter,
326325
const SkRect& filter_rect) {
327326
for (int64_t id : visited_platform_views_) {
328327
EmbeddedViewParams params = current_composition_params_[id];
@@ -585,7 +584,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
585584
}
586585

587586
bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
588-
const std::shared_ptr<IOSContext>& ios_context,
587+
std::shared_ptr<IOSContext> ios_context,
589588
std::unique_ptr<SurfaceFrame> frame) {
590589
// Any UIKit related code has to run on main thread.
591590
FML_DCHECK([[NSThread currentThread] isMainThread]);
@@ -735,8 +734,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
735734
int64_t view_id,
736735
int64_t overlay_id) {
737736
FML_DCHECK(flutter_view_);
738-
std::shared_ptr<FlutterPlatformViewLayer> layer =
739-
layer_pool_->GetLayer(gr_context, std::move(ios_context));
737+
std::shared_ptr<FlutterPlatformViewLayer> layer = layer_pool_->GetLayer(gr_context, ios_context);
740738

741739
UIView* overlay_view_wrapper = layer->overlay_view_wrapper.get();
742740
auto screenScale = [UIScreen mainScreen].scale;

0 commit comments

Comments
 (0)