diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:15:56 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:15:56 +0000 |
| commit | a6c898d9732a133867229811c43e88274898d93f (patch) | |
| tree | 8fda26c0a149a1a0ae5b4494ea442252cdd64490 /chrome/browser/browser_theme_pack.h | |
| parent | b5c6e3061b38fc9936063c4b95a6fdb36dcd494d (diff) | |
| download | chromium_src-a6c898d9732a133867229811c43e88274898d93f.zip chromium_src-a6c898d9732a133867229811c43e88274898d93f.tar.gz chromium_src-a6c898d9732a133867229811c43e88274898d93f.tar.bz2 | |
This reverts r38541, which reverts previous reverts.
This will re-introduce a mac performance regression but will make the code
correct.
R=mirandac (over shoulder)
BUG=34775,34078
TEST=none
Review URL: http://codereview.chromium.org/600045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_pack.h')
| -rw-r--r-- | chrome/browser/browser_theme_pack.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_theme_pack.h b/chrome/browser/browser_theme_pack.h index b97680a..e9327e4 100644 --- a/chrome/browser/browser_theme_pack.h +++ b/chrome/browser/browser_theme_pack.h @@ -116,6 +116,9 @@ class BrowserThemePack : public base::RefCountedThreadSafe<BrowserThemePack> { FilePath images_path, FilePathMap* file_paths) const; + // Creates the data for |source_images_| from |file_paths|. + void BuildSourceImagesArray(const FilePathMap& file_paths); + // Loads the unmodified bitmaps packed in the extension to SkBitmaps. Returns // true if all images loaded. bool LoadRawBitmapsTo(const FilePathMap& file_paths, @@ -189,6 +192,10 @@ class BrowserThemePack : public base::RefCountedThreadSafe<BrowserThemePack> { int32 id; int32 property; } *display_properties_; + + // A list of included source images. A pointer to a -1 terminated array of + // our persistent IDs. + int* source_images_; #pragma pack(pop) // References to raw PNG data. This map isn't touched when |data_pack_| is |