Compress IDR_WEBUI_CSS_TEXT_DEFAULTS

Bug: 982762
Change-Id: Ibe9df49abb07530e6613de0865db75420f7c396a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1837114Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703696}

ui/base/webui/web_ui_util.cc

@@ -33,6 +33,15 @@
 #endif
 
 namespace webui {
+namespace {
+std::string GetWebUiCssTextDefaults(const std::string& css_template) {
+  ui::TemplateReplacements placeholders;
+  placeholders["textDirection"] = GetTextDirection();
+  placeholders["fontFamily"] = GetFontFamily();
+  placeholders["fontSize"] = GetFontSize();
+  return ui::ReplaceTemplateExpressions(css_template, placeholders);
+}
+}  // namespace
 
 std::string GetBitmapDataUrl(const SkBitmap& bitmap) {
   TRACE_EVENT2("ui", "GetBitmapDataUrl", "width", bitmap.width(), "height",
@@ -193,26 +202,18 @@ void SetLoadTimeDataDefaults(const std::string& app_locale,
   (*replacements)["textdirection"] = GetTextDirection();
 }
 
-std::string GetWebUiCssTextDefaults(base::StringPiece css_template) {
-  ui::TemplateReplacements placeholders;
-  placeholders["textDirection"] = GetTextDirection();
-  placeholders["fontFamily"] = GetFontFamily();
-  placeholders["fontSize"] = GetFontSize();
-  return ui::ReplaceTemplateExpressions(css_template, placeholders);
-}
-
 std::string GetWebUiCssTextDefaults() {
   const ui::ResourceBundle& resource_bundle =
       ui::ResourceBundle::GetSharedInstance();
   return GetWebUiCssTextDefaults(
-      resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS));
+      resource_bundle.DecompressDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS));
 }
 
 std::string GetWebUiCssTextDefaultsMd() {
   const ui::ResourceBundle& resource_bundle =
       ui::ResourceBundle::GetSharedInstance();
   return GetWebUiCssTextDefaults(
-      resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS_MD));
+      resource_bundle.DecompressDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS_MD));
 }
 
 void AppendWebUiCssTextDefaults(std::string* html) {

ui/base/webui/web_ui_util.h

@@ -72,10 +72,6 @@ UI_BASE_EXPORT void SetLoadTimeDataDefaults(
     const std::string& app_locale,
     ui::TemplateReplacements* replacements);
 
-// Get a CSS declaration for common text styles using provided template.
-UI_BASE_EXPORT std::string GetWebUiCssTextDefaults(
-    const std::string& css_template);
-
 // Get a CSS declaration for common text styles for all of Web UI.
 UI_BASE_EXPORT std::string GetWebUiCssTextDefaults();
 

ui/webui/resources/webui_resources.grd

@@ -168,9 +168,11 @@ without changes to the corresponding grd file. -->
                  file="css/menu_button.css" type="chrome_html" compress="gzip"
                  flattenhtml="true" />
       <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS"
-                 file="css/text_defaults.css" type="chrome_html" />
+                 file="css/text_defaults.css" type="chrome_html"
+                 compress="gzip" />
       <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS_MD"
-                 file="css/text_defaults_md.css" type="chrome_html" />
+                 file="css/text_defaults_md.css" type="chrome_html"
+                 compress="gzip" />
       <structure name="IDR_WEBUI_CSS_OVERLAY"
                  file="css/overlay.css" type="chrome_html" compress="gzip"
                  flattenhtml="true" />