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

Commit 5731389

Browse files
gaaclarkegaaclarke
committed
ios patch
1 parent 69a9fbb commit 5731389

18 files changed

+54
-46
lines changed

‎lib/ui/ui_dart_state.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ void UIDartState::LogMessage(const std::string& tag,
223223
}
224224
stream << message;
225225
std::string log = stream.str();
226-
syslog(1 /* LOG_ALERT */, "%.*s", (int)log.size(), log.c_str());
226+
syslog(1 /* LOG_ALERT */, "%.*s", static_cast<int>(log.size()),
227+
log.c_str());
227228
#else
228229
if (!tag.empty()) {
229230
std::cout << tag << ": ";

‎shell/common/shell_io_manager.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace flutter {
1414

1515
sk_sp<GrDirectContext> ShellIOManager::CreateCompatibleResourceLoadingContext(
1616
GrBackend backend,
17-
sk_sp<const GrGLInterface> gl_interface) {
17+
const sk_sp<const GrGLInterface>& gl_interface) {
1818
#if SK_GL
1919
if (backend != GrBackend::kOpenGL_GrBackend) {
2020
return nullptr;

‎shell/common/shell_io_manager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ShellIOManager final : public IOManager {
2222
// they so desire.
2323
static sk_sp<GrDirectContext> CreateCompatibleResourceLoadingContext(
2424
GrBackend backend,
25-
sk_sp<const GrGLInterface> gl_interface);
25+
const sk_sp<const GrGLInterface>& gl_interface);
2626

2727
ShellIOManager(
2828
sk_sp<GrDirectContext> resource_context,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454

5555
auto settings = flutter::SettingsFromCommandLine(command_line);
5656

57-
settings.task_observer_add = [](intptr_t key, fml::closure callback) {
58-
fml::MessageLoop::GetCurrent().AddTaskObserver(key, std::move(callback));
57+
settings.task_observer_add = [](intptr_t key, const fml::closure& callback) {
58+
fml::MessageLoop::GetCurrent().AddTaskObserver(key, callback);
5959
};
6060

6161
settings.task_observer_remove = [](intptr_t key) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ - (void)updateViewportMetrics:(flutter::ViewportMetrics)viewportMetrics {
287287
if (!self.platformView) {
288288
return;
289289
}
290-
self.platformView->SetViewportMetrics(std::move(viewportMetrics));
290+
self.platformView->SetViewportMetrics(viewportMetrics);
291291
}
292292

293293
- (void)dispatchPointerDataPacket:(std::unique_ptr<flutter::PointerDataPacket>)packet {
@@ -797,9 +797,9 @@ - (BOOL)createShell:(NSString*)entrypoint
797797
[UIApplication sharedApplication].applicationState == UIApplicationStateBackground;
798798
// Create the shell. This is a blocking operation.
799799
std::unique_ptr<flutter::Shell> shell = flutter::Shell::Create(
800-
/*platform_data=*/std::move(platformData),
801-
/*task_runners=*/std::move(task_runners),
802-
/*settings=*/std::move(settings),
800+
/*platform_data=*/platformData,
801+
/*task_runners=*/task_runners,
802+
/*settings=*/settings,
803803
/*on_create_platform_view=*/on_create_platform_view,
804804
/*on_create_rasterizer=*/on_create_rasterizer,
805805
/*is_gpu_disabled=*/_isGpuDisabled);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ - (void)dealloc {
194194
[_delegate stopService];
195195
[_url release];
196196

197-
flutter::DartServiceIsolate::RemoveServerStatusCallback(std::move(_callbackHandle));
197+
flutter::DartServiceIsolate::RemoveServerStatusCallback(_callbackHandle);
198198
[super dealloc];
199199
}
200200
@end

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

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

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

3940
std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewLayerPool::GetLayer(
4041
GrDirectContext* gr_context,
41-
std::shared_ptr<IOSContext> ios_context) {
42+
const std::shared_ptr<IOSContext>& ios_context) {
4243
if (available_layer_index_ >= layers_.size()) {
4344
std::shared_ptr<FlutterPlatformViewLayer> layer;
4445
fml::scoped_nsobject<FlutterOverlayView> overlay_view;
@@ -285,7 +286,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
285286
const int FlutterPlatformViewsController::kDefaultMergedLeaseDuration;
286287

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

315316
void FlutterPlatformViewsController::EndFrame(
316317
bool should_resubmit_frame,
317-
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
318+
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
318319
if (should_resubmit_frame) {
319320
raster_thread_merger->MergeWithLease(kDefaultMergedLeaseDuration);
320321
}
321322
}
322323

323324
void FlutterPlatformViewsController::PushFilterToVisitedPlatformViews(
324-
std::shared_ptr<const DlImageFilter> filter,
325+
const std::shared_ptr<const DlImageFilter>& filter,
325326
const SkRect& filter_rect) {
326327
for (int64_t id : visited_platform_views_) {
327328
EmbeddedViewParams params = current_composition_params_[id];
@@ -584,7 +585,7 @@ - (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
584585
}
585586

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

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

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ class IOSContextGL;
112112
class IOSSurface;
113113

114114
struct FlutterPlatformViewLayer {
115-
FlutterPlatformViewLayer(fml::scoped_nsobject<UIView> overlay_view,
116-
fml::scoped_nsobject<UIView> overlay_view_wrapper,
115+
FlutterPlatformViewLayer(const fml::scoped_nsobject<UIView>& overlay_view,
116+
const fml::scoped_nsobject<UIView>& overlay_view_wrapper,
117117
std::unique_ptr<IOSSurface> ios_surface,
118118
std::unique_ptr<Surface> surface);
119119

@@ -144,10 +144,11 @@ class FlutterPlatformViewLayerPool {
144144
// Finally, it marks the layer as used. That is, it increments `available_layer_index_`.
145145
std::shared_ptr<FlutterPlatformViewLayer> GetLayer(GrDirectContext* gr_context,
146146
std::shared_ptr<IOSContext> ios_context);
147-
148-
// Gets the layers in the pool that aren't currently used.
149-
// This method doesn't mark the layers as unused.
150-
std::vector<std::shared_ptr<FlutterPlatformViewLayer>> GetUnusedLayers();
147+
const
148+
// Gets the layers in th&e pool that aren't currently used.
149+
// This method doesn't mark the layers as unused.
150+
std::vector<std::shared_ptr<FlutterPlatformViewLayer>>
151+
GetUnusedLayers();
151152

152153
// Marks the layers in the pool as available for reuse.
153154
void RecycleLayers();
@@ -207,12 +208,13 @@ class FlutterPlatformViewsController {
207208
// returns nil.
208209
UIView* GetPlatformViewByID(int view_id);
209210

210-
PostPrerollResult PostPrerollAction(fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger);
211+
PostPrerollResult PostPrerollAction(
212+
fml::RefPtr<fml::RasterThreadMerger> rasteconst r_thread_merger);
211213

212-
void EndFrame(bool should_resubmit_frame,
213-
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger);
214+
void EndFrame(b& ool should_resubmit_frame,
215+
fml::RefPtr<fml::RasterThreadMerger> rasteconst r_thread_merger);
214216

215-
std::vector<SkCanvas*> GetCurrentCanvases();
217+
std::vector<SkC & anvas*> GetCurrentCanvases();
216218

217219
std::vector<DisplayListBuilder*> GetCurrentBuilders();
218220

@@ -227,7 +229,7 @@ class FlutterPlatformViewsController {
227229

228230
bool SubmitFrame(GrDirectContext* gr_context,
229231
std::shared_ptr<IOSContext> ios_context,
230-
std::unique_ptr<SurfaceFrame> frame);
232+
const std::uniq& ue_ptr<SurfaceFrame> frame);
231233

232234
void OnMethodCall(FlutterMethodCall* call, FlutterResult& result);
233235

@@ -236,8 +238,8 @@ class FlutterPlatformViewsController {
236238
long FindFirstResponderPlatformViewId();
237239

238240
// Pushes backdrop filter mutation to the mutator stack of each visited platform view.
239-
void PushFilterToVisitedPlatformViews(std::shared_ptr<const DlImageFilter> filter,
240-
const SkRect& filter_rect);
241+
void
242+
PushFilterToVisitedPlatformViews(std::shared_ptr<const DlImageFilter> filteconst r, & const SkRect& filter_rect);
241243

242244
// Pushes the view id of a visted platform view to the list of visied platform views.
243245
void PushVisitedPlatformView(int64_t view_id) { visited_platform_views_.push_back(view_id); }

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
namespace flutter {
1414

1515
FlutterPlatformViewLayer::FlutterPlatformViewLayer(
16-
fml::scoped_nsobject<UIView> overlay_view,
17-
fml::scoped_nsobject<UIView> overlay_view_wrapper,
16+
const fml::scoped_nsobject<UIView>& overlay_view,
17+
const fml::scoped_nsobject<UIView>& overlay_view_wrapper,
1818
std::unique_ptr<IOSSurface> ios_surface,
1919
std::unique_ptr<Surface> surface)
20-
: overlay_view(std::move(overlay_view)),
21-
overlay_view_wrapper(std::move(overlay_view_wrapper)),
20+
: overlay_view(overlay_view),
21+
overlay_view_wrapper(overlay_view_wrapper),
2222
ios_surface(std::move(ios_surface)),
2323
surface(std::move(surface)){};
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ - (void)sharedSetupWithProject:(nullable FlutterDartProject*)project
229229
}
230230

231231
_viewOpaque = YES;
232-
_engine = std::move(engine);
232+
_engine = engine;
233233
_flutterView.reset([[FlutterView alloc] initWithDelegate:_engine opaque:self.isViewOpaque]);
234234
[_engine.get() createShell:nil libraryURI:nil initialRoute:initialRoute];
235235
_engineNeedsLaunch = YES;

0 commit comments

Comments
 (0)