Skip to content

GitLab

T
tangled
Commit fe17806e authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Chromium LUCI CQ
Browse files
Options

Add generate_grd() and grit() for CSS and images 

Change Files app to NOT inline CSS and its images.

Measurements showed that this has not significant impact to the startup
time.

The flattenhtml option used to inline the CSS file is considered
deprecated for the latest build tools used in Web UIs.

Bug: 1151829
Change-Id: Ibf0bf4f4a77a40ac5a48b1b999a4fde65d7c6bdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560281
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Jeremie Boulic <jboulic@chromium.org>
Reviewed-by: default avatarJeremie Boulic <jboulic@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Auto-Submit: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835000}
parent 3fff88ce
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 15 deletions
ui/file_manager/BUILD.gn
View file @ fe17806e
......@@ -202,7 +202,7 @@ generated_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
generate_grd("build_grd") {
out_grd = generated_grd
input_files_base_dir = rebase_path("$target_gen_dir", root_gen_dir)
input_files_base_dir = rebase_path(target_gen_dir, root_build_dir)
input_files = [
"audio_player/js/main.m.rollup.js",
"audio_player/js/main_background.m.rollup.js",
......@@ -219,7 +219,10 @@ generate_grd("build_grd") {
"audio_player/js/metadata_worker.m.rollup.js|audio_player/js/metadata_worker.m.js",
]
grdp_files = [ "$target_gen_dir/file_manager/static_resources.grdp" ]
deps = [
"file_manager:build_static_grdp",
"//ui/file_manager/audio_player/js:build",
"//ui/file_manager/audio_player/js:build_background",
"//ui/file_manager/audio_player/js:build_worker",
......@@ -229,19 +232,10 @@ generate_grd("build_grd") {
# Resources for the JS modules.
grit("file_manager_gen_resources") {
grit_flags = [
"-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
"-E",
"root_src_dir=" + rebase_path(root_gen_dir, root_build_dir),
]
defines = chrome_grit_defines
# These arguments are needed since the grd is generated at build time.
enable_input_discovery_for_gn_analyze = false
defines +=
[ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
source = generated_grd
deps = [ ":build_grd" ]
......@@ -252,5 +246,5 @@ grit("file_manager_gen_resources") {
"grit/file_manager_gen_resources_map.h",
"file_manager_gen_resources.pak",
]
output_dir = "$root_gen_dir/ui/file_manager"
output_dir = target_gen_dir
}
ui/file_manager/file_manager/BUILD.gn 0 → 100644
View file @ fe17806e
# Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//ui/webui/resources/tools/generate_grd.gni")
generated_static_grdp = "$target_gen_dir/static_resources.grdp"
generate_grd("build_static_grdp") {
out_grd = generated_static_grdp
grd_prefix = "file_manager"
resource_path_prefix = "file_manager"
input_files_base_dir = rebase_path(".", "//")
input_files = [
# CSS:
"cws_widget/cws_widget_container.css",
"foreground/css/combobutton.css",
"foreground/css/common.css",
"foreground/css/file_manager.css",
"foreground/css/file_status.css",
"foreground/css/file_types.css",
"foreground/css/list.css",
"foreground/css/menu.css",
"foreground/css/table.css",
"foreground/css/tree.css",
# Images:
"foreground/images/common/check_no_box.png",
"foreground/images/common/2x/check_no_box.png",
"foreground/images/common/disclosure_arrow_dk_grey_down.png",
"foreground/images/common/2x/disclosure_arrow_dk_grey_down.png",
"foreground/images/common/dragger.svg",
"foreground/images/common/ic_close.svg",
"foreground/images/common/ic_selected.svg",
"foreground/images/files/ui/2x/person_add.png",
"foreground/images/files/ui/2x/search.png",
"foreground/images/files/ui/2x/service_drive.png",
"foreground/images/files/ui/arrow_right.svg",
"foreground/images/files/ui/arrow_right_white.png",
"foreground/images/files/ui/2x/arrow_right_white.png",
"foreground/images/files/ui/back.svg",
"foreground/images/files/ui/cloud_import_syncing.png",
"foreground/images/files/ui/2x/cloud_import_syncing.png",
"foreground/images/files/ui/delete.svg",
"foreground/images/files/ui/delete_ng.svg",
"foreground/images/files/ui/drive_logo.svg",
"foreground/images/files/ui/external_link.svg",
"foreground/images/files/ui/filetype_placeholder_audio.png",
"foreground/images/files/ui/2x/filetype_placeholder_audio.png",
"foreground/images/files/ui/filetype_placeholder_generic.png",
"foreground/images/files/ui/2x/filetype_placeholder_generic.png",
"foreground/images/files/ui/filetype_placeholder_generic.svg",
"foreground/images/files/ui/filetype_placeholder_image.png",
"foreground/images/files/ui/2x/filetype_placeholder_image.png",
"foreground/images/files/ui/filetype_placeholder_video.png",
"foreground/images/files/ui/2x/filetype_placeholder_video.png",
"foreground/images/files/ui/info.svg",
"foreground/images/files/ui/list_check.svg",
"foreground/images/files/ui/menu_ng.svg",
"foreground/images/files/ui/offline.svg",
"foreground/images/files/ui/person_add.png",
"foreground/images/files/ui/quick_view/filetype_audio.png",
"foreground/images/files/ui/quick_view/2x/filetype_audio.png",
"foreground/images/files/ui/quick_view/filetype_folder.png",
"foreground/images/files/ui/quick_view/2x/filetype_folder.png",
"foreground/images/files/ui/quick_view/filetype_generic.png",
"foreground/images/files/ui/quick_view/2x/filetype_generic.png",
"foreground/images/files/ui/quick_view/filetype_image.png",
"foreground/images/files/ui/quick_view/2x/filetype_image.png",
"foreground/images/files/ui/quick_view/filetype_video.png",
"foreground/images/files/ui/quick_view/2x/filetype_video.png",
"foreground/images/files/ui/refresh.svg",
"foreground/images/files/ui/search.png",
"foreground/images/files/ui/search.svg",
"foreground/images/files/ui/search_clear_filled.svg",
"foreground/images/files/ui/service_drive.png",
"foreground/images/files/ui/share_ng.svg",
"foreground/images/files/ui/sort_desc.svg",
"foreground/images/files/ui/sorting_ng.svg",
"foreground/images/files/ui/store.png",
"foreground/images/files/ui/2x/store.png",
"foreground/images/files/ui/view_list.svg",
"foreground/images/files/ui/view_thumbnail.svg",
"foreground/images/files/ui/visibility_ng.svg",
"foreground/images/files/ui/warning.svg",
"foreground/images/filetype/filetype_archive.svg",
"foreground/images/filetype/filetype_audio.svg",
"foreground/images/filetype/filetype_excel.svg",
"foreground/images/filetype/filetype_folder.svg",
"foreground/images/filetype/filetype_folder_shared.svg",
"foreground/images/filetype/filetype_gdoc.svg",
"foreground/images/filetype/filetype_gdraw.svg",
"foreground/images/filetype/filetype_generic.svg",
"foreground/images/filetype/filetype_gform.svg",
"foreground/images/filetype/filetype_gmap.svg",
"foreground/images/filetype/filetype_gsheet.svg",
"foreground/images/filetype/filetype_gsite.svg",
"foreground/images/filetype/filetype_gslides.svg",
"foreground/images/filetype/filetype_gtable.svg",
"foreground/images/filetype/filetype_image.svg",
"foreground/images/filetype/filetype_pdf.svg",
"foreground/images/filetype/filetype_ppt.svg",
"foreground/images/filetype/filetype_script.svg",
"foreground/images/filetype/filetype_sites.svg",
"foreground/images/filetype/filetype_team_drive.svg",
"foreground/images/filetype/filetype_tini.svg",
"foreground/images/filetype/filetype_video.svg",
"foreground/images/filetype/filetype_word.svg",
"foreground/images/volumes/android.svg",
"foreground/images/volumes/archive.svg",
"foreground/images/volumes/audio.svg",
"foreground/images/volumes/camera.svg",
"foreground/images/volumes/cd.svg",
"foreground/images/volumes/computer.svg",
"foreground/images/volumes/devices.svg",
"foreground/images/volumes/downloads.svg",
"foreground/images/volumes/drive.svg",
"foreground/images/volumes/hard_drive.svg",
"foreground/images/volumes/images.svg",
"foreground/images/volumes/linux_files.svg",
"foreground/images/volumes/my_files.svg",
"foreground/images/volumes/offline.svg",
"foreground/images/volumes/phone.svg",
"foreground/images/volumes/plugin_vm_ng.svg",
"foreground/images/volumes/recent.svg",
"foreground/images/volumes/sd.svg",
"foreground/images/volumes/service_drive.svg",
"foreground/images/volumes/shared.svg",
"foreground/images/volumes/shortcut.svg",
"foreground/images/volumes/smb.svg",
"foreground/images/volumes/team_drive.svg",
"foreground/images/volumes/usb.svg",
"foreground/images/volumes/videos.svg",
]
}
ui/file_manager/file_manager_resources.grd
View file @ fe17806e
......@@ -13,7 +13,7 @@
<includes>
<include name="IDR_FILEMANAGER_MANIFEST" file="file_manager/manifest.json" type="BINDATA" />
<!-- The Files app pages and scripts. -->
<include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" type="BINDATA" />
<include name="IDR_FILE_MANAGER_MAIN_JS" file="file_manager/foreground/js/main_scripts.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_IMPORTER_JS" file="file_manager/foreground/js/elements_importer.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_BACKGROUND_JS" file="file_manager/background/js/background_scripts.js" flattenhtml="true" type="BINDATA" />
......@@ -37,10 +37,9 @@
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_METADATA_ENTRY_JS" file="file_manager/foreground/elements/files_metadata_entry.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_PASSWORD_DIALOG_HTML" file="file_manager/foreground/elements/files_password_dialog.html" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_PASSWORD_DIALOG_JS" file="file_manager/foreground/elements/files_password_dialog.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_QUICK_PREVIEW_CSS" file="file_manager/foreground/elements/files_quick_view.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_QUICK_PREVIEW_CSS" file="file_manager/foreground/elements/files_quick_view.css" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_QUICK_PREVIEW_HTML" file="file_manager/foreground/elements/files_quick_view.html" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_QUICK_PREVIEW_JS" file="file_manager/foreground/elements/files_quick_view.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_QUICK_COMMON_CSS" file="file_manager/foreground/css/common.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_RIPPLE_HTML" file="file_manager/foreground/elements/files_ripple.html" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_RIPPLE_JS" file="file_manager/foreground/elements/files_ripple.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ELEMENTS_FILES_SAFE_AUDIO_WEBVIEW_CONTENT_CSS" file="file_manager/foreground/elements/files_safe_audio_webview_content.css" type="BINDATA" />
......@@ -172,7 +171,6 @@
<include name="IDR_FILE_MANAGER_WEBSTORE_WIDGET_CWS_WEBVIEW_CLIENT_JS" file="file_manager/cws_widget/cws_webview_client.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_JS" file="file_manager/cws_widget/cws_widget_container.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_ERROR_DIALOG_JS" file="file_manager/cws_widget/cws_widget_container_error_dialog.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_WEBSTORE_WIDGET_CWS_WIDGET_CONTAINER_CSS" file="file_manager/cws_widget/cws_widget_container.css" type="BINDATA" />
<!-- Image loader extension manifest and scripts. -->
<if expr="chromeos">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment