| Index: ui/base/resource/data_pack.h
|
| diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h
|
| index 5e3426f8b7df1dfdae813c8a6321b9d1d460bc68..0ac5efedb8b765321c83b602c9d0dcaff25cd7e8 100644
|
| --- a/ui/base/resource/data_pack.h
|
| +++ b/ui/base/resource/data_pack.h
|
| @@ -32,7 +32,7 @@ namespace ui {
|
|
|
| class UI_EXPORT DataPack : public ResourceHandle {
|
| public:
|
| - DataPack();
|
| + DataPack(float scale_factor);
|
| virtual ~DataPack();
|
|
|
| // Load a pack file from |path|, returning false on error.
|
| @@ -52,6 +52,7 @@ class UI_EXPORT DataPack : public ResourceHandle {
|
| virtual base::RefCountedStaticMemory* GetStaticMemory(
|
| uint16 resource_id) const OVERRIDE;
|
| virtual TextEncodingType GetTextEncodingType() const OVERRIDE;
|
| + virtual float GetScaleFactor() const OVERRIDE;
|
|
|
| private:
|
| // The memory-mapped data.
|
| @@ -63,6 +64,10 @@ class UI_EXPORT DataPack : public ResourceHandle {
|
| // Type of encoding for text resources.
|
| TextEncodingType text_encoding_type_;
|
|
|
| + // The scale of the image in this resource pack relative to images in the 1x
|
| + // resource pak.
|
| + float scale_factor_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(DataPack);
|
| };
|
|
|
|
|