[macOS] Change view ID to signed

shell/platform/darwin/macos/framework/Headers/FlutterEngine.h

@@ -26,7 +26,7 @@
  * backward compatibility, single-view APIs will always operate on the view with
  * this ID. Also, the first view assigned to the engine will also have this ID.
  */
-extern const uint64_t kFlutterDefaultViewId;
+extern const int64_t kFlutterDefaultViewId;
 
 @class FlutterViewController;
 

shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h

@@ -47,7 +47,7 @@ FLUTTER_DARWIN_EXPORT
 /**
  * The `NSView` associated with the given view ID, if any.
  */
-- (nullable NSView*)viewForId:(uint64_t)viewId;
+- (nullable NSView*)viewForId:(int64_t)viewId;
 
 /**
  * Registers |delegate| to receive handleMethodCall:result: callbacks for the given |channel|.

shell/platform/darwin/macos/framework/Headers/FlutterViewController.h

@@ -61,7 +61,7 @@ FLUTTER_DARWIN_EXPORT
  * If the view controller is unattached (see FlutterViewController#attached),
  * reading this property throws an assertion.
  */
-@property(nonatomic, readonly) uint64_t id;
+@property(nonatomic, readonly) int64_t id;
 
 /**
  * The style of mouse tracking to use for the view. Defaults to

shell/platform/darwin/macos/framework/Source/FlutterCompositor.h

@@ -49,7 +49,7 @@ class FlutterCompositor {
 
   // Presents the FlutterLayers by updating the FlutterView specified by
   // `view_id` using the layer content. Sets frame_started_ to false.
-  bool Present(uint64_t view_id, const FlutterLayer** layers, size_t layers_count);
+  bool Present(int64_t view_id, const FlutterLayer** layers, size_t layers_count);
 
  private:
   void PresentPlatformViews(FlutterView* default_base_view,

shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm

@@ -37,9 +37,7 @@
   return true;
 }
 
-bool FlutterCompositor::Present(uint64_t view_id,
-                                const FlutterLayer** layers,
-                                size_t layers_count) {
+bool FlutterCompositor::Present(int64_t view_id, const FlutterLayer** layers, size_t layers_count) {
   FlutterView* view = [view_provider_ viewForId:view_id];
   if (!view) {
     return false;

shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm

@@ -11,7 +11,7 @@
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h"
 #import "flutter/testing/testing.h"
 
-extern const uint64_t kFlutterDefaultViewId;
+extern const int64_t kFlutterDefaultViewId;
 
 @interface FlutterViewMockProvider : NSObject <FlutterViewProvider> {
   FlutterView* _defaultView;
@@ -32,7 +32,7 @@ - (nonnull instancetype)initWithDefaultView:(nonnull FlutterView*)view {
   return self;
 }
 
-- (nullable FlutterView*)viewForId:(uint64_t)viewId {
+- (nullable FlutterView*)viewForId:(int64_t)viewId {
   if (viewId == kFlutterDefaultViewId) {
     return _defaultView;
   }

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

@@ -20,7 +20,7 @@
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 
-const uint64_t kFlutterDefaultViewId = 0;
+const int64_t kFlutterDefaultViewId = 0;
 
 /**
  * Constructs and returns a FlutterLocale struct corresponding to |locale|, which must outlive
@@ -83,15 +83,15 @@ @interface FlutterEngine () <FlutterBinaryMessenger>
  */
 @property(nonatomic, strong) NSMutableArray<NSNumber*>* isResponseValid;
 
-- (nullable FlutterViewController*)viewControllerForId:(uint64_t)viewId;
+- (nullable FlutterViewController*)viewControllerForId:(int64_t)viewId;
 
 /**
  * An internal method that adds the view controller with the given ID.
  *
  * This method assigns the controller with the ID, puts the controller into the
  * map, and does assertions related to the default view ID.
  */
-- (void)registerViewController:(FlutterViewController*)controller forId:(uint64_t)viewId;
+- (void)registerViewController:(FlutterViewController*)controller forId:(int64_t)viewId;
 
 /**
  * An internal method that removes the view controller with the given ID.
@@ -100,7 +100,7 @@ - (void)registerViewController:(FlutterViewController*)controller forId:(uint64_
  * map. This is an no-op if the view ID is not associated with any view
  * controllers.
  */
-- (void)deregisterViewControllerForId:(uint64_t)viewId;
+- (void)deregisterViewControllerForId:(int64_t)viewId;
 
 /**
  * Shuts down the engine if view requirement is not met, and headless execution
@@ -190,7 +190,7 @@ - (NSView*)view {
   return [self viewForId:kFlutterDefaultViewId];
 }
 
-- (NSView*)viewForId:(uint64_t)viewId {
+- (NSView*)viewForId:(int64_t)viewId {
   FlutterViewController* controller = [_flutterEngine viewControllerForId:viewId];
   if (controller == nil) {
     return nil;
@@ -463,7 +463,7 @@ - (void)loadAOTData:(NSString*)assetsDir {
   }
 }
 
-- (void)registerViewController:(FlutterViewController*)controller forId:(uint64_t)viewId {
+- (void)registerViewController:(FlutterViewController*)controller forId:(int64_t)viewId {
   NSAssert(controller != nil, @"The controller must not be nil.");
   NSAssert(![controller attached],
            @"The incoming view controller is already attached to an engine.");
@@ -473,7 +473,7 @@ - (void)registerViewController:(FlutterViewController*)controller forId:(uint64_
   [_viewControllers setObject:controller forKey:@(viewId)];
 }
 
-- (void)deregisterViewControllerForId:(uint64_t)viewId {
+- (void)deregisterViewControllerForId:(int64_t)viewId {
   FlutterViewController* oldController = [self viewControllerForId:viewId];
   if (oldController != nil) {
     [oldController detachFromEngine];
@@ -487,7 +487,7 @@ - (void)shutDownIfNeeded {
   }
 }
 
-- (FlutterViewController*)viewControllerForId:(uint64_t)viewId {
+- (FlutterViewController*)viewControllerForId:(int64_t)viewId {
   FlutterViewController* controller = [_viewControllers objectForKey:@(viewId)];
   NSAssert(controller == nil || controller.id == viewId,
            @"The stored controller has unexpected view ID.");

shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm

@@ -644,7 +644,7 @@ - (nonnull NSView*)createWithViewIdentifier:(int64_t)viewId arguments:(nullable
   @autoreleasepool {
     // Create FVC1.
     viewController1 = [[FlutterViewController alloc] initWithProject:project];
-    EXPECT_EQ(viewController1.id, 0ull);
+    EXPECT_EQ(viewController1.id, 0ll);
 
     engine = viewController1.engine;
     engine.viewController = nil;
@@ -661,7 +661,7 @@ - (nonnull NSView*)createWithViewIdentifier:(int64_t)viewId arguments:(nullable
 
   engine.viewController = viewController1;
   EXPECT_EQ(engine.viewController, viewController1);
-  EXPECT_EQ(viewController1.id, 0ull);
+  EXPECT_EQ(viewController1.id, 0ll);
 }
 
 TEST_F(FlutterEngineTest, ManageControllersIfInitiatedByEngine) {
@@ -675,15 +675,15 @@ - (nonnull NSView*)createWithViewIdentifier:(int64_t)viewId arguments:(nullable
 
   @autoreleasepool {
     viewController1 = [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
-    EXPECT_EQ(viewController1.id, 0ull);
+    EXPECT_EQ(viewController1.id, 0ll);
     EXPECT_EQ(engine.viewController, viewController1);
 
     engine.viewController = nil;
 
     FlutterViewController* viewController2 = [[FlutterViewController alloc] initWithEngine:engine
                                                                                    nibName:nil
                                                                                     bundle:nil];
-    EXPECT_EQ(viewController2.id, 0ull);
+    EXPECT_EQ(viewController2.id, 0ll);
     EXPECT_EQ(engine.viewController, viewController2);
   }
   // FVC2 is deallocated but FVC1 is retained.
@@ -692,7 +692,7 @@ - (nonnull NSView*)createWithViewIdentifier:(int64_t)viewId arguments:(nullable
 
   engine.viewController = viewController1;
   EXPECT_EQ(engine.viewController, viewController1);
-  EXPECT_EQ(viewController1.id, 0ull);
+  EXPECT_EQ(viewController1.id, 0ll);
 }
 
 }  // namespace flutter::testing

shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h

@@ -80,7 +80,7 @@
 /**
  * The `FlutterViewController` associated with the given view ID, if any.
  */
-- (nullable FlutterViewController*)viewControllerForId:(uint64_t)viewId;
+- (nullable FlutterViewController*)viewControllerForId:(int64_t)viewId;
 
 /**
  * Informs the engine that the specified view controller's window metrics have changed.

shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm

@@ -192,7 +192,7 @@
 
   // Set up embedder API mock.
   FlutterSemanticsAction called_action;
-  uint64_t called_id;
+  int64_t called_id;
 
   engine.embedderAPI.DispatchSemanticsAction = MOCK_ENGINE_PROC(
       DispatchSemanticsAction,

shell/platform/darwin/macos/framework/Source/FlutterRenderer.h

@@ -38,12 +38,12 @@
 /**
  * Called by the engine when the given view's buffers should be swapped.
  */
-- (BOOL)present:(uint64_t)viewId texture:(nonnull const FlutterMetalTexture*)texture;
+- (BOOL)present:(int64_t)viewId texture:(nonnull const FlutterMetalTexture*)texture;
 
 /**
  * Creates a Metal texture for the given view with the given size.
  */
-- (FlutterMetalTexture)createTextureForView:(uint64_t)viewId size:(CGSize)size;
+- (FlutterMetalTexture)createTextureForView:(int64_t)viewId size:(CGSize)size;
 
 /**
  * Populates the texture registry with the provided metalTexture.

shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm

@@ -17,7 +17,7 @@ static FlutterMetalTexture OnGetNextDrawableForDefaultView(FlutterEngine* engine
   // TODO(dkwingsmt): This callback only supports single-view, therefore it only
   // operates on the default view. To support multi-view, we need a new callback
   // that also receives a view ID, or pass the ID via FlutterFrameInfo.
-  uint64_t viewId = kFlutterDefaultViewId;
+  int64_t viewId = kFlutterDefaultViewId;
   CGSize size = CGSizeMake(frameInfo->size.width, frameInfo->size.height);
   return [engine.renderer createTextureForView:viewId size:size];
 }
@@ -27,7 +27,7 @@ static bool OnPresentDrawableOfDefaultView(FlutterEngine* engine,
   // TODO(dkwingsmt): This callback only supports single-view, therefore it only
   // operates on the default view. To support multi-view, we need a new callback
   // that also receives a view ID.
-  uint64_t viewId = kFlutterDefaultViewId;
+  int64_t viewId = kFlutterDefaultViewId;
   return [engine.renderer present:viewId texture:texture];
 }
 
@@ -88,7 +88,7 @@ - (FlutterRendererConfig)createRendererConfig {
 
 #pragma mark - Embedder callback implementations.
 
-- (FlutterMetalTexture)createTextureForView:(uint64_t)viewId size:(CGSize)size {
+- (FlutterMetalTexture)createTextureForView:(int64_t)viewId size:(CGSize)size {
   FlutterView* view = [_viewProvider viewForId:viewId];
   NSAssert(view != nil, @"Can't create texture on a non-existent view 0x%llx.", viewId);
   if (view == nil) {
@@ -98,7 +98,7 @@ - (FlutterMetalTexture)createTextureForView:(uint64_t)viewId size:(CGSize)size {
   return [view.surfaceManager surfaceForSize:size].asFlutterMetalTexture;
 }
 
-- (BOOL)present:(uint64_t)viewId texture:(const FlutterMetalTexture*)texture {
+- (BOOL)present:(int64_t)viewId texture:(const FlutterMetalTexture*)texture {
   FlutterView* view = [_viewProvider viewForId:viewId];
   if (view == nil) {
     return NO;

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

@@ -289,7 +289,7 @@ @implementation FlutterViewController {
 
   std::shared_ptr<flutter::AccessibilityBridgeMac> _bridge;
 
-  uint64_t _id;
+  int64_t _id;
 }
 
 @dynamic id;
@@ -430,7 +430,7 @@ - (void)setBackgroundColor:(NSColor*)color {
   [_flutterView setBackgroundColor:_backgroundColor];
 }
 
-- (uint64_t)id {
+- (int64_t)id {
   NSAssert([self attached], @"This view controller is not attched.");
   return _id;
 }
@@ -459,7 +459,7 @@ - (void)notifySemanticsEnabledChanged {
   return _bridge;
 }
 
-- (void)attachToEngine:(nonnull FlutterEngine*)engine withId:(uint64_t)viewId {
+- (void)attachToEngine:(nonnull FlutterEngine*)engine withId:(int64_t)viewId {
   NSAssert(_engine == nil, @"Already attached to an engine %@.", _engine);
   _engine = engine;
   _id = viewId;

shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h

@@ -33,7 +33,7 @@
  *
  * This method is called by FlutterEngine.
  */
-- (void)attachToEngine:(nonnull FlutterEngine*)engine withId:(uint64_t)viewId;
+- (void)attachToEngine:(nonnull FlutterEngine*)engine withId:(int64_t)viewId;
 
 /**
  * Reset the `engine` and `id` of this controller.

shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm

@@ -22,7 +22,7 @@ - (instancetype)initWithEngine:(FlutterEngine*)engine {
   return self;
 }
 
-- (nullable FlutterView*)viewForId:(uint64_t)viewId {
+- (nullable FlutterView*)viewForId:(int64_t)viewId {
   return [_engine viewControllerForId:viewId].flutterView;
 }
 

shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm

@@ -25,7 +25,7 @@
   OCMStub([mockEngine viewControllerForId:0])
       .ignoringNonObjectArgs()
       .andDo(^(NSInvocation* invocation) {
-        uint64_t viewId;
+        int64_t viewId;
         [invocation getArgument:&viewId atIndex:2];
         if (viewId == 0 /* kFlutterDefaultViewId */) {
           if (mockFlutterViewController != nil) {

shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h

@@ -4,7 +4,7 @@
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
 
-extern const uint64_t kFlutterDefaultViewId;
+extern const int64_t kFlutterDefaultViewId;
 
 /**
  * An interface to query FlutterView.
@@ -20,6 +20,6 @@ extern const uint64_t kFlutterDefaultViewId;
  *
  * Returns nil if the ID is invalid.
  */
-- (nullable FlutterView*)viewForId:(uint64_t)id;
+- (nullable FlutterView*)viewForId:(int64_t)id;
 
 @end