diff --git a/shell/platform/darwin/common/BUILD.gn b/shell/platform/darwin/common/BUILD.gn index 3d509700e054f..58638a5bc097d 100644 --- a/shell/platform/darwin/common/BUILD.gn +++ b/shell/platform/darwin/common/BUILD.gn @@ -9,8 +9,8 @@ import("//flutter/testing/testing.gni") import("framework_common.gni") source_set("common") { - cflags_objc = flutter_cflags_objc - cflags_objcc = flutter_cflags_objcc + cflags_objc = flutter_cflags_objc_arc + cflags_objcc = flutter_cflags_objcc_arc sources = [ "buffer_conversions.h", @@ -40,9 +40,6 @@ source_set("common") { # See: Upstream clang change: https://reviews.llvm.org/D150397 # See: https://github.com/flutter/flutter/issues/133777 source_set("availability_version_check") { - cflags_objc = flutter_cflags_objc - cflags_objcc = flutter_cflags_objcc - sources = [ "availability_version_check.cc" ] deps = [ "//flutter/fml" ] diff --git a/shell/platform/darwin/common/buffer_conversions.mm b/shell/platform/darwin/common/buffer_conversions.mm index 1aa07df2653a8..749f35a9561a2 100644 --- a/shell/platform/darwin/common/buffer_conversions.mm +++ b/shell/platform/darwin/common/buffer_conversions.mm @@ -7,22 +7,22 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" +static_assert(__has_feature(objc_arc), "ARC must be enabled."); + namespace flutter { namespace { class NSDataMapping : public fml::Mapping { public: - explicit NSDataMapping(NSData* data) : data_([data retain]) {} + explicit NSDataMapping(NSData* data) : data_(data) {} - size_t GetSize() const override { return [data_.get() length]; } + size_t GetSize() const override { return data_.length; } - const uint8_t* GetMapping() const override { - return static_cast([data_.get() bytes]); - } + const uint8_t* GetMapping() const override { return static_cast(data_.bytes); } bool IsDontNeedSafe() const override { return false; } private: - fml::scoped_nsobject data_; + NSData* data_; FML_DISALLOW_COPY_AND_ASSIGN(NSDataMapping); }; } // namespace diff --git a/shell/platform/darwin/common/command_line.mm b/shell/platform/darwin/common/command_line.mm index d9f42e634fde6..47c8ef2b8ede1 100644 --- a/shell/platform/darwin/common/command_line.mm +++ b/shell/platform/darwin/common/command_line.mm @@ -6,6 +6,8 @@ #import +static_assert(__has_feature(objc_arc), "ARC must be enabled."); + namespace flutter { fml::CommandLine CommandLineFromNSProcessInfo(NSProcessInfo* processInfoOrNil) {