Select theme resources from ResourceBundle at requested scale factor.

Return the best match for a requested scale factor when fetching raw image data from ResourceBundle.

TBR=aa,abodenha

BUG=123611
TEST=ResourceBundle.LoadImageResourceBytes


Review URL: https://chromiumcodereview.appspot.com/10387010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137734 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 2 deletions

diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc
index 0fa97a8..e1d8c14 100644
--- a/ui/base/resource/data_pack.cc
+++ b/ui/base/resource/data_pack.cc
@@ -61,7 +61,7 @@ enum LoadErrors {
 
 namespace ui {
 
-DataPack::DataPack(float scale_factor)
+DataPack::DataPack(ui::ScaleFactor scale_factor)
     : resource_count_(0),
       text_encoding_type_(BINARY),
       scale_factor_(scale_factor) {
@@ -145,6 +145,11 @@ bool DataPack::Load(const FilePath& path) {
   return true;
 }
 
+bool DataPack::HasResource(uint16 resource_id) const {
+  return !!bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
+                   sizeof(DataPackEntry), DataPackEntry::CompareById);
+}
+
 bool DataPack::GetStringPiece(uint16 resource_id,
                               base::StringPiece* data) const {
   // It won't be hard to make this endian-agnostic, but it's not worth
@@ -186,7 +191,7 @@ ResourceHandle::TextEncodingType DataPack::GetTextEncodingType() const {
   return text_encoding_type_;
 }
 
-float DataPack::GetScaleFactor() const {
+ui::ScaleFactor DataPack::GetScaleFactor() const {
   return scale_factor_;
 }