From 25bb5b85664f6993fd918c25785f784be7f50c7c Mon Sep 17 00:00:00 2001
From: Harry Terkelsen <het@google.com>
Date: Tue, 10 Sep 2019 16:03:59 -0700
Subject: [PATCH] Don't load Roboto by default

Fixes https://github.com/flutter/flutter/issues/39260
---
 lib/web_ui/lib/src/engine/compositor/fonts.dart     | 5 -----
 lib/web_ui/lib/src/engine/text/font_collection.dart | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/lib/web_ui/lib/src/engine/compositor/fonts.dart b/lib/web_ui/lib/src/engine/compositor/fonts.dart
index e710ce60bf49d..0b63b4e5baf38 100644
--- a/lib/web_ui/lib/src/engine/compositor/fonts.dart
+++ b/lib/web_ui/lib/src/engine/compositor/fonts.dart
@@ -41,11 +41,6 @@ class SkiaFontCollection {
           'There was a problem trying to load FontManifest.json');
     }
 
-    // Add Roboto to the bundled fonts since it is provided by default by
-    // Flutter.
-    _fontLoadingFutures
-        .add(_registerFont('Roboto', _robotoFontUrl, <String, String>{}));
-
     for (Map<String, dynamic> fontFamily in fontManifest) {
       final String family = fontFamily['family'];
       final List<dynamic> fontAssets = fontFamily['fonts'];
diff --git a/lib/web_ui/lib/src/engine/text/font_collection.dart b/lib/web_ui/lib/src/engine/text/font_collection.dart
index 847a20d0ffc29..91b30c234f255 100644
--- a/lib/web_ui/lib/src/engine/text/font_collection.dart
+++ b/lib/web_ui/lib/src/engine/text/font_collection.dart
@@ -6,8 +6,6 @@ part of engine;
 
 const String _testFontFamily = 'Ahem';
 const String _testFontUrl = 'packages/ui/assets/ahem.ttf';
-const String _robotoFontUrl =
-    'packages/flutter_web_ui/assets/Roboto-Regular.ttf';
 
 /// This class is responsible for registering and loading fonts.
 ///
@@ -54,13 +52,6 @@ class FontCollection {
       _assetFontManager = _PolyfillFontManager();
     }
 
-    // If not on Chrome, add Roboto to the bundled fonts since it is provided
-    // by default by Flutter.
-    if (browserEngine != BrowserEngine.blink) {
-      _assetFontManager
-          .registerAsset('Roboto', 'url($_robotoFontUrl)', <String, String>{});
-    }
-
     for (Map<String, dynamic> fontFamily in fontManifest) {
       final String family = fontFamily['family'];
       final List<dynamic> fontAssets = fontFamily['fonts'];