From c5861cfb56725f492e4a58d3dfdfca868c64dade Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Wed, 25 Aug 2021 10:09:03 -0700
Subject: [PATCH] Revert "Fix DPR in test view configuration (#88609)" (#88889)

This reverts commit 5feee0d8faec96872377b74a90fda0c1fc77930f.
---
 packages/flutter_test/lib/src/binding.dart          | 2 +-
 packages/flutter_test/test/bindings_test.dart       | 5 -----
 packages/integration_test/lib/integration_test.dart | 8 ++++++++
 packages/integration_test/test/binding_test.dart    | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart
index aeed740f85b..8fdea90caec 100644
--- a/packages/flutter_test/lib/src/binding.dart
+++ b/packages/flutter_test/lib/src/binding.dart
@@ -1732,7 +1732,7 @@ class TestViewConfiguration extends ViewConfiguration {
   TestViewConfiguration._(Size size, ui.FlutterView window)
     : _paintMatrix = _getMatrix(size, window.devicePixelRatio, window),
       _hitTestMatrix = _getMatrix(size, 1.0, window),
-      super(size: size, devicePixelRatio: window.devicePixelRatio);
+      super(size: size);
 
   static Matrix4 _getMatrix(Size size, double devicePixelRatio, ui.FlutterView window) {
     final double inverseRatio = devicePixelRatio / window.devicePixelRatio;
diff --git a/packages/flutter_test/test/bindings_test.dart b/packages/flutter_test/test/bindings_test.dart
index 46b7b0a1d00..c5a4b923db0 100644
--- a/packages/flutter_test/test/bindings_test.dart
+++ b/packages/flutter_test/test/bindings_test.dart
@@ -24,11 +24,6 @@ void main() {
       // The code below will throw without the default.
       TestViewConfiguration(size: const Size(1280.0, 800.0));
     });
-
-    test('sets the DPR to match the window', () {
-      final TestViewConfiguration configuration = TestViewConfiguration(size: const Size(1280.0, 800.0));
-      expect(configuration.devicePixelRatio, binding.window.devicePixelRatio);
-    });
   });
 
   group(AutomatedTestWidgetsFlutterBinding, () {
diff --git a/packages/integration_test/lib/integration_test.dart b/packages/integration_test/lib/integration_test.dart
index 3e6e72ca822..10548c47bf9 100644
--- a/packages/integration_test/lib/integration_test.dart
+++ b/packages/integration_test/lib/integration_test.dart
@@ -396,6 +396,14 @@ https://flutter.dev/docs/testing/integration-tests#testing-on-firebase-test-lab
   set defaultTestTimeout(Timeout timeout) => _defaultTestTimeout = timeout;
   Timeout? _defaultTestTimeout;
 
+  @override
+  void attachRootWidget(Widget rootWidget) {
+    // This is a workaround where screenshots of root widgets have incorrect
+    // bounds.
+    // TODO(jiahaog): Remove when https://github.com/flutter/flutter/issues/66006 is fixed.
+    super.attachRootWidget(RepaintBoundary(child: rootWidget));
+  }
+
   @override
   void reportExceptionNoticed(FlutterErrorDetails exception) {
     // This method is called to log errors as they happen, and they will also
diff --git a/packages/integration_test/test/binding_test.dart b/packages/integration_test/test/binding_test.dart
index 4f3683fc277..c6ceb544d1b 100644
--- a/packages/integration_test/test/binding_test.dart
+++ b/packages/integration_test/test/binding_test.dart
@@ -126,10 +126,11 @@ Future<void> main() async {
       });
     });
 
-    testWidgets('root view reports correct dimensions', (WidgetTester tester) async {
+    // TODO(jiahaog): Remove when https://github.com/flutter/flutter/issues/66006 is fixed.
+    testWidgets('root widgets are wrapped with a RepaintBoundary', (WidgetTester tester) async {
       await tester.pumpWidget(const Placeholder());
 
-      expect(tester.binding.renderView.paintBounds, const Rect.fromLTWH(0, 0, 2400, 1800));
+      expect(find.byType(RepaintBoundary), findsOneWidget);
     });
   });