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

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed)

Created:
9 years, 10 months ago by Robert Sesek
Modified:
9 years, 7 months ago
Reviewers:
TVL
CC:
chromium-reviews, James Hawkins, Ilya Sherman, Paweł Hajdan Jr., pam+watch_chromium.org, dhollowa
Visibility:
Public.

Description

Integrate gfx::Image into the ResourceBundle. This changes the definition of GetNativeImageNamed to return a gfx::Image and adds GetImageNamed in addition. GetBitmapNamed now goes through that method. On Linux, GetNativeImageNamed will load directly into a GdkPixbuf-backed Image. Mac will still first load through Skia (a future CL will load directly into an NSImage). All other platforms use Skia natively, so GetNativeImageNamed is the same as GetImageNamed. Mac was the only platform that used the old GetNativeImageNamed, so this also transitions a bunch of Mac files by including ui/gfx/image.h. This also obviates the need for platform-specific image caches in the ResourceBundle, so there's some additional cleanup around that. BUG=carnitas TEST=All UI images in Chromium show up as before. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=75605

Patch Set 1 #

Total comments: 6

Patch Set 2 : Add some comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+147 lines, -171 lines) Patch
M chrome/browser/autocomplete/autocomplete_edit_view_mac.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/autofill/autofill_dialog_controller_mac.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/page_info_model.h View 3 chunks +3 lines, -8 lines 0 comments Download
M chrome/browser/page_info_model.cc View 4 chunks +6 lines, -30 lines 0 comments Download
M chrome/browser/ui/cocoa/about_window_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/download/download_item_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/download/download_shelf_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/download/download_started_animation_mac.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/history_menu_bridge.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/hover_image_button_unittest.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/hung_renderer_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/options/cookies_window_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/options/preferences_window_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/page_info_bubble_controller.mm View 2 chunks +2 lines, -1 line 0 comments Download
M chrome/browser/ui/cocoa/search_engine_dialog_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/speech_input_window_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/tabpose_window.mm View 1 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/gtk/page_info_bubble_gtk.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/ui/views/page_info_bubble_view.cc View 3 chunks +3 lines, -2 lines 0 comments Download
M chrome/default_plugin/plugin_impl_mac.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/default_plugin/plugin_impl_mac.mm View 3 chunks +2 lines, -2 lines 0 comments Download
M ui/base/resource/resource_bundle.h View 1 7 chunks +25 lines, -26 lines 0 comments Download
M ui/base/resource/resource_bundle.cc View 5 chunks +49 lines, -46 lines 0 comments Download
M ui/base/resource/resource_bundle_linux.cc View 4 chunks +21 lines, -39 lines 0 comments Download
M ui/base/resource/resource_bundle_mac.mm View 1 chunk +5 lines, -9 lines 0 comments Download
M ui/base/resource/resource_bundle_posix.cc View 1 chunk +0 lines, -3 lines 0 comments Download
M ui/gfx/image.h View 1 2 chunks +4 lines, -3 lines 0 comments Download
M ui/gfx/image.cc View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 5 (0 generated)
Robert Sesek
9 years, 10 months ago (2011-02-18 20:31:47 UTC) #1
TVL
http://codereview.chromium.org/6541031/diff/1/chrome/default_plugin/plugin_impl_mac.h File chrome/default_plugin/plugin_impl_mac.h (right): http://codereview.chromium.org/6541031/diff/1/chrome/default_plugin/plugin_impl_mac.h#newcode288 chrome/default_plugin/plugin_impl_mac.h:288: // Plugin icon, weak (owned by ResourceBundle). this seems ...
9 years, 10 months ago (2011-02-18 21:19:12 UTC) #2
TVL
Given the native and skia paths, I'm also worried about odd color transforms. Since what ...
9 years, 10 months ago (2011-02-18 21:24:25 UTC) #3
Robert Sesek
http://codereview.chromium.org/6541031/diff/1/chrome/default_plugin/plugin_impl_mac.h File chrome/default_plugin/plugin_impl_mac.h (right): http://codereview.chromium.org/6541031/diff/1/chrome/default_plugin/plugin_impl_mac.h#newcode288 chrome/default_plugin/plugin_impl_mac.h:288: // Plugin icon, weak (owned by ResourceBundle). On 2011/02/18 ...
9 years, 10 months ago (2011-02-18 21:48:17 UTC) #4
TVL
9 years, 10 months ago (2011-02-18 21:51:16 UTC) #5
lg

Powered by Google App Engine
This is Rietveld 408576698