ios patch

Author: gaaclarke

lib/ui/ui_dart_state.cc

@@ -223,7 +223,8 @@ void UIDartState::LogMessage(const std::string& tag,
     }
     stream << message;
     std::string log = stream.str();
-    syslog(1 /* LOG_ALERT */, "%.*s", (int)log.size(), log.c_str());
+    syslog(1 /* LOG_ALERT */, "%.*s", static_cast<int>(log.size()),
+           log.c_str());
 #else
     if (!tag.empty()) {
       std::cout << tag << ": ";

shell/common/shell_io_manager.cc

@@ -14,7 +14,7 @@ namespace flutter {
 
 sk_sp<GrDirectContext> ShellIOManager::CreateCompatibleResourceLoadingContext(
     GrBackend backend,
-    sk_sp<const GrGLInterface> gl_interface) {
+    const sk_sp<const GrGLInterface>& gl_interface) {
 #if SK_GL
   if (backend != GrBackend::kOpenGL_GrBackend) {
     return nullptr;

shell/common/shell_io_manager.h

@@ -22,7 +22,7 @@ class ShellIOManager final : public IOManager {
   // they so desire.
   static sk_sp<GrDirectContext> CreateCompatibleResourceLoadingContext(
       GrBackend backend,
-      sk_sp<const GrGLInterface> gl_interface);
+      const sk_sp<const GrGLInterface>& gl_interface);
 
   ShellIOManager(
       sk_sp<GrDirectContext> resource_context,

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

@@ -54,8 +54,8 @@
 
   auto settings = flutter::SettingsFromCommandLine(command_line);
 
-  settings.task_observer_add = [](intptr_t key, fml::closure callback) {
-    fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));
+  settings.task_observer_add = [](intptr_t key, const fml::closure& callback) {
+    fml::MessageLoop::GetCurrent().AddTaskObserver(key, callback);
   };
 
   settings.task_observer_remove = [](intptr_t key) {

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

@@ -287,7 +287,7 @@ - (void)updateViewportMetrics:(flutter::ViewportMetrics)viewportMetrics {
   if (!self.platformView) {
     return;
   }
-  self.platformView->SetViewportMetrics(std::move(viewportMetrics));
+  self.platformView->SetViewportMetrics(viewportMetrics);
 }
 
 - (void)dispatchPointerDataPacket:(std::unique_ptr<flutter::PointerDataPacket>)packet {
@@ -797,9 +797,9 @@ - (BOOL)createShell:(NSString*)entrypoint
       [UIApplication sharedApplication].applicationState == UIApplicationStateBackground;
   // Create the shell. This is a blocking operation.
   std::unique_ptr<flutter::Shell> shell = flutter::Shell::Create(
-      /*platform_data=*/std::move(platformData),
-      /*task_runners=*/std::move(task_runners),
-      /*settings=*/std::move(settings),
+      /*platform_data=*/platformData,
+      /*task_runners=*/task_runners,
+      /*settings=*/settings,
       /*on_create_platform_view=*/on_create_platform_view,
       /*on_create_rasterizer=*/on_create_rasterizer,
       /*is_gpu_disabled=*/_isGpuDisabled);

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

@@ -194,7 +194,7 @@ - (void)dealloc {
   [_delegate stopService];
   [_url release];
 
-  flutter::DartServiceIsolate::RemoveServerStatusCallback(std::move(_callbackHandle));
+  flutter::DartServiceIsolate::RemoveServerStatusCallback(_callbackHandle);
   [super dealloc];
 }
 @end

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

@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "flutter/common/graphics/persistent_cache.h"
 #include "flutter/flow/rtree.h"
@@ -38,7 +39,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
 
 std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewLayerPool::GetLayer(
     GrDirectContext* gr_context,
-    std::shared_ptr<IOSContext> ios_context) {
+    const std::shared_ptr<IOSContext>& ios_context) {
   if (available_layer_index_ >= layers_.size()) {
     std::shared_ptr<FlutterPlatformViewLayer> layer;
     fml::scoped_nsobject<FlutterOverlayView> overlay_view;
@@ -285,7 +286,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
 const int FlutterPlatformViewsController::kDefaultMergedLeaseDuration;
 
 PostPrerollResult FlutterPlatformViewsController::PostPrerollAction(
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   // TODO(cyanglaz): https://github.com/flutter/flutter/issues/56474
   // Rename `has_platform_view` to `view_mutated` when the above issue is resolved.
   if (!HasPlatformViewThisOrNextFrame()) {
@@ -314,14 +315,14 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
 
 void FlutterPlatformViewsController::EndFrame(
     bool should_resubmit_frame,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   if (should_resubmit_frame) {
     raster_thread_merger->MergeWithLease(kDefaultMergedLeaseDuration);
   }
 }
 
 void FlutterPlatformViewsController::PushFilterToVisitedPlatformViews(
-    std::shared_ptr<const DlImageFilter> filter,
+    const std::shared_ptr<const DlImageFilter>& filter,
     const SkRect& filter_rect) {
   for (int64_t id : visited_platform_views_) {
     EmbeddedViewParams params = current_composition_params_[id];
@@ -584,7 +585,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
 }
 
 bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
-                                                 std::shared_ptr<IOSContext> ios_context,
+                                                 const std::shared_ptr<IOSContext>& ios_context,
                                                  std::unique_ptr<SurfaceFrame> frame) {
   // Any UIKit related code has to run on main thread.
   FML_DCHECK([[NSThread currentThread] isMainThread]);
@@ -734,7 +735,8 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
     int64_t view_id,
     int64_t overlay_id) {
   FML_DCHECK(flutter_view_);
-  std::shared_ptr<FlutterPlatformViewLayer> layer = layer_pool_->GetLayer(gr_context, ios_context);
+  std::shared_ptr<FlutterPlatformViewLayer> layer =
+      layer_pool_->GetLayer(gr_context, std::move(ios_context));
 
   UIView* overlay_view_wrapper = layer->overlay_view_wrapper.get();
   auto screenScale = [UIScreen mainScreen].scale;

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h

@@ -112,8 +112,8 @@ class IOSContextGL;
 class IOSSurface;
 
 struct FlutterPlatformViewLayer {
-  FlutterPlatformViewLayer(fml::scoped_nsobject<UIView> overlay_view,
-                           fml::scoped_nsobject<UIView> overlay_view_wrapper,
+  FlutterPlatformViewLayer(const fml::scoped_nsobject<UIView>& overlay_view,
+                           const fml::scoped_nsobject<UIView>& overlay_view_wrapper,
                            std::unique_ptr<IOSSurface> ios_surface,
                            std::unique_ptr<Surface> surface);
 
@@ -144,10 +144,11 @@ class FlutterPlatformViewLayerPool {
   // Finally, it marks the layer as used. That is, it increments `available_layer_index_`.
   std::shared_ptr<FlutterPlatformViewLayer> GetLayer(GrDirectContext* gr_context,
                                                      std::shared_ptr<IOSContext> ios_context);
-
-  // Gets the layers in the pool that aren't currently used.
-  // This method doesn't mark the layers as unused.
-  std::vector<std::shared_ptr<FlutterPlatformViewLayer>> GetUnusedLayers();
+  const
+      // Gets the layers in th&e pool that aren't currently used.
+      // This method doesn't mark the layers as unused.
+      std::vector<std::shared_ptr<FlutterPlatformViewLayer>>
+      GetUnusedLayers();
 
   // Marks the layers in the pool as available for reuse.
   void RecycleLayers();
@@ -207,12 +208,13 @@ class FlutterPlatformViewsController {
   // returns nil.
   UIView* GetPlatformViewByID(int view_id);
 
-  PostPrerollResult PostPrerollAction(fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger);
+  PostPrerollResult PostPrerollAction(
+      fml::RefPtr<fml::RasterThreadMerger> rasteconst r_thread_merger);
 
-  void EndFrame(bool should_resubmit_frame,
-                fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger);
+  void EndFrame(b& ool should_resubmit_frame,
+                fml::RefPtr<fml::RasterThreadMerger> rasteconst r_thread_merger);
 
-  std::vector<SkCanvas*> GetCurrentCanvases();
+  std::vector<SkC & anvas*> GetCurrentCanvases();
 
   std::vector<DisplayListBuilder*> GetCurrentBuilders();
 
@@ -227,7 +229,7 @@ class FlutterPlatformViewsController {
 
   bool SubmitFrame(GrDirectContext* gr_context,
                    std::shared_ptr<IOSContext> ios_context,
-                   std::unique_ptr<SurfaceFrame> frame);
+                   const std::uniq& ue_ptr<SurfaceFrame> frame);
 
   void OnMethodCall(FlutterMethodCall* call, FlutterResult& result);
 
@@ -236,8 +238,8 @@ class FlutterPlatformViewsController {
   long FindFirstResponderPlatformViewId();
 
   // Pushes backdrop filter mutation to the mutator stack of each visited platform view.
-  void PushFilterToVisitedPlatformViews(std::shared_ptr<const DlImageFilter> filter,
-                                        const SkRect& filter_rect);
+  void
+  PushFilterToVisitedPlatformViews(std::shared_ptr<const DlImageFilter> filteconst r, & const SkRect& filter_rect);
 
   // Pushes the view id of a visted platform view to the list of visied platform views.
   void PushVisitedPlatformView(int64_t view_id) { visited_platform_views_.push_back(view_id); }

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

@@ -13,12 +13,12 @@
 namespace flutter {
 
 FlutterPlatformViewLayer::FlutterPlatformViewLayer(
-    fml::scoped_nsobject<UIView> overlay_view,
-    fml::scoped_nsobject<UIView> overlay_view_wrapper,
+    const fml::scoped_nsobject<UIView>& overlay_view,
+    const fml::scoped_nsobject<UIView>& overlay_view_wrapper,
     std::unique_ptr<IOSSurface> ios_surface,
     std::unique_ptr<Surface> surface)
-    : overlay_view(std::move(overlay_view)),
-      overlay_view_wrapper(std::move(overlay_view_wrapper)),
+    : overlay_view(overlay_view),
+      overlay_view_wrapper(overlay_view_wrapper),
       ios_surface(std::move(ios_surface)),
       surface(std::move(surface)){};
 

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

@@ -229,7 +229,7 @@ - (void)sharedSetupWithProject:(nullable FlutterDartProject*)project
   }
 
   _viewOpaque = YES;
-  _engine = std::move(engine);
+  _engine = engine;
   _flutterView.reset([[FlutterView alloc] initWithDelegate:_engine opaque:self.isViewOpaque]);
   [_engine.get() createShell:nil libraryURI:nil initialRoute:initialRoute];
   _engineNeedsLaunch = YES;

shell/platform/darwin/ios/framework/Source/accessibility_bridge.h

@@ -56,7 +56,7 @@ class AccessibilityBridge final : public AccessibilityBridgeIos {
   ~AccessibilityBridge();
 
   void UpdateSemantics(flutter::SemanticsNodeUpdates nodes,
-                       flutter::CustomAccessibilityActionUpdates actions);
+                       const flutter::CustomAccessibilityActionUpdates& actions);
   void DispatchSemanticsAction(int32_t id, flutter::SemanticsAction action) override;
   void DispatchSemanticsAction(int32_t id,
                                flutter::SemanticsAction action,

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

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <utility>
+
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
@@ -43,7 +45,7 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
     std::unique_ptr<IosDelegate> ios_delegate)
     : view_controller_(view_controller),
       platform_view_(platform_view),
-      platform_views_controller_(platform_views_controller),
+      platform_views_controller_(std::move(platform_views_controller)),
       last_focused_semantics_object_id_(kSemanticObjectIdInvalid),
       objects_([[NSMutableDictionary alloc] init]),
       previous_route_id_(0),
@@ -80,8 +82,9 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
   }
 }
 
-void AccessibilityBridge::UpdateSemantics(flutter::SemanticsNodeUpdates nodes,
-                                          flutter::CustomAccessibilityActionUpdates actions) {
+void AccessibilityBridge::UpdateSemantics(
+    flutter::SemanticsNodeUpdates nodes,
+    const flutter::CustomAccessibilityActionUpdates& actions) {
   BOOL layoutChanged = NO;
   BOOL scrollOccured = NO;
   BOOL needsAnnouncement = NO;
@@ -251,7 +254,7 @@ static void ReplaceSemanticsObject(SemanticsObject* oldObject,
 }
 
 static SemanticsObject* CreateObject(const flutter::SemanticsNode& node,
-                                     fml::WeakPtr<AccessibilityBridge> weak_ptr) {
+                                     const fml::WeakPtr<AccessibilityBridge>& weak_ptr) {
   if (node.HasFlag(flutter::SemanticsFlags::kIsTextField) &&
       !node.HasFlag(flutter::SemanticsFlags::kIsReadOnly)) {
     // Text fields are backed by objects that implement UITextInput.

shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h

@@ -57,7 +57,7 @@ namespace flutter {
 
 class VsyncWaiterIOS final : public VsyncWaiter, public VariableRefreshRateReporter {
  public:
-  explicit VsyncWaiterIOS(flutter::TaskRunners task_runners);
+  explicit VsyncWaiterIOS(const flutter::TaskRunners& task_runners);
 
   ~VsyncWaiterIOS() override;
 

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

@@ -16,8 +16,8 @@
 
 namespace flutter {
 
-VsyncWaiterIOS::VsyncWaiterIOS(flutter::TaskRunners task_runners)
-    : VsyncWaiter(std::move(task_runners)) {
+VsyncWaiterIOS::VsyncWaiterIOS(const flutter::TaskRunners& task_runners)
+    : VsyncWaiter(task_runners) {
   auto callback = [this](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {
     const fml::TimePoint start_time = recorder->GetVsyncStartTime();
     const fml::TimePoint target_time = recorder->GetVsyncTargetTime();

shell/platform/darwin/ios/ios_external_texture_metal.h

@@ -15,7 +15,7 @@ namespace flutter {
 class IOSExternalTextureMetal final : public Texture {
  public:
   explicit IOSExternalTextureMetal(
-      fml::scoped_nsobject<FlutterDarwinExternalTextureMetal>
+      const fml::scoped_nsobject<FlutterDarwinExternalTextureMetal>&
           darwin_external_texture_metal);
 
   // |Texture|

shell/platform/darwin/ios/ios_external_texture_metal.mm

@@ -8,7 +8,7 @@
 namespace flutter {
 
 IOSExternalTextureMetal::IOSExternalTextureMetal(
-    fml::scoped_nsobject<FlutterDarwinExternalTextureMetal> darwin_external_texture_metal)
+    const fml::scoped_nsobject<FlutterDarwinExternalTextureMetal>& darwin_external_texture_metal)
     : Texture([darwin_external_texture_metal textureID]),
       darwin_external_texture_metal_(darwin_external_texture_metal) {}
 

shell/platform/darwin/ios/platform_message_handler_ios.h

@@ -21,7 +21,7 @@ class PlatformMessageHandlerIos : public PlatformMessageHandler {
  public:
   static NSObject<FlutterTaskQueue>* MakeBackgroundTaskQueue();
 
-  PlatformMessageHandlerIos(TaskRunners task_runners);
+  PlatformMessageHandlerIos(const TaskRunners& task_runners);
 
   void HandlePlatformMessage(std::unique_ptr<PlatformMessage> message) override;
 

shell/platform/darwin/ios/platform_message_handler_ios.mm

@@ -44,7 +44,7 @@ - (void)dispatch:(dispatch_block_t)block {
   return [[[FLTSerialTaskQueue alloc] init] autorelease];
 }
 
-PlatformMessageHandlerIos::PlatformMessageHandlerIos(TaskRunners task_runners)
+PlatformMessageHandlerIos::PlatformMessageHandlerIos(const TaskRunners& task_runners)
     : task_runners_(task_runners) {}
 
 void PlatformMessageHandlerIos::HandlePlatformMessage(std::unique_ptr<PlatformMessage> message) {