update

flutter · Nov 18, 2024 · 03a2e16 · 03a2e16
1 parent 4faea5a
commit 03a2e16
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 23 deletions.
diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
@@ -270,6 +270,7 @@
 ../../../flutter/runtime/fixtures
 ../../../flutter/runtime/no_dart_plugin_registrant_unittests.cc
 ../../../flutter/runtime/platform_isolate_manager_unittests.cc
+../../../flutter/runtime/runtime_controller_unittests.cc
 ../../../flutter/runtime/type_conversions_unittests.cc
 ../../../flutter/shell/common/animator_unittests.cc
 ../../../flutter/shell/common/base64_unittests.cc

diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -44622,6 +44622,7 @@ ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_message_handler_ios.
 ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_message_handler_ios_test.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_view_ios_test.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h + ../../../flutter/LICENSE
@@ -47509,6 +47510,7 @@ FILE: ../../../flutter/shell/platform/darwin/ios/platform_message_handler_ios.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/platform_message_handler_ios_test.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.h
 FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios_test.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.h
 FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h

diff --git a/runtime/runtime_controller_unittests.cc b/runtime/runtime_controller_unittests.cc
@@ -97,7 +97,7 @@ class RuntimeControllerTester {
   }
 };
 
-TEST_F(RuntimeControllerTest, CanHandleAttributedStrings) {
+TEST_F(RuntimeControllerTest, CanUpdateSemantics) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
   TaskRunners task_runners("test",                  // label
                            GetCurrentTaskRunner(),  // platform

diff --git a/shell/common/shell.cc b/shell/common/shell.cc
@@ -1333,7 +1333,6 @@ void Shell::OnEngineUpdateSemantics(SemanticsNodeUpdates update,
       [view = platform_view_->GetWeakPtr(), update = std::move(update),
        actions = std::move(actions)] {
         if (view) {
-          FML_LOG(ERROR) << "update semantics received in shell";
           view->UpdateSemantics(update, actions);
         }
       });

diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
@@ -77,7 +77,6 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
 void AccessibilityBridge::UpdateSemantics(
     flutter::SemanticsNodeUpdates nodes,
     const flutter::CustomAccessibilityActionUpdates& actions) {
-  NSLog(@"received semantics update in a11y bridge");
   BOOL layoutChanged = NO;
   BOOL scrollOccured = NO;
   BOOL needsAnnouncement = NO;

diff --git a/shell/platform/darwin/ios/platform_view_ios.h b/shell/platform/darwin/ios/platform_view_ios.h
@@ -24,10 +24,6 @@
 
 namespace flutter {
 
-namespace testing {
-class TestPlatformViewIOS;
-}
-
 /**
  * A bridge connecting the platform agnostic shell and the iOS embedding.
  *
@@ -107,6 +103,9 @@ class PlatformViewIOS : public PlatformView {
     return platform_message_handler_;
   }
 
+  /**
+   * Gets the accessibility bridge created in this platform view.
+   */
   AccessibilityBridge* GetAccessibilityBridge() { return accessibility_bridge_.get(); }
 
   /**

diff --git a/shell/platform/darwin/ios/platform_view_ios.mm b/shell/platform/darwin/ios/platform_view_ios.mm
@@ -203,13 +203,10 @@ new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
                                       flutter::CustomAccessibilityActionUpdates actions) {
   FML_DCHECK(owner_controller_);
   FML_DCHECK(accessibility_bridge_);
-  NSLog(@"platform view received update semantics");
   if (accessibility_bridge_) {
     accessibility_bridge_.get()->UpdateSemantics(std::move(update), actions);
     [[NSNotificationCenter defaultCenter] postNotificationName:FlutterSemanticsUpdateNotification
                                                         object:owner_controller_];
-  } else {
-    NSLog(@"platform view no a11y bridge!!");
   }
 }
 

diff --git a/shell/platform/darwin/ios/platform_view_ios_test.mm b/shell/platform/darwin/ios/platform_view_ios_test.mm
@@ -7,11 +7,6 @@
 
 #import "flutter/fml/thread.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
-#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
 FLUTTER_ASSERT_ARC
@@ -59,14 +54,6 @@ void UpdateAssetResolverByType(std::unique_ptr<flutter::AssetResolver> updated_a
 }  // namespace
 }  // namespace flutter
 
-namespace {
-// fml::RefPtr<fml::TaskRunner> CreateNewThread(const std::string& name) {
-//   auto thread = std::make_unique<fml::Thread>(name);
-//   auto runner = thread->GetTaskRunner();
-//   return runner;
-// }
-}  // namespace
-
 @interface PlatformViewIOSTest : XCTestCase
 @end