From 1800adb8e1422dbbbd7fab9af1e24d2fb819cdb2 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Wed, 15 Mar 2023 16:54:03 -0700 Subject: [PATCH] [macOS,Windows] Use static casts where possible Fixes a few instances where we were using reinterpret_cast and reinterpret_pointer_cast but could have been using static_cast since the types being cast between are related types in the same hierarchy. --- .../macos/framework/Source/AccessibilityBridgeMacTest.mm | 6 +++--- .../windows/accessibility_bridge_windows_unittests.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm index 9ba8d25654a04..c13335dd63033 100644 --- a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm +++ b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm @@ -71,7 +71,7 @@ @implementation AccessibilityBridgeTestViewController // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy // can query semantics information from. engine.semanticsEnabled = YES; - auto bridge = std::reinterpret_pointer_cast( + auto bridge = std::static_pointer_cast( viewController.accessibilityBridge.lock()); FlutterSemanticsNode root; root.id = 0; @@ -119,7 +119,7 @@ @implementation AccessibilityBridgeTestViewController // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy // can query semantics information from. engine.semanticsEnabled = YES; - auto bridge = std::reinterpret_pointer_cast( + auto bridge = std::static_pointer_cast( viewController.accessibilityBridge.lock()); FlutterSemanticsNode root; root.id = 0; @@ -166,7 +166,7 @@ @implementation AccessibilityBridgeTestViewController // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy // can query semantics information from. engine.semanticsEnabled = YES; - auto bridge = std::reinterpret_pointer_cast( + auto bridge = std::static_pointer_cast( viewController.accessibilityBridge.lock()); FlutterSemanticsNode root; root.id = 0; diff --git a/shell/platform/windows/accessibility_bridge_windows_unittests.cc b/shell/platform/windows/accessibility_bridge_windows_unittests.cc index 089e3aacbf403..c2c76b77652be 100644 --- a/shell/platform/windows/accessibility_bridge_windows_unittests.cc +++ b/shell/platform/windows/accessibility_bridge_windows_unittests.cc @@ -168,8 +168,8 @@ ui::AXNode* AXNodeFromID(std::shared_ptr bridge, std::shared_ptr GetAccessibilityBridgeSpy( FlutterWindowsEngine* engine) { FlutterWindowsEngineSpy* engine_spy = - reinterpret_cast(engine); - return std::reinterpret_pointer_cast( + static_cast(engine); + return std::static_pointer_cast( engine_spy->accessibility_bridge().lock()); }