From 04ce9d288ccdcd3335d6c69e2793eea0af074da3 Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 22 Jun 2020 10:13:37 -0700
Subject: [PATCH] Revert "Fix outline button solid path when BorderSize.width
 is used (#51581)" (#60000)

This reverts commit 599566177736e6b30af922a8f06e8a260acafc36.
---
 .../lib/src/material/outline_button.dart      |  2 +-
 .../test/material/outline_button_test.dart    | 33 -------------------
 .../flutter/test/rendering/mock_canvas.dart   |  6 ++--
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/packages/flutter/lib/src/material/outline_button.dart b/packages/flutter/lib/src/material/outline_button.dart
index 02bd0845d1f..524ad6b414a 100644
--- a/packages/flutter/lib/src/material/outline_button.dart
+++ b/packages/flutter/lib/src/material/outline_button.dart
@@ -561,7 +561,7 @@ class _OutlineBorder extends ShapeBorder implements MaterialStateProperty<ShapeB
       case BorderStyle.none:
         break;
       case BorderStyle.solid:
-        canvas.drawPath(shape.getOuterPath(rect.deflate(side.width / 2.0), textDirection: textDirection), side.toPaint());
+        canvas.drawPath(shape.getOuterPath(rect, textDirection: textDirection), side.toPaint());
     }
   }
 
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index 61061c364f6..c7870184490 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -867,39 +867,6 @@ void main() {
     );
   });
 
-  testWidgets('OutlineButton uses borderSide width to paint', (WidgetTester tester) async {
-    final GlobalKey buttonKey = GlobalKey();
-    const double thickness = 12.5;
-    await tester.pumpWidget(
-      Directionality(
-        textDirection: TextDirection.ltr,
-        child: Material(
-          child: Align(
-            alignment: Alignment.topLeft,
-            child: OutlineButton(
-              key: buttonKey,
-              borderSide: const BorderSide(
-                  color: Colors.black12,
-                  width: thickness),
-              onPressed: () {},
-              child: const SizedBox(
-                  width: 120,
-                  height: 50,
-                  child: Text('ABC'),
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-
-    final Finder outlineButton = find.byType(OutlineButton);
-    expect(outlineButton, paints..path(
-      includes: const <Offset>[Offset(60, thickness / 2.0)],
-      excludes: const <Offset>[Offset(60, thickness / 3.0)],
-    ));
-  });
-
   testWidgets('OutlineButton contributes semantics', (WidgetTester tester) async {
     final SemanticsTester semantics = SemanticsTester(tester);
     await tester.pumpWidget(
diff --git a/packages/flutter/test/rendering/mock_canvas.dart b/packages/flutter/test/rendering/mock_canvas.dart
index 7ffcf7a8c18..0cfdfb7eef8 100644
--- a/packages/flutter/test/rendering/mock_canvas.dart
+++ b/packages/flutter/test/rendering/mock_canvas.dart
@@ -1163,15 +1163,13 @@ class _PathPaintPredicate extends _DrawCommandPaintPredicate {
     if (includes != null) {
       for (final Offset offset in includes) {
         if (!pathArgument.contains(offset))
-          throw 'It called $methodName with a path that unexpectedly did not '
-              'contain $offset. Path bounds = ${pathArgument.getBounds()}';
+          throw 'It called $methodName with a path that unexpectedly did not contain $offset.';
       }
     }
     if (excludes != null) {
       for (final Offset offset in excludes) {
         if (pathArgument.contains(offset))
-          throw 'It called $methodName with a path that unexpectedly '
-              'contained $offset. . Path bounds = ${pathArgument.getBounds()}';
+          throw 'It called $methodName with a path that unexpectedly contained $offset.';
       }
     }
   }