Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Issue 10701105: Update webkit_resources to support high-dpi assets (Closed)

Created:
8 years, 5 months ago by Rick Byers
Modified:
8 years, 4 months ago
Reviewers:
brettw, sky
CC:
chromium-reviews, darin-cc_chromium.org, pam+watch_chromium.org, dcheng, Paweł Hajdan Jr., benrg, flackr
Visibility:
Public.

Description

Update webkit_resources to support high-dpi assets Move webkit_resource.grd to be in the same directory as all the resources. This is consistent with what we do elsewhere, and avoids a limitation of the new grit support for chrome_scaled_image (it expects 'context' to be a specific form). Move all the current images into a default_100_percent sub-directory. Images were added to their new location separately (due to try/cq limitations on binary files) here: http://src.chromium.org/viewvc/chrome?view=rev&revision=148389 Add support for the 2x text area resize corner image. Note that I didn't make the .cur files support multiple resolutions because .cur files themselves can contain multiple resolutions, and when we support high-DPI on windows (the only place these are used), we'll probably want to use multi-resolution .cur files so that the cursor seamlessly changes when moving between different density screens. Also fixes the addition of 'hand' cursors to be windows specific (as all the other cursors are now). TBR=sky@chromium.org BUG=134046 TEST= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=149290

Patch Set 1 #

Patch Set 2 : Add build/installer rules for new pak #

Patch Set 3 : Merge with trunk and add flags fowarding to fix issues #

Patch Set 4 : Merge with trunk (images in new location direct submitted) #

Patch Set 5 : Update new grd for recent changes (hand grab cursor) #

Patch Set 6 : Really fix hand grab this time #

Patch Set 7 : Fix cursor path #

Patch Set 8 : Merge with trunk (and update for recent changes) #

Patch Set 9 : Change resource_bundle_mac.mm to load webkit_resources* on Mac as for other platforms #

Unified diffs Side-by-side diffs Delta from patch set Stats (+80 lines, -46 lines) Patch
M chrome/chrome_dll.gypi View 1 2 3 4 5 6 7 1 chunk +1 line, -0 lines 0 comments Download
M chrome/chrome_resources.gyp View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M chrome/installer/mini_installer/chrome.release View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M chrome/tools/build/win/FILES.cfg View 1 2 1 chunk +6 lines, -0 lines 0 comments Download
M content/browser/renderer_host/render_process_host_impl.cc View 1 2 3 4 5 6 7 1 chunk +1 line, -0 lines 0 comments Download
M content/browser/zygote_host/zygote_host_impl_linux.cc View 1 2 2 chunks +5 lines, -0 lines 0 comments Download
M tools/gritsettings/resource_ids View 1 2 1 chunk +2 lines, -1 line 0 comments Download
M ui/base/resource/resource_bundle_aurax11.cc View 1 2 2 chunks +9 lines, -3 lines 0 comments Download
M ui/base/resource/resource_bundle_mac.mm View 1 2 3 4 5 6 7 8 2 chunks +4 lines, -0 lines 0 comments Download
M ui/base/resource/resource_bundle_win.cc View 1 2 3 4 5 6 7 1 chunk +3 lines, -0 lines 0 comments Download
D webkit/glue/resources/amex.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/broken-image.gif View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/cc-generic.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/diners.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/discover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/input_speech.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/input_speech_recording.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/input_speech_waiting.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/jcb.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mastercard.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_pause.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_play.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_play_disabled.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_slider_thumb.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_sound_disabled.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_sound_full.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_sound_none.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/media_volume_slider_thumb.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_fullscreen.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_fullscreen_disabled.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_fullscreen_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_fullscreen_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_overlay_play.png View 1 2 3 4 5 6 7 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_pause.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_pause_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_pause_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_play.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_play_disabled.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_play_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_play_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_slider_thumb.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_slider_thumb_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_slider_thumb_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_disabled.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level0.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level0_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level0_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level1.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level1_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level1_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level2.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level2_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level2_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level3.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level3_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_sound_level3_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_volume_slider_thumb.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_volume_slider_thumb_disabled.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_volume_slider_thumb_down.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/mediaplayer_volume_slider_thumb_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/overhang_pattern.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pan_icon.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/password_generation.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_ftp.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_ftp_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_ftp_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_ftw.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_ftw_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_ftw_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_print.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_print_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_print_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_save.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_save_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_save_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomin.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomin_end.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomin_end_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomin_end_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomin_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomin_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomout.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomout_hover.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_button_zoomout_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_dropshadow.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_page_indicator_background.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_0.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_1.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_2.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_3.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_4.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_5.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_6.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_7.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_8.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_progress_background.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_0.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_1.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_2.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_3.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_4.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_5.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_6.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_7.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_8.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_9.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/pdf_thumbnail_num_background.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/search_cancel.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/search_cancel_pressed.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/search_magnifier.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/search_magnifier_results.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/solo.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/textarea_resize_corner.png View 0 chunks +-1 lines, --1 lines 0 comments Download
D webkit/glue/resources/visa.png View 0 chunks +-1 lines, --1 lines 0 comments Download
A webkit/glue/resources/webkit_resources.grd View 1 2 3 4 5 6 7 1 chunk +150 lines, -0 lines 0 comments Download
M webkit/glue/webkit_glue.gypi View 1 2 1 chunk +1 line, -1 line 0 comments Download
D webkit/glue/webkit_resources.grd View 1 2 3 4 5 6 7 1 chunk +0 lines, -145 lines 0 comments Download

Messages

Total messages: 13 (0 generated)
Rick Byers
Brett, can you please review this change? You're an OWNER for most of the directories, ...
8 years, 4 months ago (2012-07-26 14:05:37 UTC) #1
Rick Byers
On 2012/07/26 14:05:37, Rick Byers wrote: > Brett, can you please review this change? You're ...
8 years, 4 months ago (2012-07-27 20:12:30 UTC) #2
brettw
I'm a bit confused, I see a bunch of deleted resources but don't see where ...
8 years, 4 months ago (2012-07-27 20:47:36 UTC) #3
brettw
Oh, I missed the comment, nevermind.
8 years, 4 months ago (2012-07-27 20:47:53 UTC) #4
brettw
The code is fine as far as I can understand it :)
8 years, 4 months ago (2012-07-27 20:54:27 UTC) #5
brettw
lgtm
8 years, 4 months ago (2012-07-27 20:54:36 UTC) #6
Rick Byers
On 2012/07/27 20:54:36, brettw wrote: > lgtm Thanks Brett. Sky, can I please get your ...
8 years, 4 months ago (2012-07-30 15:25:21 UTC) #7
Rick Byers
On 2012/07/30 15:25:21, Rick Byers wrote: > On 2012/07/27 20:54:36, brettw wrote: > > lgtm ...
8 years, 4 months ago (2012-07-31 18:48:46 UTC) #8
Nico
On 2012/07/31 18:48:46, Rick Byers wrote: > On 2012/07/30 15:25:21, Rick Byers wrote: > > ...
8 years, 4 months ago (2012-07-31 19:57:20 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rbyers@chromium.org/10701105/12007
8 years, 4 months ago (2012-07-31 19:59:26 UTC) #10
Rick Byers
On 2012/07/31 19:57:20, Nico wrote: > On 2012/07/31 18:48:46, Rick Byers wrote: > > On ...
8 years, 4 months ago (2012-07-31 20:03:37 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rbyers@chromium.org/10701105/24001
8 years, 4 months ago (2012-07-31 20:08:34 UTC) #12
commit-bot: I haz the power
8 years, 4 months ago (2012-07-31 22:08:46 UTC) #13
Change committed as 149290

Powered by Google App Engine
This is Rietveld 408576698