Apply reviews

Author: zhongwuzw

shell/platform/darwin/common/BUILD.gn

@@ -36,14 +36,17 @@ source_set("framework_shared") {
   sources = [
     "framework/Source/FlutterChannels.mm",
     "framework/Source/FlutterCodecs.mm",
-    "framework/Source/FlutterDartProjectHelper.mm",
+    "framework/Source/FlutterNSBundleUtils.h",
+    "framework/Source/FlutterNSBundleUtils.mm",
     "framework/Source/FlutterStandardCodec.mm",
     "framework/Source/FlutterStandardCodecHelper.cc",
     "framework/Source/FlutterStandardCodec_Internal.h",
   ]
 
   public = framework_shared_headers
 
+  public += [ "framework/Source/FlutterNSBundleUtils.h" ]
+
   defines = [ "FLUTTER_FRAMEWORK" ]
 
   public_configs = [

shell/platform/darwin/common/framework/Headers/FlutterDartProject.h

@@ -15,7 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * A set of Flutter and Dart assets used by a `FlutterEngine` to initialize execution.
  *
- * TODO(stuartmorgan): Align API with FlutterDartProject, and combine.
  */
 FLUTTER_DARWIN_EXPORT
 @interface FlutterDartProject : NSObject
@@ -40,7 +39,7 @@ FLUTTER_DARWIN_EXPORT
  * Returns the default identifier for the bundle where we expect to find the Flutter Dart
  * application.
  */
-+ (NSString*)defaultBundleIdentifier API_UNAVAILABLE(macos);
++ (NSString*)defaultBundleIdentifier;
 
 /**
  * An NSArray of NSStrings to be passed as command line arguments to the Dart entrypoint.

shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h

@@ -0,0 +1,35 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERNSBUNDLEUTILS_H_
+#define SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERNSBUNDLEUTILS_H_
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Finds a bundle with the named `bundleID` within `searchURL`.
+//
+// Returns `nil` if the bundle cannot be found or if errors are encountered.
+NSBundle* FLTFrameworkBundleInternal(NSString* bundleID, NSURL* searchURL);
+
+// Finds a bundle with the named `bundleID`.
+//
+// `+[NSBundle bundleWithIdentifier:]` is slow, and can take in the order of
+// tens of milliseconds in a minimal flutter app, and closer to 100 milliseconds
+// in a medium sized Flutter app on an iPhone 13. It is likely that the slowness
+// comes from having to traverse and load all bundles known to the process.
+// Using `+[NSBundle allframeworks]` and filtering also suffers from the same
+// problem.
+//
+// This implementation is an optimization to first limit the search space to
+// `+[NSBundle privateFrameworksURL]` of the main bundle, which is usually where
+// frameworks used by this file are placed. If the desired bundle cannot be
+// found here, the implementation falls back to
+// `+[NSBundle bundleWithIdentifier:]`.
+NSBundle* FLTFrameworkBundleWithIdentifier(NSString* bundleID);
+
+NS_ASSUME_NONNULL_END
+
+#endif  // SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERNSBUNDLEUTILS_H_

…ework/Source/FlutterDartProjectHelper.mm …framework/Source/FlutterNSBundleUtils.mmshell/platform/darwin/common/framework/Source/FlutterDartProjectHelper.mm renamed to shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm shell/platform/darwin/common/framework/Source/FlutterDartProjectHelper.mm renamed to shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm

@@ -4,9 +4,6 @@
 
 #include <Foundation/Foundation.h>
 
-// Finds a bundle with the named `bundleID` within `searchURL`.
-//
-// Returns `nil` if the bundle cannot be found or if errors are encountered.
 NSBundle* FLTFrameworkBundleInternal(NSString* bundleID, NSURL* searchURL) {
   NSDirectoryEnumerator<NSURL*>* frameworkEnumerator = [NSFileManager.defaultManager
                  enumeratorAtURL:searchURL
@@ -25,20 +22,6 @@
   return nil;
 }
 
-// Finds a bundle with the named `bundleID`.
-//
-// `+[NSBundle bundleWithIdentifier:]` is slow, and can take in the order of
-// tens of milliseconds in a minimal flutter app, and closer to 100 milliseconds
-// in a medium sized Flutter app on an iPhone 13. It is likely that the slowness
-// comes from having to traverse and load all bundles known to the process.
-// Using `+[NSBundle allframeworks]` and filtering also suffers from the same
-// problem.
-//
-// This implementation is an optimization to first limit the search space to
-// `+[NSBundle privateFrameworksURL]` of the main bundle, which is usually where
-// frameworks used by this file are placed. If the desired bundle cannot be
-// found here, the implementation falls back to
-// `+[NSBundle bundleWithIdentifier:]`.
 NSBundle* FLTFrameworkBundleWithIdentifier(NSString* bundleID) {
   NSBundle* bundle = FLTFrameworkBundleInternal(bundleID, NSBundle.mainBundle.privateFrameworksURL);
   if (bundle != nil) {

shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h

@@ -9,12 +9,10 @@
 #include "flutter/runtime/platform_data.h"
 #include "flutter/shell/common/engine.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSBundle* FLTFrameworkBundleInternal(NSString* bundleID, NSURL* searchURL);
-NSBundle* FLTFrameworkBundleWithIdentifier(NSString* bundleID);
-
 flutter::Settings FLTDefaultSettingsForBundle(NSBundle* _Nullable bundle = nil,
                                               NSProcessInfo* _Nullable processInfoOrNil = nil);
 

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

@@ -124,4 +124,8 @@ + (NSString*)lookupKeyForAsset:(NSString*)asset
                       fromBundle:bundle];
 }
 
++ (NSString*)defaultBundleIdentifier {
+  return kAppBundleIdentifier;
+}
+
 @end

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

@@ -6,12 +6,11 @@
 #define SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h"
 
 #include <string>
 #include <vector>
 
-NSBundle* _Nullable FLTFrameworkBundleWithIdentifier(NSString* _Nonnull bundleID);
-
 /**
  * Provides access to data needed to construct a FlutterProjectArgs for the project.
  */

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

@@ -67,6 +67,7 @@ - (bool)testModifierKeysAreSynthesizedOnMouseMove;
 - (bool)testViewWillAppearCalledMultipleTimes;
 - (bool)testFlutterViewIsConfigured;
 - (bool)testLookupKeyAssets;
+- (bool)testLookupKeyAssetsWithPackage;
 
 + (void)respondFalseForSendEvent:(const FlutterKeyEvent&)event
                         callback:(nullable FlutterKeyEventCallback)callback
@@ -241,6 +242,10 @@ id MockGestureEvent(NSEventType type, NSEventPhase phase, double magnification,
   ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testLookupKeyAssets]);
 }
 
+TEST(FlutterViewControllerTest, testLookupKeyAssetsWithPackage) {
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testLookupKeyAssetsWithPackage]);
+}
+
 }  // namespace flutter::testing
 
 #pragma mark - FlutterViewControllerTestObjC
@@ -842,9 +847,13 @@ - (bool)testLookupKeyAssets {
   NSString* key = [viewController lookupKeyForAsset:@"test.png"];
   EXPECT_TRUE(
       [key isEqualToString:@"Contents/Frameworks/App.framework/Resources/flutter_assets/test.png"]);
+  return true;
+}
+
+- (bool)testLookupKeyAssetsWithPackage {
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:nil];
 
   NSString* packageKey = [viewController lookupKeyForAsset:@"test.png" fromPackage:@"test"];
-  NSLog(@"%@", packageKey);
   EXPECT_TRUE([packageKey
       isEqualToString:
           @"Contents/Frameworks/App.framework/Resources/flutter_assets/packages/test/test.png"]);