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

Unified Diff: ui/base/resource/resource_bundle.h

Issue 11301007: Load the resources for max scale factor first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/layout_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index de547fcabd796477070566ed0118b47b1ec59576..3c4f3cbafa44ebc59813ce77f9f7fcdd6bbce667 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -310,9 +310,11 @@ class UI_EXPORT ResourceBundle {
bool* fell_back_to_1x) const;
// Fills the |bitmap| given the |resource_id| and |scale_factor|.
- // Returns false if the resource does not exist.
+ // Returns false if the resource does not exist. This may fall back to
+ // the data pack with SCALE_FACTOR_NONE, and when this happens,
+ // |scale_factor| will be set to SCALE_FACTOR_100P.
bool LoadBitmap(int resource_id,
- ScaleFactor scale_factor,
+ ScaleFactor* scale_factor,
SkBitmap* bitmap,
bool* fell_back_to_1x) const;
« no previous file with comments | « ui/base/layout_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698