PDF Viewer: Auto-generate grd file.

Previously PDF Viewer resources were registered as part of
component_extension_resources.grd. This CL adds a dedicated and
auto-generated grd file to hold the PDF Viewer's resources.

This CL also opens up the possibility of using optimize_webui()
to improve the startup performance of the PDF Viewer.

Bug: 1132403
Change-Id: Ib1ed6ebc9f51dfe0ffd375b73186cfb3b07c6806
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2614504
Commit-Queue: dpapad <dpapad@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841493}

chrome/browser/extensions/chrome_component_extension_resource_manager.cc

@@ -21,8 +21,13 @@
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/constants.h"
 #include "pdf/buildflags.h"
+#include "ppapi/buildflags/buildflags.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if BUILDFLAG(ENABLE_PLUGINS)
+#include "chrome/grit/pdf_resources_map.h"
+#endif
+
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ash/keyboard/ui/resources/keyboard_resource_util.h"
 #include "base/command_line.h"
@@ -111,6 +116,11 @@ ChromeComponentExtensionResourceManager::Data::Data() {
                               kComponentExtensionResourcesSize);
   AddComponentResourceEntries(kExtraComponentExtensionResources,
                               base::size(kExtraComponentExtensionResources));
+
+#if BUILDFLAG(ENABLE_PLUGINS)
+  AddComponentResourceEntries(kPdfResources, kPdfResourcesSize);
+#endif
+
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   // Add Files app JS modules resources.
   AddComponentResourceEntries(kFileManagerResources, kFileManagerResourcesSize);

chrome/browser/resources/BUILD.gn

@@ -68,6 +68,10 @@ group("resources") {
     ]
   }
 
+  if (enable_pdf) {
+    public_deps += [ "pdf:pdf_resources" ]
+  }
+
   if (enable_print_preview) {
     public_deps += [ "print_preview:print_preview_resources" ]
   }
@@ -178,10 +182,6 @@ if (!is_android) {
   grit("component_extension_resources") {
     source = "component_extension_resources.grd"
 
-    if (enable_pdf) {
-      deps = [ "//chrome/browser/resources/pdf:web_components" ]
-    }
-
     defines = chrome_grit_defines
     if (enable_hangout_services_extension) {
       defines += [ "enable_hangout_services_extension" ]

chrome/browser/resources/component_extension_resources.grd

@@ -93,9 +93,6 @@
         <include name="IDR_ARC_SUPPORT_RECOMMEND_APP_LIST_VIEW_JS" file="chromeos/arc_support/recommend_app_list_view.js" type="BINDATA" />
         <include name="IDR_ARC_SUPPORT_RECOMMEND_APP_LIST_VIEW_HTML" file="chromeos/arc_support/recommend_app_list_view.html" type="chrome_html" flattenhtml="true" />
       </if>
-      <if expr="enable_plugins">
-        <part file="pdf/pdf_resources.grdp" />
-      </if>
       <include name="IDR_CRYPTOTOKEN_UTIL_JS" file="cryptotoken/util.js" type="BINDATA" />
       <include name="IDR_CRYPTOTOKEN_B64_JS" file="cryptotoken/b64.js" type="BINDATA" />
       <include name="IDR_CRYPTOTOKEN_COUNTDOWN_JS" file="cryptotoken/countdown.js" type="BINDATA" />

chrome/browser/resources/pdf/BUILD.gn

@@ -3,9 +3,122 @@
 # found in the LICENSE file.
 
 import("//build/config/chromeos/ui_mode.gni")
+import("//chrome/common/features.gni")
 import("//pdf/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/grit_rule.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
+
+preprocess_folder = "preprocessed"
+preprocess_manifest = "preprocessed_manifest.json"
+preprocess_gen_manifest = "preprocessed_gen_manifest.json"
+
+assert(enable_pdf, "enable_pdf check failed")
+
+preprocess_if_expr("preprocess") {
+  in_folder = "./"
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_manifest"
+  in_files = [
+    "bookmark_type.js",
+    "browser_api.js",
+    "constants.js",
+    "controller.js",
+    "gesture_detector.js",
+    "index.css",
+    "index.html",
+    "local_storage_proxy.js",
+    "main.js",
+    "metrics.js",
+    "navigator.js",
+    "open_pdf_params_parser.js",
+    "pdf_scripting_api.js",
+    "pdf_viewer_base.js",
+    "pdf_viewer_utils.js",
+    "toolbar_manager.js",
+    "viewport.js",
+    "viewport_scroller.js",
+    "zoom_manager.js",
+  ]
+
+  if (is_chromeos) {
+    in_files += [
+      "ink_controller.js",
+      "ink/index.html",
+      "ink/ink_api.js",
+    ]
+  }
+}
+
+preprocess_if_expr("preprocess_generated") {
+  deps = [ ":web_components" ]
+  in_folder = target_gen_dir
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
+  in_files = [
+    "elements/icons.js",
+    "elements/shared-css.js",
+    "elements/shared-vars.js",
+    "elements/viewer-bookmark.js",
+    "elements/viewer-document-outline.js",
+    "elements/viewer-download-controls.js",
+    "elements/viewer-error-screen.js",
+    "elements/viewer-page-selector.js",
+    "elements/viewer-password-screen.js",
+    "elements/viewer-pdf-sidenav.js",
+    "elements/viewer-pdf-toolbar.js",
+    "elements/viewer-pdf-toolbar-new.js",
+    "elements/viewer-properties-dialog.js",
+    "elements/viewer-thumbnail-bar.js",
+    "elements/viewer-thumbnail.js",
+    "elements/viewer-toolbar-dropdown.js",
+    "elements/viewer-zoom-button.js",
+    "elements/viewer-zoom-toolbar.js",
+    "pdf_viewer.js",
+    "pdf_viewer_shared_style.js",
+  ]
+  if (is_chromeos) {
+    in_files += [
+      "elements/viewer-annotations-bar.js",
+      "elements/viewer-annotations-mode-dialog.js",
+      "elements/viewer-form-warning.js",
+      "elements/viewer-ink-host.js",
+      "elements/viewer-pen-options.js",
+    ]
+  }
+}
+
+generate_grd("build_grd") {
+  deps = [
+    ":preprocess",
+    ":preprocess_generated",
+  ]
+  manifest_files = [
+    "$target_gen_dir/$preprocess_manifest",
+    "$target_gen_dir/$preprocess_gen_manifest",
+  ]
+  grd_prefix = "pdf"
+  out_grd = "$target_gen_dir/resources.grd"
+  resource_path_prefix = "pdf"
+}
+
+grit("pdf_resources") {
+  defines = chrome_grit_defines
+
+  enable_input_discovery_for_gn_analyze = false
+  source = "$target_gen_dir/resources.grd"
+  deps = [ ":build_grd" ]
+
+  outputs = [
+    "grit/pdf_resources.h",
+    "grit/pdf_resources_map.cc",
+    "grit/pdf_resources_map.h",
+    "pdf_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}
 
 assert(enable_pdf, "enable_pdf check failed")
 
@@ -26,7 +139,7 @@ html_to_js("web_components_local") {
 
 group("closure_compile") {
   deps = [
-    ":pdf_resources",
+    ":closure_compile_local",
     "elements:closure_compile",
   ]
   if (is_chromeos_ash) {
@@ -220,7 +333,7 @@ js_library("main") {
   ]
 }
 
-js_type_check("pdf_resources") {
+js_type_check("closure_compile_local") {
   is_polymer3 = true
   deps = [
     ":annotation_tool",

chrome/browser/resources/pdf/pdf_resources.grdp

-<?xml version="1.0" encoding="utf-8"?>
-<grit-part>
-  <!-- Note that resources included here that are used in Print Preview
-       also must be included in print_preview_ui.cc such these resources
-       will be exposed to PDF in print preview. -->
-  <include name="IDR_PDF_INDEX_HTML" file="pdf/index.html" type="BINDATA" preprocess="true" />
-  <include name="IDR_PDF_INDEX_CSS" file="pdf/index.css" type="BINDATA" />
-  <include name="IDR_PDF_MAIN_JS" file="pdf/main.js" type="BINDATA" preprocess="true" />
-  <include name="IDR_PDF_PDF_VIEWER_UTILS_JS" file="pdf/pdf_viewer_utils.js" type="BINDATA" />
-  <include name="IDR_PDF_PDF_VIEWER_BASE_JS" file="pdf/pdf_viewer_base.js" type="BINDATA" />
-  <include name="IDR_PDF_PDF_VIEWER_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/pdf_viewer.js" resource_path="pdf/pdf_viewer.js" use_base_dir="false" type="BINDATA" preprocess="true" />
-  <include name="IDR_PDF_PDF_VIEWER_SHARED_STYLE_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/pdf_viewer_shared_style.js" resource_path="pdf/pdf_viewer_shared_style.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_BOOKMARK_TYPE_JS" file="pdf/bookmark_type.js" type="BINDATA" />
-  <include name="IDR_PDF_CONSTANTS_JS" file="pdf/constants.js" type="BINDATA" />
-  <include name="IDR_PDF_CONTROLLER_JS" file="pdf/controller.js" type="BINDATA" />
-  <include name="IDR_PDF_TOOLBAR_MANAGER_JS" file="pdf/toolbar_manager.js" type="BINDATA" />
-  <include name="IDR_PDF_VIEWPORT_JS" file="pdf/viewport.js" type="BINDATA" />
-  <include name="IDR_PDF_OPEN_PDF_PARAMS_PARSER_JS" file="pdf/open_pdf_params_parser.js" type="BINDATA" />
-  <include name="IDR_PDF_NAVIGATOR_JS" file="pdf/navigator.js" type="BINDATA" />
-  <include name="IDR_PDF_VIEWPORT_SCROLLER_JS" file="pdf/viewport_scroller.js" type="BINDATA" />
-  <include name="IDR_PDF_PDF_SCRIPTING_API_JS" file="pdf/pdf_scripting_api.js" type="BINDATA" />
-  <include name="IDR_PDF_ZOOM_MANAGER_JS" file="pdf/zoom_manager.js" type="BINDATA" />
-  <include name="IDR_PDF_GESTURE_DETECTOR_JS" file="pdf/gesture_detector.js" type="BINDATA" />
-  <include name="IDR_PDF_BROWSER_API_JS" file="pdf/browser_api.js" type="BINDATA" />
-  <include name="IDR_PDF_METRICS_JS" file="pdf/metrics.js" type="BINDATA" />
-  <include name="IDR_PDF_LOCAL_STORAGE_PROXY_JS" file="pdf/local_storage_proxy.js" type="BINDATA" />
-  <include name="IDR_PDF_ELEMENTS_SHARED_CSS_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/shared-css.js" resource_path="pdf/elements/shared-css.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_SHARED_VARS_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/shared-vars.js" resource_path="pdf/elements/shared-vars.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_ICONS_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/icons.js" resource_path="pdf/elements/icons.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_BOOKMARK_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-bookmark.js" resource_path="pdf/elements/viewer-bookmark.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_DOCUMENT_OUTLINE_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-document-outline.js" resource_path="pdf/elements/viewer-document-outline.js" use_base_dir="false" type="BINDATA"/>
-  <include name="IDR_PDF_VIEWER_DOWNLOADS_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-download-controls.js" resource_path="pdf/elements/viewer-download-controls.js" use_base_dir="false" type="BINDATA"/>
-  <include name="IDR_PDF_VIEWER_ERROR_SCREEN_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-error-screen.js" resource_path="pdf/elements/viewer-error-screen.js" use_base_dir="false" type="BINDATA" />
-  <if expr="chromeos">
-    <include name="IDR_PDF_VIEWER_ANNOTATIONS_MODE_DIALOG_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-annotations-mode-dialog.js" resource_path="pdf/elements/viewer-annotations-mode-dialog.js" use_base_dir="false" type="BINDATA"/>
-    <include name="IDR_PDF_VIEWER_ANNOTATIONS_BAR_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-annotations-bar.js" resource_path="pdf/elements/viewer-annotations-bar.js" use_base_dir="false" type="BINDATA"/>
-    <include name="IDR_PDF_VIEWER_INK_CONTROLLER_JS" file="pdf/ink_controller.js" type="BINDATA" />
-    <include name="IDR_PDF_VIEWER_INK_INDEX_HTML" file="pdf/ink/index.html" type="BINDATA" />
-    <include name="IDR_PDF_VIEWER_INK_INK_API_JS" file="pdf/ink/ink_api.js" type="BINDATA" />
-    <include name="IDR_PDF_VIEWER_INK_HOST_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-ink-host.js" resource_path="pdf/elements/viewer-ink-host.js" use_base_dir="false" type="BINDATA" />
-    <include name="IDR_PDF_VIEWER_PEN_OPTIONS_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-pen-options.js" resource_path="pdf/elements/viewer-pen-options.js" use_base_dir="false" type="BINDATA" />
-    <include name="IDR_PDF_VIEWER_FORM_WARNING_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-form-warning.js" resource_path="pdf/elements/viewer-form-warning.js" use_base_dir="false" type="BINDATA" />
-  </if>
-  <include name="IDR_PDF_VIEWER_PAGE_SELECTOR_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-page-selector.js" resource_path="pdf/elements/viewer-page-selector.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-password-screen.js" resource_path="pdf/elements/viewer-password-screen.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_PDF_SIDENAV_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-pdf-sidenav.js" resource_path="pdf/elements/viewer-pdf-sidenav.js" use_base_dir="false" type="BINDATA"/>
-  <include name="IDR_PDF_VIEWER_PDF_TOOLBAR_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar.js" resource_path="pdf/elements/viewer-pdf-toolbar.js" use_base_dir="false" type="BINDATA" preprocess="true"/>
-  <include name="IDR_PDF_VIEWER_PDF_TOOLBAR_NEW_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar-new.js" resource_path="pdf/elements/viewer-pdf-toolbar-new.js" use_base_dir="false" type="BINDATA" preprocess="true"/>
-  <include name="IDR_PDF_VIEWER_PROPERTIES_DIALOG_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-properties-dialog.js" resource_path="pdf/elements/viewer-properties-dialog.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_THUMBNAIL_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-thumbnail.js" resource_path="pdf/elements/viewer-thumbnail.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_THUMBNAIL_BAR_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-thumbnail-bar.js" resource_path="pdf/elements/viewer-thumbnail-bar.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_TOOLBAR_DROPDOWN_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-toolbar-dropdown.js" resource_path="pdf/elements/viewer-toolbar-dropdown.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_ZOOM_BUTTON_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-zoom-button.js" resource_path="pdf/elements/viewer-zoom-button.js" use_base_dir="false" type="BINDATA" />
-  <include name="IDR_PDF_VIEWER_ZOOM_SELECTOR_JS" file="${root_gen_dir}/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar.js" resource_path="pdf/elements/viewer-zoom-toolbar.js" use_base_dir="false" type="BINDATA" />
-</grit-part>

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -48,8 +48,8 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/chromium_strings.h"
-#include "chrome/grit/component_extension_resources.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/grit/pdf_resources.h"
 #include "chrome/grit/print_preview_resources.h"
 #include "chrome/grit/print_preview_resources_map.h"
 #include "chromeos/constants/chromeos_features.h"
@@ -415,11 +415,14 @@ void SetupPrintPreviewPlugin(content::WebUIDataSource* source) {
       {"pdf/browser_api.js", IDR_PDF_BROWSER_API_JS},
       {"pdf/constants.js", IDR_PDF_CONSTANTS_JS},
       {"pdf/controller.js", IDR_PDF_CONTROLLER_JS},
-      {"pdf/elements/icons.js", IDR_PDF_ICONS_JS},
-      {"pdf/elements/shared-vars.js", IDR_PDF_SHARED_VARS_JS},
-      {"pdf/elements/viewer-error-screen.js", IDR_PDF_VIEWER_ERROR_SCREEN_JS},
-      {"pdf/elements/viewer-zoom-button.js", IDR_PDF_VIEWER_ZOOM_BUTTON_JS},
-      {"pdf/elements/viewer-zoom-toolbar.js", IDR_PDF_VIEWER_ZOOM_SELECTOR_JS},
+      {"pdf/elements/icons.js", IDR_PDF_ELEMENTS_ICONS_JS},
+      {"pdf/elements/shared-vars.js", IDR_PDF_ELEMENTS_SHARED_VARS_JS},
+      {"pdf/elements/viewer-error-screen.js",
+       IDR_PDF_ELEMENTS_VIEWER_ERROR_SCREEN_JS},
+      {"pdf/elements/viewer-zoom-button.js",
+       IDR_PDF_ELEMENTS_VIEWER_ZOOM_BUTTON_JS},
+      {"pdf/elements/viewer-zoom-toolbar.js",
+       IDR_PDF_ELEMENTS_VIEWER_ZOOM_TOOLBAR_JS},
       {"pdf/gesture_detector.js", IDR_PDF_GESTURE_DETECTOR_JS},
       {"pdf/index.css", IDR_PDF_INDEX_CSS},
       {"pdf/main.js", IDR_PDF_MAIN_JS},

chrome/chrome_paks.gni

@@ -268,6 +268,10 @@ template("chrome_extra_paks") {
         "//extensions:extensions_resources",
       ]
     }
+    if (enable_plugins) {
+      sources += [ "$root_gen_dir/chrome/pdf_resources.pak" ]
+      deps += [ "//chrome/browser/resources/pdf:pdf_resources" ]
+    }
     if (enable_print_preview) {
       sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ]
       deps +=

tools/gritsettings/resource_ids.spec

@@ -162,6 +162,10 @@
   "chrome/browser/resources/preinstalled_web_apps/resources.grd": {
     "includes": [1710],
   },
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/pdf/resources.grd": {
+    "META": {"sizes": {"includes": [200]}},
+    "includes": [1715],
+  },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/print_preview/print_preview_resources.grd": {
     "META": {"sizes": {"includes": [500],}},
     "includes": [1720],