From 116d6579c7fb40c67dada6dd9d50e2524d06a40e Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Tue, 31 May 2022 15:48:14 -0700
Subject: [PATCH] Remove remaining uses of hashValues in the framework
 (#105046)

---
 packages/flutter/lib/src/material/theme_data.dart  | 4 ++--
 packages/flutter/lib/src/painting/basic_types.dart | 4 ++--
 packages/flutter/lib/src/rendering/selection.dart  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 132c8f8044..78a8dae7f3 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -2148,8 +2148,8 @@ class ThemeData with Diagnosticable {
       // GENERAL CONFIGURATION
       applyElevationOverlayColor,
       cupertinoOverrideTheme,
-      hashList(extensions.keys),
-      hashList(extensions.values),
+      ...extensions.keys,
+      ...extensions.values,
       inputDecorationTheme,
       materialTapTargetSize,
       pageTransitionsTheme,
diff --git a/packages/flutter/lib/src/painting/basic_types.dart b/packages/flutter/lib/src/painting/basic_types.dart
index 460aeef06c..eac98937b5 100644
--- a/packages/flutter/lib/src/painting/basic_types.dart
+++ b/packages/flutter/lib/src/painting/basic_types.dart
@@ -43,8 +43,8 @@ export 'dart:ui' show
   VertexMode,
   // TODO(werainkhatri): remove these after their deprecation period in engine
   // https://github.com/flutter/flutter/pull/99505
-  hashValues,
-  hashList;
+  hashValues, // ignore: deprecated_member_use
+  hashList; // ignore: deprecated_member_use
 
 export 'package:flutter/foundation.dart' show VoidCallback;
 
diff --git a/packages/flutter/lib/src/rendering/selection.dart b/packages/flutter/lib/src/rendering/selection.dart
index 7d4052728b..70dce68429 100644
--- a/packages/flutter/lib/src/rendering/selection.dart
+++ b/packages/flutter/lib/src/rendering/selection.dart
@@ -523,7 +523,7 @@ class SelectionGeometry {
 
   @override
   int get hashCode {
-    return hashValues(
+    return Object.hash(
       startSelectionPoint,
       endSelectionPoint,
       status,
@@ -574,7 +574,7 @@ class SelectionPoint {
 
   @override
   int get hashCode {
-    return hashValues(
+    return Object.hash(
       localPosition,
       lineHeight,
       handleType,