moved over ios as well

gaaclarke · gaaclarke · commit 3ec4433bd6c1 · 2021-04-30T17:42:03.000-07:00
diff --git a/fml/mapping.cc b/fml/mapping.cc
@@ -117,6 +117,14 @@ void NonOwnedMapping::FreeProc(const uint8_t* data, size_t size) {
   free(const_cast<uint8_t*>(data));
 }
 
+const uint8_t* NonOwnedMapping::Release() {
+  const uint8_t* result = data_;
+  data_ = nullptr;
+  size_ = 0;
+  release_proc_ = nullptr;
+  return result;
+}
+
 // Symbol Mapping
 
 SymbolMapping::SymbolMapping(fml::RefPtr<fml::NativeLibrary> native_library,
diff --git a/fml/mapping.h b/fml/mapping.h
@@ -136,6 +136,11 @@ class NonOwnedMapping final : public Mapping {
   // |Mapping|
   const uint8_t* GetMapping() const override;
 
+  /// Removes ownership of the data buffer.
+  const uint8_t* Release();
+
+  ReleaseProc GetReleaseProc() const { return release_proc_; }
+
  private:
   const uint8_t* data_;
   size_t size_;
diff --git a/lib/ui/window/platform_message.h b/lib/ui/window/platform_message.h
@@ -31,6 +31,8 @@ class PlatformMessage {
     return response_;
   }
 
+  fml::NonOwnedMapping releaseData() { return std::move(data_); }
+
  private:
   std::string channel_;
   fml::NonOwnedMapping data_;
diff --git a/shell/common/shell.cc b/shell/common/shell.cc
@@ -1803,10 +1803,8 @@ bool Shell::ReloadSystemFonts() {
   std::unique_ptr<PlatformMessage> fontsChangeMessage =
       std::make_unique<flutter::PlatformMessage>(
           kSystemChannel,
-          fml::NonOwnedMapping::Copy(
-              reinterpret_cast<const uint8_t*>(message.c_str()),
-              reinterpret_cast<const uint8_t*>(message.c_str() +
-                                               message.length())),
+          fml::NonOwnedMapping::Copy(message.c_str(),
+                                     message.c_str() + message.length()),
           nullptr);
 
   OnPlatformViewDispatchPlatformMessage(std::move(fontsChangeMessage));
diff --git a/shell/platform/common/accessibility_bridge.cc b/shell/platform/common/accessibility_bridge.cc
@@ -539,8 +539,8 @@ gfx::RectF AccessibilityBridge::RelativeToGlobalBounds(const ui::AXNode* node,
 void AccessibilityBridge::DispatchAccessibilityAction(
     AccessibilityNodeId target,
     FlutterSemanticsAction action,
-    std::vector<uint8_t> data) {
-  delegate_->DispatchAccessibilityAction(target, action, data);
+    fml::NonOwnedMapping data) {
+  delegate_->DispatchAccessibilityAction(target, action, std::move(data));
 }
 
 }  // namespace flutter
diff --git a/shell/platform/common/accessibility_bridge.h b/shell/platform/common/accessibility_bridge.h
@@ -7,6 +7,7 @@
 
 #include <unordered_map>
 
+#include "flutter/fml/mapping.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 
 #include "flutter/third_party/accessibility/ax/ax_event_generator.h"
@@ -86,10 +87,9 @@ class AccessibilityBridge
     /// @param[in]  action              The generated flutter semantics action.
     /// @param[in]  data                Additional data associated with the
     ///                                 action.
-    virtual void DispatchAccessibilityAction(
-        AccessibilityNodeId target,
-        FlutterSemanticsAction action,
-        const std::vector<uint8_t>& data) = 0;
+    virtual void DispatchAccessibilityAction(AccessibilityNodeId target,
+                                             FlutterSemanticsAction action,
+                                             fml::NonOwnedMapping data) = 0;
 
     //---------------------------------------------------------------------------
     /// @brief      Creates a platform specific FlutterPlatformNodeDelegate.
@@ -277,7 +277,7 @@ class AccessibilityBridge
   // |FlutterPlatformNodeDelegate::OwnerBridge|
   void DispatchAccessibilityAction(AccessibilityNodeId target,
                                    FlutterSemanticsAction action,
-                                   std::vector<uint8_t> data) override;
+                                   fml::NonOwnedMapping data) override;
 
   // |FlutterPlatformNodeDelegate::OwnerBridge|
   gfx::RectF RelativeToGlobalBounds(const ui::AXNode* node,
diff --git a/shell/platform/common/flutter_platform_node_delegate.h b/shell/platform/common/flutter_platform_node_delegate.h
@@ -5,8 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_COMMON_FLUTTER_PLATFORM_NODE_DELEGATE_H_
 #define FLUTTER_SHELL_PLATFORM_COMMON_FLUTTER_PLATFORM_NODE_DELEGATE_H_
 
+#include "flutter/fml/mapping.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-
 #include "flutter/third_party/accessibility/ax/ax_event_generator.h"
 #include "flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h"
 
@@ -57,7 +57,7 @@ class FlutterPlatformNodeDelegate : public ui::AXPlatformNodeDelegateBase {
     ///                                 action.
     virtual void DispatchAccessibilityAction(AccessibilityNodeId target,
                                              FlutterSemanticsAction action,
-                                             std::vector<uint8_t> data) = 0;
+                                             fml::NonOwnedMapping data) = 0;
 
     //---------------------------------------------------------------------------
     /// @brief      Get the native accessibility node with the given id.
diff --git a/shell/platform/common/test_accessibility_bridge.cc b/shell/platform/common/test_accessibility_bridge.cc
@@ -19,7 +19,7 @@ void TestAccessibilityBridgeDelegate::OnAccessibilityEvent(
 void TestAccessibilityBridgeDelegate::DispatchAccessibilityAction(
     AccessibilityNodeId target,
     FlutterSemanticsAction action,
-    const std::vector<uint8_t>& data) {
+    fml::NonOwnedMapping data) {
   performed_actions.push_back(action);
 }
 
diff --git a/shell/platform/common/test_accessibility_bridge.h b/shell/platform/common/test_accessibility_bridge.h
@@ -18,7 +18,7 @@ class TestAccessibilityBridgeDelegate
       ui::AXEventGenerator::TargetedEvent targeted_event) override;
   void DispatchAccessibilityAction(AccessibilityNodeId target,
                                    FlutterSemanticsAction action,
-                                   const std::vector<uint8_t>& data) override;
+                                   fml::NonOwnedMapping data) override;
   std::unique_ptr<FlutterPlatformNodeDelegate>
   CreateFlutterPlatformNodeDelegate();
 
diff --git a/shell/platform/darwin/common/buffer_conversions.h b/shell/platform/darwin/common/buffer_conversions.h
@@ -13,13 +13,13 @@
 
 namespace flutter {
 
-std::vector<uint8_t> GetVectorFromNSData(NSData* data);
+fml::NonOwnedMapping CopyNSDataToMapping(NSData* data);
 
-NSData* GetNSDataFromVector(const std::vector<uint8_t>& buffer);
+NSData* CopyMappingToNSData(fml::NonOwnedMapping buffer);
 
-std::unique_ptr<fml::Mapping> GetMappingFromNSData(NSData* data);
+std::unique_ptr<fml::Mapping> CopyNSDataToMappingPtr(NSData* data);
 
-NSData* GetNSDataFromMapping(std::unique_ptr<fml::Mapping> mapping);
+NSData* CopyMappingPtrToNSData(std::unique_ptr<fml::Mapping> mapping);
 
 }  // namespace flutter
 
diff --git a/shell/platform/darwin/common/buffer_conversions.mm b/shell/platform/darwin/common/buffer_conversions.mm
@@ -6,20 +6,21 @@
 
 namespace flutter {
 
-std::vector<uint8_t> GetVectorFromNSData(NSData* data) {
-  const uint8_t* bytes = reinterpret_cast<const uint8_t*>(data.bytes);
-  return std::vector<uint8_t>(bytes, bytes + data.length);
+fml::NonOwnedMapping CopyNSDataToMapping(NSData* data) {
+  const uint8_t* bytes = static_cast<const uint8_t*>(data.bytes);
+  return fml::NonOwnedMapping::Copy(bytes, bytes + data.length);
 }
 
-NSData* GetNSDataFromVector(const std::vector<uint8_t>& buffer) {
-  return [NSData dataWithBytes:buffer.data() length:buffer.size()];
+NSData* CopyMappingToNSData(fml::NonOwnedMapping buffer) {
+  return [NSData dataWithBytes:const_cast<uint8_t*>(buffer.GetMapping()) length:buffer.GetSize()];
 }
 
-std::unique_ptr<fml::Mapping> GetMappingFromNSData(NSData* data) {
-  return std::make_unique<fml::DataMapping>(GetVectorFromNSData(data));
+std::unique_ptr<fml::Mapping> CopyNSDataToMappingPtr(NSData* data) {
+  auto mapping = CopyNSDataToMapping(data);
+  return std::make_unique<fml::NonOwnedMapping>(std::move(mapping));
 }
 
-NSData* GetNSDataFromMapping(std::unique_ptr<fml::Mapping> mapping) {
+NSData* CopyMappingPtrToNSData(std::unique_ptr<fml::Mapping> mapping) {
   return [NSData dataWithBytes:mapping->GetMapping() length:mapping->GetSize()];
 }
 
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
@@ -807,7 +807,7 @@ - (void)sendOnChannel:(NSString*)channel
   std::unique_ptr<flutter::PlatformMessage> platformMessage =
       (message == nil) ? std::make_unique<flutter::PlatformMessage>(channel.UTF8String, response)
                        : std::make_unique<flutter::PlatformMessage>(
-                             channel.UTF8String, flutter::GetVectorFromNSData(message), response);
+                             channel.UTF8String, flutter::CopyNSDataToMapping(message), response);
 
   _shell->GetPlatformView()->DispatchPlatformMessage(std::move(platformMessage));
 }
diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm
@@ -309,8 +309,9 @@ - (BOOL)onCustomAccessibilityAction:(FlutterCustomAccessibilityAction*)action {
   args.push_back(action_id >> 8);
   args.push_back(action_id >> 16);
   args.push_back(action_id >> 24);
-  [self bridge]->DispatchSemanticsAction([self uid], flutter::SemanticsAction::kCustomAction,
-                                         std::move(args));
+  [self bridge]->DispatchSemanticsAction(
+      [self uid], flutter::SemanticsAction::kCustomAction,
+      fml::NonOwnedMapping::Copy(args.data(), args.data() + args.size() * sizeof(uint8_t)));
   return YES;
 }
 
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
@@ -60,7 +60,7 @@ class AccessibilityBridge final : public AccessibilityBridgeIos {
   void DispatchSemanticsAction(int32_t id, flutter::SemanticsAction action) override;
   void DispatchSemanticsAction(int32_t id,
                                flutter::SemanticsAction action,
-                               std::vector<uint8_t> args) override;
+                               fml::NonOwnedMapping args) override;
   void AccessibilityObjectDidBecomeFocused(int32_t id) override;
   void AccessibilityObjectDidLoseFocus(int32_t id) override;
 
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
@@ -250,7 +250,7 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
 
 void AccessibilityBridge::DispatchSemanticsAction(int32_t uid,
                                                   flutter::SemanticsAction action,
-                                                  std::vector<uint8_t> args) {
+                                                  fml::NonOwnedMapping args) {
   platform_view_->DispatchSemanticsAction(uid, action, std::move(args));
 }
 
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <vector>
 
+#import "flutter/fml/mapping.h"
 #include "flutter/lib/ui/semantics/semantics_node.h"
 
 @class UIView;
@@ -24,7 +25,7 @@ class AccessibilityBridgeIos {
   virtual void DispatchSemanticsAction(int32_t id, flutter::SemanticsAction action) = 0;
   virtual void DispatchSemanticsAction(int32_t id,
                                        flutter::SemanticsAction action,
-                                       std::vector<uint8_t> args) = 0;
+                                       fml::NonOwnedMapping args) = 0;
   /**
    * A callback that is called when a SemanticObject receives focus.
    *
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm
@@ -17,7 +17,7 @@
 void PlatformMessageResponseDarwin::Complete(std::unique_ptr<fml::Mapping> data) {
   fml::RefPtr<PlatformMessageResponseDarwin> self(this);
   platform_task_runner_->PostTask(fml::MakeCopyable([self, data = std::move(data)]() mutable {
-    self->callback_.get()(GetNSDataFromMapping(std::move(data)));
+    self->callback_.get()(CopyMappingPtrToNSData(std::move(data)));
   }));
 }
 
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_router.mm b/shell/platform/darwin/ios/framework/Source/platform_message_router.mm
@@ -22,12 +22,12 @@
     FlutterBinaryMessageHandler handler = it->second;
     NSData* data = nil;
     if (message->hasData()) {
-      data = GetNSDataFromVector(message->data());
+      data = CopyMappingToNSData(message->releaseData());
     }
     handler(data, ^(NSData* reply) {
       if (completer) {
         if (reply) {
-          completer->Complete(GetMappingFromNSData(reply));
+          completer->Complete(CopyNSDataToMappingPtr(reply));
         } else {
           completer->CompleteEmpty();
         }
diff --git a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.h b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.h
@@ -30,7 +30,7 @@ class AccessibilityBridgeMacDelegate : public AccessibilityBridge::Accessibility
   // |AccessibilityBridge::AccessibilityBridgeDelegate|
   void DispatchAccessibilityAction(AccessibilityNodeId target,
                                    FlutterSemanticsAction action,
-                                   const std::vector<uint8_t>& data) override;
+                                   fml::NonOwnedMapping data) override;
 
   // |AccessibilityBridge::AccessibilityBridgeDelegate|
   std::unique_ptr<FlutterPlatformNodeDelegate> CreateFlutterPlatformNodeDelegate() override;
diff --git a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.mm b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.mm
@@ -339,12 +339,12 @@
 
 void AccessibilityBridgeMacDelegate::DispatchAccessibilityAction(ui::AXNode::AXID target,
                                                                  FlutterSemanticsAction action,
-                                                                 const std::vector<uint8_t>& data) {
+                                                                 fml::NonOwnedMapping data) {
   NSCAssert(flutter_engine_, @"Flutter engine should not be deallocated");
   NSCAssert(flutter_engine_.viewController.viewLoaded && flutter_engine_.viewController.view.window,
             @"The accessibility bridge should not receive accessibility actions if the flutter view"
             @"is not loaded or attached to a NSWindow.");
-  [flutter_engine_ dispatchSemanticsAction:action toTarget:target withData:data];
+  [flutter_engine_ dispatchSemanticsAction:action toTarget:target withData:std::move(data)];
 }
 
 std::unique_ptr<FlutterPlatformNodeDelegate>
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
@@ -465,8 +465,8 @@ - (void)setSemanticsEnabled:(BOOL)enabled {
 
 - (void)dispatchSemanticsAction:(FlutterSemanticsAction)action
                        toTarget:(uint16_t)target
-                       withData:(const std::vector<uint8_t>&)data {
-  _embedderAPI.DispatchSemanticsAction(_engine, target, action, data.data(), data.size());
+                       withData:(fml::NonOwnedMapping)data {
+  _embedderAPI.DispatchSemanticsAction(_engine, target, action, data.GetMapping(), data.GetSize());
 }
 
 #pragma mark - Private methods
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h b/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h
@@ -77,6 +77,6 @@
  */
 - (void)dispatchSemanticsAction:(FlutterSemanticsAction)action
                        toTarget:(uint16_t)target
-                       withData:(const std::vector<uint8_t>&)data;
+                       withData:(fml::NonOwnedMapping)data;
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ class PlatformMessage {`
`31`	`31`	`return response_;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ fml::NonOwnedMapping releaseData() { return std::move(data_); }`
	`35`	`+`
`34`	`36`	`private:`
`35`	`37`	`std::string channel_;`
`36`	`38`	`fml::NonOwnedMapping data_;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void TestAccessibilityBridgeDelegate::OnAccessibilityEvent(`
`19`	`19`	`void TestAccessibilityBridgeDelegate::DispatchAccessibilityAction(`
`20`	`20`	`AccessibilityNodeId target,`
`21`	`21`	`FlutterSemanticsAction action,`
`22`		`- const std::vector<uint8_t>& data) {`
	`22`	`+ fml::NonOwnedMapping data) {`
`23`	`23`	`performed_actions.push_back(action);`
`24`	`24`	`}`
`25`	`25`