diff options
68 files changed, 126 insertions, 117 deletions
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 @@ </outputs> <release seq="1"> <structures fallback_to_low_resolution="true"> - <structure type="chrome_scaled_image" name="IDR2_BROKENIMAGE" file="broken_image.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON" file="mediaplayer_pause.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER" file="mediaplayer_pause_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN" file="mediaplayer_pause_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON" file="mediaplayer_play.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER" file="mediaplayer_play_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN" file="mediaplayer_play_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED" file="mediaplayer_play_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON" file="mediaplayer_sound_level3.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER" file="mediaplayer_sound_level3_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN" file="mediaplayer_sound_level3_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON" file="mediaplayer_sound_level2.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER" file="mediaplayer_sound_level2_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN" file="mediaplayer_sound_level2_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON" file="mediaplayer_sound_level1.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER" file="mediaplayer_sound_level1_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN" file="mediaplayer_sound_level1_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON" file="mediaplayer_sound_level0.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER" file="mediaplayer_sound_level0_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN" file="mediaplayer_sound_level0_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_DISABLED" file="mediaplayer_sound_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB" file="mediaplayer_slider_thumb.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER" file="mediaplayer_slider_thumb_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN" file="mediaplayer_slider_thumb_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="mediaplayer_volume_slider_thumb.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="mediaplayer_volume_slider_thumb_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="mediaplayer_volume_slider_thumb_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED" file="mediaplayer_volume_slider_thumb_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON" file="mediaplayer_closedcaption.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER" file="mediaplayer_closedcaption_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN" file="mediaplayer_closedcaption_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED" file="mediaplayer_closedcaption_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON" file="mediaplayer_fullscreen.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER" file="mediaplayer_fullscreen_hover.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN" file="mediaplayer_fullscreen_down.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED" file="mediaplayer_fullscreen_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CAST_BUTTON_OFF" file="mediaplayer_cast_off.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CAST_BUTTON_ON" file="mediaplayer_cast_on.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF" file="mediaplayer_overlay_cast_off.png" /> - <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON" file="mediaplayer_overlay_play.png" /> <if expr="is_macosx"> <structure type="chrome_scaled_image" name="IDR_ALIAS_CURSOR" file="alias_cursor.png" /> <structure type="chrome_scaled_image" name="IDR_CELL_CURSOR" file="cell_cursor.png" /> @@ -74,14 +34,6 @@ <structure type="chrome_scaled_image" name="IDR_ZOOMIN_CURSOR" file="zoom_in_cursor.png" /> <structure type="chrome_scaled_image" name="IDR_ZOOMOUT_CURSOR" file="zoom_out_cursor.png" /> </if> - <structure type="chrome_scaled_image" name="IDR2_PAN_SCROLL_ICON" file="pan_icon.png" /> - <structure type="chrome_scaled_image" name="IDR2_SEARCH_CANCEL" file="search_cancel.png" /> - <structure type="chrome_scaled_image" name="IDR2_SEARCH_CANCEL_PRESSED" file="search_cancel_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR2_SEARCH_MAGNIFIER" file="search_magnifier.png" /> - <structure type="chrome_scaled_image" name="IDR2_SEARCH_MAGNIFIER_RESULTS" file="search_magnifier_results.png" /> - <structure type="chrome_scaled_image" name="IDR2_TEXTAREA_RESIZER" file="textarea_resize_corner.png" /> - <structure type="chrome_scaled_image" name="IDR2_PASSWORD_GENERATION_ICON" file="password_generation.png" /> - <structure type="chrome_scaled_image" name="IDR2_PASSWORD_GENERATION_ICON_HOVER" file="password_generation_hover.png" /> </structures> </release> </grit> diff --git a/content/app/resources/default_100_percent/broken_image.png b/content/app/resources/default_100_percent/broken_image.png Binary files differdeleted file mode 100644 index ad76cc1..0000000 --- a/content/app/resources/default_100_percent/broken_image.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_cast_off.png b/content/app/resources/default_100_percent/mediaplayer_cast_off.png Binary files differdeleted file mode 100644 index 050022d..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_cast_off.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_cast_on.png b/content/app/resources/default_100_percent/mediaplayer_cast_on.png Binary files differdeleted file mode 100644 index 4f24bf9..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_cast_on.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption.png Binary files differdeleted file mode 100644 index a92b3d2..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_closedcaption.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png Binary files differdeleted file mode 100644 index 7ac1a89..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png Binary files differdeleted file mode 100644 index 60da8a2..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png Binary files differdeleted file mode 100644 index a3e069f..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen.png Binary files differdeleted file mode 100644 index 713a877..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_fullscreen.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png Binary files differdeleted file mode 100644 index f0958a6..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png Binary files differdeleted file mode 100644 index 3a6cd5d..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png Binary files differdeleted file mode 100644 index 38e3330..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index e16f58e..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_overlay_play.png b/content/app/resources/default_100_percent/mediaplayer_overlay_play.png Binary files differdeleted file mode 100644 index cfd48d7..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_overlay_play.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_pause.png b/content/app/resources/default_100_percent/mediaplayer_pause.png Binary files differdeleted file mode 100644 index b488e97..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_pause.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_pause_down.png b/content/app/resources/default_100_percent/mediaplayer_pause_down.png Binary files differdeleted file mode 100644 index bf754e9..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_pause_down.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_pause_hover.png b/content/app/resources/default_100_percent/mediaplayer_pause_hover.png Binary files differdeleted file mode 100644 index ac3334c..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_pause_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_play.png b/content/app/resources/default_100_percent/mediaplayer_play.png Binary files differdeleted file mode 100644 index 1e53d43..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_play.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_play_disabled.png b/content/app/resources/default_100_percent/mediaplayer_play_disabled.png Binary files differdeleted file mode 100644 index 8e12200..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_play_disabled.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_play_down.png b/content/app/resources/default_100_percent/mediaplayer_play_down.png Binary files differdeleted file mode 100644 index fa6a243..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_play_down.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_play_hover.png b/content/app/resources/default_100_percent/mediaplayer_play_hover.png Binary files differdeleted file mode 100644 index a71c2f3..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_play_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png b/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png Binary files differdeleted file mode 100644 index 4cc24d1..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 483101d..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2a96842..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png b/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png Binary files differdeleted file mode 100644 index 38fa4ba..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level0.png b/content/app/resources/default_100_percent/mediaplayer_sound_level0.png Binary files differdeleted file mode 100644 index 22d6a10..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level0.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d956e58..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 56214a1..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level1.png b/content/app/resources/default_100_percent/mediaplayer_sound_level1.png Binary files differdeleted file mode 100644 index 2c6809a..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level1.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index faa1888..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1fdaf21..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level2.png b/content/app/resources/default_100_percent/mediaplayer_sound_level2.png Binary files differdeleted file mode 100644 index e98c51d..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level2.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 37f5d76..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index e44356b..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level3.png b/content/app/resources/default_100_percent/mediaplayer_sound_level3.png Binary files differdeleted file mode 100644 index 05caa64..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level3.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index db38404..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 838b07f..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index c4620f5..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d32434b..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 98ee850..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index 93cca9b..0000000 --- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/pan_icon.png b/content/app/resources/default_100_percent/pan_icon.png Binary files differdeleted file mode 100644 index e07d962..0000000 --- a/content/app/resources/default_100_percent/pan_icon.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/password_generation.png b/content/app/resources/default_100_percent/password_generation.png Binary files differdeleted file mode 100644 index 2b45ac3..0000000 --- a/content/app/resources/default_100_percent/password_generation.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/password_generation_hover.png b/content/app/resources/default_100_percent/password_generation_hover.png Binary files differdeleted file mode 100644 index a832cdc..0000000 --- a/content/app/resources/default_100_percent/password_generation_hover.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/search_cancel.png b/content/app/resources/default_100_percent/search_cancel.png Binary files differdeleted file mode 100644 index 1291bf8..0000000 --- a/content/app/resources/default_100_percent/search_cancel.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/search_cancel_pressed.png b/content/app/resources/default_100_percent/search_cancel_pressed.png Binary files differdeleted file mode 100644 index 4abc0fd..0000000 --- a/content/app/resources/default_100_percent/search_cancel_pressed.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/search_magnifier.png b/content/app/resources/default_100_percent/search_magnifier.png Binary files differdeleted file mode 100644 index 0aea5da..0000000 --- a/content/app/resources/default_100_percent/search_magnifier.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/search_magnifier_results.png b/content/app/resources/default_100_percent/search_magnifier_results.png Binary files differdeleted file mode 100644 index 2f773c06..0000000 --- a/content/app/resources/default_100_percent/search_magnifier_results.png +++ /dev/null diff --git a/content/app/resources/default_100_percent/textarea_resize_corner.png b/content/app/resources/default_100_percent/textarea_resize_corner.png Binary files differdeleted file mode 100644 index a379bdd..0000000 --- a/content/app/resources/default_100_percent/textarea_resize_corner.png +++ /dev/null diff --git a/content/app/resources/default_200_percent/broken_image.png b/content/app/resources/default_200_percent/broken_image.png Binary files differdeleted file mode 100644 index 45edebc..0000000 --- a/content/app/resources/default_200_percent/broken_image.png +++ /dev/null diff --git a/content/app/resources/default_200_percent/pan_icon.png b/content/app/resources/default_200_percent/pan_icon.png Binary files differdeleted file mode 100644 index d9c0c15..0000000 --- a/content/app/resources/default_200_percent/pan_icon.png +++ /dev/null diff --git a/content/app/resources/default_200_percent/textarea_resize_corner.png b/content/app/resources/default_200_percent/textarea_resize_corner.png Binary files differdeleted file mode 100644 index 77fa3ca..0000000 --- a/content/app/resources/default_200_percent/textarea_resize_corner.png +++ /dev/null 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], |
