Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

ui/base/resource/resource_bundle.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
+#include "ui/base/layout.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/native_widget_types.h"
 
 class SkBitmap;
 
 namespace base {
 class Lock;
 class RefCountedStaticMemory;
@@ skipping 31 matching lines @@
 
   // Delegate class that allows interception of pack file loading and resource
   // requests. The methods of this class may be called on multiple threads.
   class Delegate {
    public:
     // Called before a resource pack file is loaded. Return the full path for
     // the pack file to continue loading or an empty value to cancel loading.
     // |pack_path| will contain the complete default path for the pack file if
     // known or just the pack file name otherwise.
     virtual FilePath GetPathForResourcePack(const FilePath& pack_path,
-                                            float scale_factor) = 0;
+                                            ScaleFactor scale_factor) = 0;
 
     // Called before a locale pack file is loaded. Return the full path for
     // the pack file to continue loading or an empty value to cancel loading.
     // |pack_path| will contain the complete default path for the pack file if
     // known or just the pack file name otherwise.
     virtual FilePath GetPathForLocalePack(const FilePath& pack_path,
                                           const std::string& locale) = 0;
 
     // Return an image resource or an empty value to attempt retrieval of the
     // default resource.
     virtual gfx::Image GetImageNamed(int resource_id) = 0;
 
     // Return an image resource or an empty value to attempt retrieval of the
     // default resource.
     virtual gfx::Image GetNativeImageNamed(int resource_id, ImageRTL rtl) = 0;
 
     // Return a static memory resource or NULL to attempt retrieval of the
     // default resource.
     virtual base::RefCountedStaticMemory* LoadDataResourceBytes(
-        int resource_id) = 0;
+        int resource_id,
+        ScaleFactor scale_factor) = 0;
 
     // Retrieve a raw data resource. Return true if a resource was provided or
     // false to attempt retrieval of the default resource.
     virtual bool GetRawDataResource(int resource_id,
+                                    ScaleFactor scale_factor,
                                     base::StringPiece* value) = 0;
 
     // Retrieve a localized string. Return true if a string was provided or
     // false to attempt retrieval of the default string.
     virtual bool GetLocalizedString(int message_id, string16* value) = 0;
 
     // Return a font resource or NULL to attempt retrieval of the default
     // resource.
     virtual scoped_ptr<gfx::Font> GetFont(FontStyle style) = 0;
 
@@ skipping 23 matching lines @@
   // Check if the .pak for the given locale exists.
   bool LocaleDataPakExists(const std::string& locale);
 
   // Registers additional data pack files with this ResourceBundle.  When
   // looking for a DataResource, we will search these files after searching the
   // main module. |path| should be the complete path to the pack file if known
   // or just the pack file name otherwise (the delegate may optionally override
   // this value). |scale_factor| is the scale of images in this resource pak
   // relative to the images in the 1x resource pak. This method is not thread
   // safe! You should call it immediately after calling InitSharedInstance.
-  void AddDataPack(const FilePath& path, float scale_factor);
+  void AddDataPack(const FilePath& path, ScaleFactor scale_factor);
 
   // Changes the locale for an already-initialized ResourceBundle, returning the
   // name of the newly-loaded locale.  Future calls to get strings will return
   // the strings for this new locale.  This has no effect on existing or future
   // image resources.  |locale_resources_data_| is protected by a lock for the
   // duration of the swap, as GetLocalizedString() may be concurrently invoked
   // on another thread.
   std::string ReloadLocaleResources(const std::string& pref_locale);
 
   // Gets the bitmap with the specified resource_id from the current module
@@ skipping 23 matching lines @@
   // Note that if the same resource has already been loaded in GetImageNamed(),
   // gfx::Image will perform a conversion, rather than using the native image
   // loading code of ResourceBundle.
   //
   // If |rtl| is RTL_ENABLED then the image is flipped in RTL locales.
   gfx::Image& GetNativeImageNamed(int resource_id, ImageRTL rtl);
 
   // Same as GetNativeImageNamed() except that RTL is not enabled.
   gfx::Image& GetNativeImageNamed(int resource_id);
 
-  // Loads the raw bytes of a data resource into |bytes|,
-  // without doing any processing or interpretation of
-  // the resource. Returns whether we successfully read the resource.
-  base::RefCountedStaticMemory* LoadDataResourceBytes(int resource_id) const;
+  // Loads the raw bytes of a data resource nearest the scale factor
+  // |scale_factor| into |bytes|, without doing any processing or interpretation
+  // of the resource. Use ResourceHandle::SCALE_FACTOR_NONE for non-image
+  // resources. Returns NULL if we fail to read the resource.
+  base::RefCountedStaticMemory* LoadDataResourceBytes(
+      int resource_id,
+      ScaleFactor scale_factor) const;
 
-  // Return the contents of a resource in a StringPiece given the resource id.
-  base::StringPiece GetRawDataResource(int resource_id) const;
+  // Return the contents of a resource in a StringPiece given the resource id
+  // nearest the scale factor |scale_factor|.
+  // Use ResourceHanlde::SCALE_FACTOR_NONE for non-image resources.
+  base::StringPiece GetRawDataResource(int resource_id,
+                                       ScaleFactor scale_factor) const;
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
   string16 GetLocalizedString(int message_id);
 
   // Returns the font for the specified style.
   const gfx::Font& GetFont(FontStyle style);
 
   // Resets and reloads the cached fonts.  This is useful when the fonts of the
   // system have changed, for example, when the locale has changed.
   void ReloadFonts();
 
   // Overrides the path to the pak file from which the locale resources will be
   // loaded. Pass an empty path to undo.
   void OverrideLocalePakForTest(const FilePath& pak_path);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForResourcePack);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForLocalePack);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetImageNamed);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetNativeImageNamed);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateLoadDataResourceBytes);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetRawDataResource);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetLocalizedString);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetFont);
+  FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetRawDataResource);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes);
   FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LocaleDataPakExists);
 
   // Ctor/dtor are private, since we're a singleton.
   explicit ResourceBundle(Delegate* delegate);
   ~ResourceBundle();
 
   // Free skia_images_.
   void FreeImages();
 
   // Load the main resources.
   void LoadCommonResources();
 
   // Try to load the locale specific strings from an external data module.
   // Returns the locale that is loaded.
   std::string LoadLocaleResources(const std::string& pref_locale);
 
-  // Load test resources in given path.
-  void LoadTestResources(const FilePath& path);
+  // Load test resources in given paths. If either path is empty an empty
+  // resource pack is loaded.
+  void LoadTestResources(const FilePath& path, const FilePath& locale_path);
 
   // Unload the locale specific strings and prepares to load new ones. See
   // comments for ReloadLocaleResources().
   void UnloadLocaleResources();
 
   // Initialize all the gfx::Font members if they haven't yet been initialized.
   void LoadFontsIfNecessary();
 
   // Returns the full pathname of the locale file to load.  May return an empty
   // string if no locale data files are found.
@@ skipping 47 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 }  // namespace ui
 
 // TODO(beng): Someday, maybe, get rid of this.
 using ui::ResourceBundle;
 
 #endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_