From ebbf3c1bf5f41b0133657515302e3b110abedee1 Mon Sep 17 00:00:00 2001 From: erg Date: Wed, 25 Mar 2015 12:04:51 -0700 Subject: Part 3 of 4: Modify blink users so they use the image resources in blink. Now that the image resources that blink depends on are in the blink repository, we depend on the blink resources directly, delete the ones in the chrome tree, and use these resources in the html_viewer. BUG=467176 Review URL: https://codereview.chromium.org/1033733004 Cr-Commit-Position: refs/heads/master@{#322201} --- android_webview/android_webview.gyp | 2 +- chrome/BUILD.gn | 6 +- chrome/chrome_repack_chrome_100_percent.gypi | 1 + chrome/chrome_repack_chrome_200_percent.gypi | 1 + chrome/chrome_repack_resources.gypi | 2 +- chromecast/chromecast.gyp | 2 +- content/app/resources/content_resources.grd | 48 ---------- .../resources/default_100_percent/broken_image.png | Bin 448 -> 0 bytes .../default_100_percent/mediaplayer_cast_off.png | Bin 37155 -> 0 bytes .../default_100_percent/mediaplayer_cast_on.png | Bin 37155 -> 0 bytes .../mediaplayer_closedcaption.png | Bin 2499 -> 0 bytes .../mediaplayer_closedcaption_disabled.png | Bin 2764 -> 0 bytes .../mediaplayer_closedcaption_down.png | Bin 8520 -> 0 bytes .../mediaplayer_closedcaption_hover.png | Bin 7995 -> 0 bytes .../default_100_percent/mediaplayer_fullscreen.png | Bin 1116 -> 0 bytes .../mediaplayer_fullscreen_disabled.png | Bin 780 -> 0 bytes .../mediaplayer_fullscreen_down.png | Bin 4844 -> 0 bytes .../mediaplayer_fullscreen_hover.png | Bin 4649 -> 0 bytes .../mediaplayer_overlay_cast_off.png | Bin 1293 -> 0 bytes .../mediaplayer_overlay_play.png | Bin 1243 -> 0 bytes .../default_100_percent/mediaplayer_pause.png | Bin 814 -> 0 bytes .../default_100_percent/mediaplayer_pause_down.png | Bin 4687 -> 0 bytes .../mediaplayer_pause_hover.png | Bin 4507 -> 0 bytes .../default_100_percent/mediaplayer_play.png | Bin 1243 -> 0 bytes .../mediaplayer_play_disabled.png | Bin 1007 -> 0 bytes .../default_100_percent/mediaplayer_play_down.png | Bin 5591 -> 0 bytes .../default_100_percent/mediaplayer_play_hover.png | Bin 5434 -> 0 bytes .../mediaplayer_slider_thumb.png | Bin 4035 -> 0 bytes .../mediaplayer_slider_thumb_down.png | Bin 5450 -> 0 bytes .../mediaplayer_slider_thumb_hover.png | Bin 5294 -> 0 bytes .../mediaplayer_sound_disabled.png | Bin 1283 -> 0 bytes .../mediaplayer_sound_level0.png | Bin 1051 -> 0 bytes .../mediaplayer_sound_level0_down.png | Bin 10516 -> 0 bytes .../mediaplayer_sound_level0_hover.png | Bin 10396 -> 0 bytes .../mediaplayer_sound_level1.png | Bin 962 -> 0 bytes .../mediaplayer_sound_level1_down.png | Bin 5440 -> 0 bytes .../mediaplayer_sound_level1_hover.png | Bin 5257 -> 0 bytes .../mediaplayer_sound_level2.png | Bin 1263 -> 0 bytes .../mediaplayer_sound_level2_down.png | Bin 10327 -> 0 bytes .../mediaplayer_sound_level2_hover.png | Bin 10113 -> 0 bytes .../mediaplayer_sound_level3.png | Bin 1669 -> 0 bytes .../mediaplayer_sound_level3_down.png | Bin 12290 -> 0 bytes .../mediaplayer_sound_level3_hover.png | Bin 12122 -> 0 bytes .../mediaplayer_volume_slider_thumb.png | Bin 3749 -> 0 bytes .../mediaplayer_volume_slider_thumb_disabled.png | Bin 2516 -> 0 bytes .../mediaplayer_volume_slider_thumb_down.png | Bin 4941 -> 0 bytes .../mediaplayer_volume_slider_thumb_hover.png | Bin 4773 -> 0 bytes .../app/resources/default_100_percent/pan_icon.png | Bin 136 -> 0 bytes .../default_100_percent/password_generation.png | Bin 407 -> 0 bytes .../password_generation_hover.png | Bin 408 -> 0 bytes .../default_100_percent/search_cancel.png | Bin 744 -> 0 bytes .../default_100_percent/search_cancel_pressed.png | Bin 761 -> 0 bytes .../default_100_percent/search_magnifier.png | Bin 872 -> 0 bytes .../search_magnifier_results.png | Bin 1040 -> 0 bytes .../default_100_percent/textarea_resize_corner.png | Bin 92 -> 0 bytes .../resources/default_200_percent/broken_image.png | Bin 810 -> 0 bytes .../app/resources/default_200_percent/pan_icon.png | Bin 141 -> 0 bytes .../default_200_percent/textarea_resize_corner.png | Bin 147 -> 0 bytes content/child/blink_platform_impl.cc | 100 ++++++++++----------- content/content_shell.gypi | 2 +- content/shell/BUILD.gn | 2 +- content/shell/common/shell_content_client.cc | 5 +- extensions/BUILD.gn | 2 +- extensions/extensions.gyp | 2 +- mojo/services/html_viewer/BUILD.gn | 3 +- .../html_viewer/blink_resource_constants.h | 56 ++++++++++++ .../html_viewer/generate_blink_resource_map.py | 5 -- tools/gritsettings/resource_ids | 4 +- 68 files changed, 126 insertions(+), 117 deletions(-) delete mode 100644 content/app/resources/default_100_percent/broken_image.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_cast_off.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_cast_on.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_closedcaption.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_fullscreen.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_overlay_play.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_pause.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_pause_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_pause_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_play.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_play_disabled.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_play_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_play_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_slider_thumb.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_disabled.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level0.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level1.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level2.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level3.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png delete mode 100644 content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png delete mode 100644 content/app/resources/default_100_percent/pan_icon.png delete mode 100644 content/app/resources/default_100_percent/password_generation.png delete mode 100644 content/app/resources/default_100_percent/password_generation_hover.png delete mode 100644 content/app/resources/default_100_percent/search_cancel.png delete mode 100644 content/app/resources/default_100_percent/search_cancel_pressed.png delete mode 100644 content/app/resources/default_100_percent/search_magnifier.png delete mode 100644 content/app/resources/default_100_percent/search_magnifier_results.png delete mode 100644 content/app/resources/default_100_percent/textarea_resize_corner.png delete mode 100644 content/app/resources/default_200_percent/broken_image.png delete mode 100644 content/app/resources/default_200_percent/pan_icon.png delete mode 100644 content/app/resources/default_200_percent/textarea_resize_corner.png diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index e78dabe..ca004138 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -20,7 +20,7 @@ 'action_name': 'repack_android_webview_pack', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index f6bb6b7..c4ca42f 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -484,7 +484,6 @@ repack("packed_extra_resources") { } if (!is_ios) { sources += [ - "$root_gen_dir/blink/public/resources/blink_resources.pak", "$root_gen_dir/content/browser/tracing/tracing_resources.pak", "$root_gen_dir/content/content_resources.pak", ] @@ -587,7 +586,10 @@ template("chrome_repack_percent") { ] if (!is_ios) { - sources += [ "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak" ] + sources += [ + "$root_gen_dir/blink/public/resources/blink_resources_${percent}_percent.pak", + "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak", + ] deps += [ "//content:resources" ] } if (use_ash) { diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index c585684..ded84b0b 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -15,6 +15,7 @@ 'conditions': [ ['OS != "ios"', { 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', ], }], diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index 2aff0e5..5257327 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -15,6 +15,7 @@ 'conditions': [ ['OS != "ios"', { 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_200_percent.pak', ], }], diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 1cc88e5..26a88e6 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -29,7 +29,7 @@ }], ['OS != "ios"', { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', ], diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp index 98df0ee..32ceb8b 100644 --- a/chromecast/chromecast.gyp +++ b/chromecast/chromecast.gyp @@ -122,7 +122,7 @@ 'action_name': 'repack_cast_shell_pak', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/chromecast/shell_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', diff --git a/content/app/resources/content_resources.grd b/content/app/resources/content_resources.grd index 9e90cd5..75913e3 100644 --- a/content/app/resources/content_resources.grd +++ b/content/app/resources/content_resources.grd @@ -9,46 +9,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -74,14 +34,6 @@ - - - - - - - - diff --git a/content/app/resources/default_100_percent/broken_image.png b/content/app/resources/default_100_percent/broken_image.png deleted file mode 100644 index ad76cc1..0000000 Binary files a/content/app/resources/default_100_percent/broken_image.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_cast_off.png b/content/app/resources/default_100_percent/mediaplayer_cast_off.png deleted file mode 100644 index 050022d..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_cast_off.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_cast_on.png b/content/app/resources/default_100_percent/mediaplayer_cast_on.png deleted file mode 100644 index 4f24bf9..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_cast_on.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption.png deleted file mode 100644 index a92b3d2..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_closedcaption.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png deleted file mode 100644 index 7ac1a89..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png deleted file mode 100644 index 60da8a2..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png deleted file mode 100644 index a3e069f..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen.png deleted file mode 100644 index 713a877..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_fullscreen.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png deleted file mode 100644 index f0958a6..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png deleted file mode 100644 index 3a6cd5d..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png deleted file mode 100644 index 38e3330..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png b/content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png deleted file mode 100644 index e16f58e..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_overlay_play.png b/content/app/resources/default_100_percent/mediaplayer_overlay_play.png deleted file mode 100644 index cfd48d7..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_overlay_play.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_pause.png b/content/app/resources/default_100_percent/mediaplayer_pause.png deleted file mode 100644 index b488e97..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_pause.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_pause_down.png b/content/app/resources/default_100_percent/mediaplayer_pause_down.png deleted file mode 100644 index bf754e9..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_pause_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_pause_hover.png b/content/app/resources/default_100_percent/mediaplayer_pause_hover.png deleted file mode 100644 index ac3334c..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_pause_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_play.png b/content/app/resources/default_100_percent/mediaplayer_play.png deleted file mode 100644 index 1e53d43..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_play.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_play_disabled.png b/content/app/resources/default_100_percent/mediaplayer_play_disabled.png deleted file mode 100644 index 8e12200..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_play_disabled.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_play_down.png b/content/app/resources/default_100_percent/mediaplayer_play_down.png deleted file mode 100644 index fa6a243..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_play_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_play_hover.png b/content/app/resources/default_100_percent/mediaplayer_play_hover.png deleted file mode 100644 index a71c2f3..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_play_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png b/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png deleted file mode 100644 index 4cc24d1..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png b/content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png deleted file mode 100644 index 483101d..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png b/content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png deleted file mode 100644 index 2a96842..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png b/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png deleted file mode 100644 index 38fa4ba..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level0.png b/content/app/resources/default_100_percent/mediaplayer_sound_level0.png deleted file mode 100644 index 22d6a10..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level0.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png deleted file mode 100644 index d956e58..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png deleted file mode 100644 index 56214a1..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level1.png b/content/app/resources/default_100_percent/mediaplayer_sound_level1.png deleted file mode 100644 index 2c6809a..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level1.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png deleted file mode 100644 index faa1888..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png deleted file mode 100644 index 1fdaf21..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level2.png b/content/app/resources/default_100_percent/mediaplayer_sound_level2.png deleted file mode 100644 index e98c51d..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level2.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png deleted file mode 100644 index 37f5d76..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png deleted file mode 100644 index e44356b..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level3.png b/content/app/resources/default_100_percent/mediaplayer_sound_level3.png deleted file mode 100644 index 05caa64..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level3.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png deleted file mode 100644 index db38404..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png deleted file mode 100644 index 838b07f..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png deleted file mode 100644 index c4620f5..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png deleted file mode 100644 index d32434b..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png deleted file mode 100644 index 98ee850..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png deleted file mode 100644 index 93cca9b..0000000 Binary files a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/pan_icon.png b/content/app/resources/default_100_percent/pan_icon.png deleted file mode 100644 index e07d962..0000000 Binary files a/content/app/resources/default_100_percent/pan_icon.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/password_generation.png b/content/app/resources/default_100_percent/password_generation.png deleted file mode 100644 index 2b45ac3..0000000 Binary files a/content/app/resources/default_100_percent/password_generation.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/password_generation_hover.png b/content/app/resources/default_100_percent/password_generation_hover.png deleted file mode 100644 index a832cdc..0000000 Binary files a/content/app/resources/default_100_percent/password_generation_hover.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/search_cancel.png b/content/app/resources/default_100_percent/search_cancel.png deleted file mode 100644 index 1291bf8..0000000 Binary files a/content/app/resources/default_100_percent/search_cancel.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/search_cancel_pressed.png b/content/app/resources/default_100_percent/search_cancel_pressed.png deleted file mode 100644 index 4abc0fd..0000000 Binary files a/content/app/resources/default_100_percent/search_cancel_pressed.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/search_magnifier.png b/content/app/resources/default_100_percent/search_magnifier.png deleted file mode 100644 index 0aea5da..0000000 Binary files a/content/app/resources/default_100_percent/search_magnifier.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/search_magnifier_results.png b/content/app/resources/default_100_percent/search_magnifier_results.png deleted file mode 100644 index 2f773c06..0000000 Binary files a/content/app/resources/default_100_percent/search_magnifier_results.png and /dev/null differ diff --git a/content/app/resources/default_100_percent/textarea_resize_corner.png b/content/app/resources/default_100_percent/textarea_resize_corner.png deleted file mode 100644 index a379bdd..0000000 Binary files a/content/app/resources/default_100_percent/textarea_resize_corner.png and /dev/null differ diff --git a/content/app/resources/default_200_percent/broken_image.png b/content/app/resources/default_200_percent/broken_image.png deleted file mode 100644 index 45edebc..0000000 Binary files a/content/app/resources/default_200_percent/broken_image.png and /dev/null differ diff --git a/content/app/resources/default_200_percent/pan_icon.png b/content/app/resources/default_200_percent/pan_icon.png deleted file mode 100644 index d9c0c15..0000000 Binary files a/content/app/resources/default_200_percent/pan_icon.png and /dev/null differ diff --git a/content/app/resources/default_200_percent/textarea_resize_corner.png b/content/app/resources/default_200_percent/textarea_resize_corner.png deleted file mode 100644 index 77fa3ca..0000000 Binary files a/content/app/resources/default_200_percent/textarea_resize_corner.png and /dev/null differ diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc index 92bef2e..db0ba13 100644 --- a/content/child/blink_platform_impl.cc +++ b/content/child/blink_platform_impl.cc @@ -738,95 +738,95 @@ struct DataResource { }; const DataResource kDataResources[] = { - { "missingImage", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_100P }, - { "missingImage@2x", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_200P }, - { "mediaplayerPause", IDR2_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P }, + { "missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P }, + { "missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P }, + { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerPauseHover", - IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerPauseDown", - IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, - { "mediaplayerPlay", IDR2_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerPlayHover", - IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerPlayDown", - IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerPlayDisabled", - IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel3", - IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel3Hover", - IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel3Down", - IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel2", - IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel2Hover", - IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel2Down", - IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel1", - IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel1Hover", - IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel1Down", - IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel0", - IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel0Hover", - IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundLevel0Down", - IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerSoundDisabled", - IDR2_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P }, { "mediaplayerSliderThumb", - IDR2_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P }, { "mediaplayerSliderThumbHover", - IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerSliderThumbDown", - IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerVolumeSliderThumb", - IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P }, { "mediaplayerVolumeSliderThumbHover", - IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerVolumeSliderThumbDown", - IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerVolumeSliderThumbDisabled", - IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P }, { "mediaplayerClosedCaption", - IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerClosedCaptionHover", - IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerClosedCaptionDown", - IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerClosedCaptionDisabled", - IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, { "mediaplayerFullscreen", - IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, { "mediaplayerFullscreenHover", - IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, { "mediaplayerFullscreenDown", - IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, { "mediaplayerCastOff", - IDR2_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, { "mediaplayerCastOn", - IDR2_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P }, { "mediaplayerFullscreenDisabled", - IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, { "mediaplayerOverlayCastOff", - IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, { "mediaplayerOverlayPlay", - IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, - { "panIcon", IDR2_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, - { "searchCancel", IDR2_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, - { "searchCancelPressed", IDR2_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, - { "searchMagnifier", IDR2_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, + IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, + { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, + { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, + { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, + { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, { "searchMagnifierResults", - IDR2_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, - { "textAreaResizeCorner", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, - { "textAreaResizeCorner@2x", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, - { "generatePassword", IDR2_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, + IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, + { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, + { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, + { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, { "generatePasswordHover", - IDR2_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, + IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, { "html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE }, { "quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE }, { "view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE }, diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 7339490..c592ede 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -500,7 +500,7 @@ 'action_name': 'repack_content_shell_pack', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 96cee7c..87d31bf 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -452,7 +452,7 @@ group("resources") { repack("pak") { sources = [ - "$root_gen_dir/blink/public/resources/blink_resources.pak", + "$root_gen_dir/blink/public/resources/blink_resources_100_percent.pak", "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", "$root_gen_dir/content/app/strings/content_strings_en-US.pak", "$root_gen_dir/content/browser/tracing/tracing_resources.pak", diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc index 9b9781d..a438823 100644 --- a/content/shell/common/shell_content_client.cc +++ b/content/shell/common/shell_content_client.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" +#include "blink/public/resources/grit/blink_resources.h" #include "content/app/resources/grit/content_resources.h" #include "content/app/strings/grit/content_strings.h" #include "content/public/common/content_switches.h" @@ -64,7 +65,7 @@ base::StringPiece ShellContentClient::GetDataResource( if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kRunLayoutTest)) { switch (resource_id) { - case IDR2_BROKENIMAGE: + case IDR_BROKENIMAGE: #if defined(OS_MACOSX) resource_id = IDR_CONTENT_SHELL_MISSING_IMAGE_PNG; #else @@ -72,7 +73,7 @@ base::StringPiece ShellContentClient::GetDataResource( #endif break; - case IDR2_TEXTAREA_RESIZER: + case IDR_TEXTAREA_RESIZER: resource_id = IDR_CONTENT_SHELL_TEXT_AREA_RESIZE_CORNER_PNG; break; } diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index ad3960a..73879f5 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -99,7 +99,7 @@ source_set("test_support") { repack("shell_and_test_pak") { sources = [ "$root_gen_dir/blink/devtools_resources.pak", - "$root_gen_dir/blink/public/resources/blink_resources.pak", + "$root_gen_dir/blink/public/resources/blink_resources_100_percent.pak", "$root_gen_dir/content/app/strings/content_strings_en-US.pak", "$root_gen_dir/content/content_resources.pak", "$root_gen_dir/content/shell/shell_resources.pak", diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 797d4cc..e52dfe6 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -289,7 +289,7 @@ 'action_name': 'repack_extensions_shell_and_test_pak', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn index b776d38..e470e51 100644 --- a/mojo/services/html_viewer/BUILD.gn +++ b/mojo/services/html_viewer/BUILD.gn @@ -10,7 +10,8 @@ action("generate_blink_resource_map") { script = "//mojo/services/html_viewer/generate_blink_resource_map.py" args = [ "--pak-file", - rebase_path("$root_out_dir/gen/blink/public/resources/blink_resources.pak"), + rebase_path( + "$root_out_dir/gen/blink/public/resources/blink_resources_100_percent.pak"), "--header", rebase_path("$target_gen_dir/blink_resource_map.h"), "--cpp", diff --git a/mojo/services/html_viewer/blink_resource_constants.h b/mojo/services/html_viewer/blink_resource_constants.h index c51afdf..0091b03 100644 --- a/mojo/services/html_viewer/blink_resource_constants.h +++ b/mojo/services/html_viewer/blink_resource_constants.h @@ -15,6 +15,62 @@ struct DataResource { }; const DataResource kDataResources[] = { + {"missingImage", IDR_BROKENIMAGE}, + // Skipping missingImage@2x + {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON}, + {"mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER}, + {"mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN}, + {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON}, + {"mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER}, + {"mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN}, + {"mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED}, + {"mediaplayerSoundLevel3", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON}, + {"mediaplayerSoundLevel3Hover", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER}, + {"mediaplayerSoundLevel3Down", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN}, + {"mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON}, + {"mediaplayerSoundLevel2Hover", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER}, + {"mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN}, + {"mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON}, + {"mediaplayerSoundLevel1Hover", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER}, + {"mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN}, + {"mediaplayerSoundLevel0", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON}, + {"mediaplayerSoundLevel0Hover", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER}, + {"mediaplayerSoundLevel0Down", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN}, + {"mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED}, + {"mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB}, + {"mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER}, + {"mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN}, + {"mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB}, + {"mediaplayerVolumeSliderThumbHover", + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER}, + {"mediaplayerVolumeSliderThumbDown", + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN}, + {"mediaplayerVolumeSliderThumbDisabled", + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED}, + {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON}, + {"mediaplayerClosedCaptionHover", + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER}, + {"mediaplayerClosedCaptionDown", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN}, + {"mediaplayerClosedCaptionDisabled", + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED}, + {"mediaplayerFullscreen", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON}, + {"mediaplayerFullscreenHover", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER}, + {"mediaplayerFullscreenDown", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN}, + {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF}, + {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON}, + {"mediaplayerFullscreenDisabled", + IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED}, + {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF}, + {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON}, + {"panIcon", IDR_PAN_SCROLL_ICON}, + {"searchCancel", IDR_SEARCH_CANCEL}, + {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED}, + {"searchMagnifier", IDR_SEARCH_MAGNIFIER}, + {"searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS}, + {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER}, + // Skipping "textAreaResizeCorner@2x" + {"generatePassword", IDR_PASSWORD_GENERATION_ICON}, + {"generatePasswordHover", IDR_PASSWORD_GENERATION_ICON_HOVER}, {"html.css", IDR_UASTYLE_HTML_CSS}, {"quirks.css", IDR_UASTYLE_QUIRKS_CSS}, {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS}, diff --git a/mojo/services/html_viewer/generate_blink_resource_map.py b/mojo/services/html_viewer/generate_blink_resource_map.py index 4044154..5275d01 100644 --- a/mojo/services/html_viewer/generate_blink_resource_map.py +++ b/mojo/services/html_viewer/generate_blink_resource_map.py @@ -17,9 +17,6 @@ except ImportError, e: print 'ImportError: ', e sys.exit(-1) -def is_ascii(s): - return all(ord(c) < 128 for c in s) - header_template = \ """// Copyright 2015 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -117,8 +114,6 @@ def main(): definitions = [] for (resId, data) in pak_contents.resources.iteritems(): - if not is_ascii(data): - continue resourceIds.append(resId) hex_values = ['0x{0:02x}'.format(ord(char)) for char in data] f = lambda A, n=12: [A[i:i+n] for i in range(0, len(A), n)] diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 43a4315..659523b 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -234,10 +234,10 @@ "messages": [30000], }, "components/resources/components_resources.grd": { - "includes": [30250], + "includes": [30225], }, "components/resources/components_scaled_resources.grd": { - "structures": [30300], + "structures": [30280], }, "third_party/WebKit/public/blink_resources.grd": { "includes": [30350], -- cgit v1.1