From 63efe4c4ac9e2b45d53e6be143b0bdce6037c4d8 Mon Sep 17 00:00:00 2001
From: Hans Muller <hansmuller@chromium.org>
Date: Wed, 26 Sep 2018 09:11:18 -0700
Subject: [PATCH] Fix some TabBarTheme mergeOs (#22285)

---
 packages/flutter/lib/src/material/theme_data.dart | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 9b2937007d1..ee10b0266a3 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -187,7 +187,6 @@ class ThemeData extends Diagnosticable {
     errorColor ??= Colors.red[700];
     inputDecorationTheme ??= const InputDecorationTheme();
     pageTransitionsTheme ??= const PageTransitionsTheme();
-  tabBarTheme ??= const TabBarTheme();
     primaryIconTheme ??= primaryIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black);
     accentIconTheme ??= accentIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black);
     iconTheme ??= isDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black87);
@@ -894,12 +893,12 @@ class ThemeData extends Diagnosticable {
         primaryIconTheme,
         accentIconTheme,
         sliderTheme,
-        chipTheme,
+        tabBarTheme,
         hashValues(
+          chipTheme,
           platform,
           materialTapTargetSize,
           pageTransitionsTheme,
-          tabBarTheme,
         ),
       ),
     );