comments

Author: chunhtai

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

@@ -64,7 +64,7 @@ class AccessibilityBridgeMacDelegate : public AccessibilityBridge::Accessibility
 
   //---------------------------------------------------------------------------
   /// @brief      Whether the given event is in current pending events.
-  /// @param[in]  event_type        The event you would like to look up.
+  /// @param[in]  event_type        The event to look up.
   bool HasPendingEvent(ui::AXEventGenerator::Event event) const;
 
   //---------------------------------------------------------------------------

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

@@ -15,7 +15,6 @@
 inline constexpr int32_t kRootNode = 0;
 
 // Native mac notifications fired. These notifications are not publicly documented.
-// We have to define them ourselves.
 static NSString* const AccessibilityLoadCompleteNotification = @"AXLoadComplete";
 static NSString* const AccessibilityInvalidStatusChangedNotification = @"AXInvalidStatusChanged";
 static NSString* const AccessibilityLiveRegionCreatedNotification = @"AXLiveRegionCreated";
@@ -29,7 +28,7 @@
 void AccessibilityBridgeMacDelegate::OnAccessibilityEvent(
     ui::AXEventGenerator::TargetedEvent targeted_event) {
   if (!flutter_engine_.viewController.viewLoaded || !flutter_engine_.viewController.view.window) {
-    // We don't need to send accessibility events if the there is no view or window.
+    // Don't need to send accessibility events if the there is no view or window.
     return;
   }
   ui::AXNode* ax_node = targeted_event.node;
@@ -67,16 +66,16 @@
             .user_info = nil,
         });
       } else if (ax_node.data().role == ax::mojom::Role::kTextFieldWithComboBox) {
-        // Even though the selected item in the combo box has changed, we don't
-        // want to post a focus change because this will take the focus out of
+        // Even though the selected item in the combo box has changed, don't
+        // post a focus change because this will take the focus out of
         // the combo box where the user might be typing.
         events.push_back({
             .name = NSAccessibilitySelectedChildrenChangedNotification,
             .target = native_node,
             .user_info = nil,
         });
       }
-      // In all other cases we should post
+      // In all other cases this delegate should post
       // |NSAccessibilityFocusedUIElementChangedNotification|, but this is
       // handled elsewhere.
       break;
@@ -125,7 +124,7 @@
       id focused = mac_platform_node_delegate->GetFocus();
       if ([focused isKindOfClass:[FlutterTextField class]]) {
         // If it is a text field, the selection notifications are handled by
-        // the FlutterTextField directly. We only need to make sure it is the
+        // the FlutterTextField directly. Only need to make sure it is the
         // first responder.
         FlutterTextField* native_text_field = (FlutterTextField*)focused;
         if (native_text_field == mac_platform_node_delegate->GetFocus()) {
@@ -167,7 +166,7 @@
     case ui::AXEventGenerator::Event::VALUE_CHANGED: {
       if (ax_node.data().role == ax::mojom::Role::kTextField) {
         // If it is a text field, the value change notifications are handled by
-        // the FlutterTextField directly. We only need to make sure it is the
+        // the FlutterTextField directly. Only need to make sure it is the
         // first responder.
         FlutterTextField* native_text_field =
             (FlutterTextField*)mac_platform_node_delegate->GetNativeViewAccessible();

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

@@ -25,8 +25,8 @@ class FlutterCompositor {
   // Creates a BackingStore and saves updates the backing_store_out
   // data with the new BackingStore data.
   // If the backing store is being requested for the first time
-  // for a given frame, we do not create a new backing store but
-  // rather return the backing store associated with the
+  // for a given frame, this compositor does not create a new backing
+  // store but rather return the backing store associated with the
   // FlutterView's FlutterSurfaceManager.
   //
   // Any additional state allocated for the backing store and

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

@@ -198,10 +198,10 @@ static NSUInteger computeModifierFlagOfInterestMask() {
     // which is used for the "Apple logo" character (Option-Shift-K on a US
     // keyboard.)
     //
-    // We hereby assume that non-printable function keys are defined from
+    // Assume that non-printable function keys are defined from
     // 0xF700 upwards, and printable private keys are defined from 0xF8FF
-    // downwards. We want to keep the printable private keys, therefore we only
-    // filter out 0xF700-0xF7FF.
+    // downwards. This function filters out 0xF700-0xF7FF in order to keep
+    // the printable private keys.
     return nullptr;
   }
   return [characters UTF8String];
@@ -215,8 +215,8 @@ static NSUInteger computeModifierFlagOfInterestMask() {
  * The embedder functions only accept C-functions as callbacks, as well as an
  * arbitrary user_data. In order to send an instance method of
  * |FlutterEmbedderKeyResponder.handleResponse| to the engine's |SendKeyEvent|,
- * we wrap the invocation into a C-function |HandleResponse| and invocation
- * context |FlutterKeyPendingResponse|.
+ * the embedder wraps the invocation into a C-function |HandleResponse| and
+ * invocation context |FlutterKeyPendingResponse|.
  *
  * When this object is sent to the engine's |SendKeyEvent| as |user_data|, it
  * must be attached with |__bridge_retained|. When this object is parsed
@@ -544,7 +544,8 @@ - (void)sendCapsLockTapWithTimestamp:(NSTimeInterval)timestamp
   // MacOS sends a down *or* an up when CapsLock is tapped, alternatively on
   // even taps and odd taps. A CapsLock down or CapsLock up should always be
   // converted to a down *and* an up, and the up should always be a synthesized
-  // event, since we will never know when the button is released.
+  // event, since the FlutterEmbedderKeyResponder will never know when the
+  // button is released.
   FlutterKeyEvent flutterEvent = {
       .struct_size = sizeof(FlutterKeyEvent),
       .timestamp = GetFlutterTimestampFrom(timestamp),

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

@@ -97,7 +97,7 @@ - (instancetype)initWithPlugin:(NSString*)pluginKey flutterEngine:(FlutterEngine
 
 - (NSView*)view {
   if (!_flutterEngine.viewController.viewLoaded) {
-    return nil;
+    [_flutterEngine.viewController loadView];
   }
   return _flutterEngine.viewController.flutterView;
 }
@@ -454,8 +454,7 @@ - (void)setSemanticsEnabled:(BOOL)enabled {
     return;
   }
   _semanticsEnabled = enabled;
-  // We need to remove the accessibility children from flutter view
-  // before we reset the bridge.
+  // Remove the accessibility children from flutter view before reseting the bridge.
   if (!_semanticsEnabled && self.viewController.viewLoaded) {
     self.viewController.flutterView.accessibilityChildren = nil;
   }

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

@@ -27,8 +27,8 @@ class FlutterGLCompositor : public FlutterCompositor {
   // Creates a BackingStore and saves updates the backing_store_out
   // data with the new BackingStore data.
   // If the backing store is being requested for the first time
-  // for a given frame, we do not create a new backing store but
-  // rather return the backing store associated with the
+  // for a given frame, this compositor does not create a new backing
+  // store but rather return the backing store associated with the
   // FlutterView's FlutterSurfaceManager.
   //
   // Any additional state allocated for the backing store and

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

@@ -46,7 +46,7 @@ - (void)addSecondaryResponder:(nonnull id<FlutterKeySecondaryResponder>)responde
 }
 
 - (void)handleEvent:(nonnull NSEvent*)event {
-  // Be sure to add a handling method in propagateKeyEvent if you allow more
+  // Be sure to add a handling method in propagateKeyEvent when allowing more
   // event types here.
   if (event.type != NSEventTypeKeyDown && event.type != NSEventTypeKeyUp &&
       event.type != NSEventTypeFlagsChanged) {

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

@@ -21,8 +21,8 @@ class FlutterMetalCompositor : public FlutterCompositor {
   // backing store.
   //
   // If the backing store is being requested for the first time
-  // for a given frame, we do not create a new backing store but
-  // rather return the backing store associated with the
+  // for a given frame, this compositor does not create a new backing
+  // store but rather return the backing store associated with the
   // FlutterView's FlutterSurfaceManager.
   //
   // Any additional state allocated for the backing store and

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

@@ -99,8 +99,8 @@
       NSMakeRect(local_bounds.x(), local_bounds.y(), local_bounds.width(), local_bounds.height());
   // The macOS XY coordinates start at bottom-left and increase toward top-right,
   // which is different from the Flutter's XY coordinates that start at top-left
-  // increasing to bottom-right. Therefore, We need to flip the y coordinate when
-  // we convert from flutter coordinates to macOS coordinates.
+  // increasing to bottom-right. Therefore, this method needs to flip the y coordinate when
+  // it converts the bounds from flutter coordinates to macOS coordinates.
   ns_local_bounds.origin.y = -ns_local_bounds.origin.y - ns_local_bounds.size.height;
 
   NSCAssert(engine_, @"Flutter engine should not be deallocated");
@@ -119,7 +119,7 @@
 gfx::RectF FlutterPlatformNodeDelegateMac::ConvertBoundsFromScreenToGlobal(
     const gfx::RectF& screen_bounds) const {
   // The VoiceOver seems to only accept bounds that are relative to primary screen.
-  // Thus, we use [[NSScreen screens] firstObject] instead of [NSScreen mainScreen].
+  // Thus, this method uses [[NSScreen screens] firstObject] instead of [NSScreen mainScreen].
   NSScreen* screen = [[NSScreen screens] firstObject];
   NSRect primary_screen_bounds = [screen frame];
   // The screen is flipped against y axis.

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

@@ -280,9 +280,9 @@
   double pixelRatio = view.bounds.size.width == 0 ? 1 : scaledSize.width / view.bounds.size.width;
 
   double expectedFrameSize = rectSize * transformFactor / pixelRatio;
-  EXPECT_EQ(NSEqualRects(native_text_field.frame, NSMakeRect(0, 600 - expectedFrameSize,
-                                                             expectedFrameSize, expectedFrameSize)),
-            YES);
+  EXPECT_EQ(
+      NSEqualRects(native_text_field.frame, NSMakeRect(0, 0, expectedFrameSize, expectedFrameSize)),
+      YES);
   // The text of TextInputPlugin only starts syncing editing state to the
   // native text field when it becomes the first responder.
   [native_text_field becomeFirstResponder];