Brotli compression used on about credits html file.

resources.pak shrunk by 1285356B.

To make use of brotli's compression, more of brotli's repo was added. The presubmit script had to be edited to allow the "#include ../" that was used in brotli's "tools" folder.

BUG=332521

Review-Url: https://codereview.chromium.org/1951363002
Cr-Commit-Position: refs/heads/master@{#395920}

chrome/browser/ui/BUILD.gn

@@ -169,6 +169,7 @@ source_set("ui") {
       "//storage/common",
       "//third_party/WebKit/public:resources",
       "//third_party/adobe/flash:flapper_version_h",
+      "//third_party/brotli",
       "//third_party/leveldatabase",
       "//third_party/libjingle",
       "//third_party/re2",

chrome/browser/ui/webui/DEPS

@@ -14,6 +14,7 @@ include_rules = [
 
   # Other libraries.
   "+third_party/angle",       # For ANGLE version.
+  "+third_party/brotli",      # For compressed resources.
   "+third_party/zlib/zlib.h", # For compression level constants.
   "+third_party/libaddressinput", # For i18n address input.
 

chrome/browser/ui/webui/about_ui.cc

@@ -63,6 +63,7 @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
+#include "third_party/brotli/dec/decode.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
@@ -760,8 +761,25 @@ void AboutUIHTMLSource::StartDataRequest(
       idr = IDR_KEYBOARD_UTILS_JS;
 #endif
 
-    response = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        idr).as_string();
+    base::StringPiece raw_response =
+        ResourceBundle::GetSharedInstance().GetRawDataResource(idr);
+    if (idr == IDR_ABOUT_UI_CREDITS_HTML) {
+      size_t decoded_size;
+      const uint8_t* encoded_response_buffer =
+          reinterpret_cast<const uint8_t*>(raw_response.data());
+      CHECK(BrotliDecompressedSize(raw_response.size(), encoded_response_buffer,
+                                   &decoded_size));
+
+      // Resizing the response and using it as the buffer Brotli decompresses
+      // into.
+      response.resize(decoded_size);
+      CHECK(BrotliDecompressBuffer(raw_response.size(), encoded_response_buffer,
+                                   &decoded_size,
+                                   reinterpret_cast<uint8_t*>(&response[0])) ==
+            BROTLI_RESULT_SUCCESS);
+    } else {
+      response = raw_response.as_string();
+    }
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
   } else if (source_name_ == chrome::kChromeUIDiscardsHost) {
     response = AboutDiscards(path);

chrome/chrome_browser_ui.gypi

@@ -2919,6 +2919,7 @@
             '../net/net.gyp:stale_while_revalidate_experiment_domains',
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
+            '../third_party/brotli/brotli.gyp:brotli',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/re2/re2.gyp:re2',
             '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',

components/components_resources.gyp

@@ -5,6 +5,7 @@
 {
   'variables': {
     'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',
+    'about_credits_file_bro': '<(SHARED_INTERMEDIATE_DIR)/about_credits.bro',
   },
   'targets': [
     {
@@ -12,7 +13,7 @@
       'target_name': 'components_resources',
       'type': 'none',
       'dependencies': [
-        'about_credits',
+        'compressed_about_credits',
       ],
       'hard_dependency': 1,
       'variables': {
@@ -25,7 +26,7 @@
           'variables': {
             'grit_grd_file': 'resources/components_resources.grd',
             'grit_additional_defines': [
-              '-E', 'about_credits_file=<(about_credits_file)',
+              '-E', 'about_credits_file=<(about_credits_file_bro)',
             ],
           },
           'includes': [ '../build/grit_action.gypi' ],
@@ -41,6 +42,22 @@
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
+    {
+      'target_name': 'compressed_about_credits',
+      'type': 'none',
+      'actions': [
+        {
+          'variables': {
+            'input_file': '<(about_credits_file)',
+            'output_file': '<(about_credits_file_bro)',
+          },
+          'includes': ['../third_party/brotli/bro.gypi'],
+	}
+      ],
+      'dependencies': [
+        'about_credits'
+      ],
+    },
     {
       # GN version: //components/resources:about_credits
       'target_name': 'about_credits',

components/resources/BUILD.gn

@@ -3,8 +3,10 @@
 # found in the LICENSE file.
 
 import("//tools/grit/grit_rule.gni")
+import("//third_party/brotli/brotli.gni")
 
 about_credits_file = "$target_gen_dir/about_credits.html"
+about_credits_file_bro = "$target_gen_dir/about_credits.bro"
 
 # GYP version: components/components_resources.gyp:components_resources
 group("resources") {
@@ -29,11 +31,11 @@ grit("components_resources") {
 
   grit_flags = [
     "-E",
-    "about_credits_file=" + rebase_path(about_credits_file, root_build_dir),
+    "about_credits_file=" + rebase_path(about_credits_file_bro, root_build_dir),
   ]
 
   deps = [
-    ":about_credits",
+    ":compressed_about_credits",
   ]
 }
 
@@ -55,6 +57,14 @@ grit("components_scaled_resources") {
   output_dir = "$root_gen_dir/components"
 }
 
+compress_file_brotli("compressed_about_credits") {
+  input_file = about_credits_file
+  output_file = about_credits_file_bro
+  deps = [
+    ":about_credits",
+  ]
+}
+
 # GYP version: components/components_resources.gyp:about_credits
 action("about_credits") {
   script = "//tools/licenses.py"

third_party/brotli/BUILD.gn

@@ -2,6 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+if (is_win) {
+  import("//build/config/win/visual_studio_version.gni")
+}
+
 source_set("brotli") {
   sources = [
     "dec/bit_reader.c",
@@ -85,15 +89,16 @@ if (current_toolchain == host_toolchain) {
       ":brotli",
     ]
 
+    if (is_win && visual_studio_version == "2015") {
+      # Disabling "result of 32-bit shift implicitly converted to 64 bits",
+      # caused by code like: foo |= (1 << i);   // warning 4334
+      cflags = [ "/wd4334" ]
+    }
+
     # Always build release since this is a build tool.
     if (is_debug) {
       configs -= [ "//build/config:debug" ]
       configs += [ "//build/config:release" ]
     }
-    if (is_posix) {
-      configs -= [ "//build/config/gcc:no_exceptions" ]
-    } else if (is_win) {
-      cflags_cc = [ "/EHsc" ]
-    }
   }
 }

third_party/brotli/README.chromium

@@ -16,6 +16,8 @@ Local Modifications:
   tools.
 - Lines 659 of enc/hash.h and 66 of enc/cluster.h were modified to eliminate
   build errors that appeared on Windows.
+- Lines 290 - 304 from tools/bro.cc were adjusted to remove a try/catch block,
+  which are disabled by default in Chromium.
 - BUILD.gn: Added.
 - brotli.gyp: Added.
 - brotli.gni: Added.

third_party/brotli/bro.gypi

@@ -41,6 +41,6 @@
     '<(output_file)',
   ],
   'dependencies': [
-    '<(DEPTH)/third_party/brotli/brotli.gyp:bro',
+    '<(DEPTH)/third_party/brotli/brotli.gyp:bro#host',
   ],
 }

third_party/brotli/brotli.gyp

@@ -33,6 +33,7 @@
           'cflags': ['-O2'],
         }],
       ],
+      'toolsets': ['host', 'target'],
     },
     {
       'target_name': 'bro',
@@ -88,16 +89,12 @@
         'enc/write_bits.h',
         'tools/bro.cc',
       ],
+      'toolsets': ['host'],
       'conditions': [
-        ['OS=="win"', {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'AdditionalOptions': [ '/EHsc', ],
-            },
-          },
-        }],
-        ['os_posix==1', {
-          'cflags_cc!': [ '-fno-exceptions', ],
+        ['OS=="win" and MSVS_VERSION == "2015"', {
+          # Disabling "result of 32-bit shift implicitly converted to 64 bits",
+          # caused by code like: foo |= (1 << i);   // warning 4334
+          'msvs_disabled_warnings': [ 4334, ],
         }],
       ],
     }

third_party/brotli/tools/bro.cc

@@ -287,16 +287,10 @@ int main(int argc, char** argv) {
       brotli::BrotliParams params;
       params.lgwin = lgwin;
       params.quality = quality;
-      try {
-        brotli::BrotliFileIn in(fin, 1 << 16);
-        brotli::BrotliFileOut out(fout);
-        if (!BrotliCompress(params, &in, &out)) {
-          fprintf(stderr, "compression failed\n");
-          unlink(output_path);
-          exit(1);
-        }
-      } catch (std::bad_alloc&) {
-        fprintf(stderr, "not enough memory\n");
+      brotli::BrotliFileIn in(fin, 1 << 16);
+      brotli::BrotliFileOut out(fout);
+      if (!BrotliCompress(params, &in, &out)) {
+        fprintf(stderr, "compression failed\n");
         unlink(output_path);
         exit(1);
       }