diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 22:48:08 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 22:48:08 +0000 |
| commit | cf469aeabb7aceef1903e70e2380ebbcba90c2b9 (patch) | |
| tree | 28dc9f1fad635b1b9ad7cf938f006c40c7387255 /ui/resources | |
| parent | 49bf5057c0b445c5953672304c5937c348e97742 (diff) | |
| download | chromium_src-cf469aeabb7aceef1903e70e2380ebbcba90c2b9.zip chromium_src-cf469aeabb7aceef1903e70e2380ebbcba90c2b9.tar.gz chromium_src-cf469aeabb7aceef1903e70e2380ebbcba90c2b9.tar.bz2 | |
As per UX request this CL is changing the background for Aura. Note that this is the first resource which is a JPG. As a result I had to modify the bundle code (which assumes PNGs).
Converting that file to PNG even with all kind of fancy optimization would triple its size.
Note on the PNGCodec, it says in the header:
"This is currently designed for use in tests only (where we control the files)"
So I investigated using the Skia decoding helper but it seems to be unused and not really working.
Finally, I am not crazy about having a fallback for the PNG decoding failure like this in the code. I would have preferred testing for the image type (but there was no clean way which was obvious to me, of course we could look at the first few bytes in the header since we have it memory).
BUG=105508
TEST=none
Review URL: http://codereview.chromium.org/8970032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
| -rw-r--r-- | ui/resources/aura/damask.png | bin | 20400 -> 0 bytes | |||
| -rw-r--r-- | ui/resources/aura/wallpaper.jpg | bin | 0 -> 38522 bytes | |||
| -rw-r--r-- | ui/resources/ui_resources.grd | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/ui/resources/aura/damask.png b/ui/resources/aura/damask.png Binary files differdeleted file mode 100644 index 58f22ca5..0000000 --- a/ui/resources/aura/damask.png +++ /dev/null diff --git a/ui/resources/aura/wallpaper.jpg b/ui/resources/aura/wallpaper.jpg Binary files differnew file mode 100644 index 0000000..2212eb3 --- /dev/null +++ b/ui/resources/aura/wallpaper.jpg diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 5bd9a37..cb372fd 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -161,7 +161,7 @@ <include name="IDR_AURA_SHADOW_RECT_BOTTOM" file="aura/shadow_rect_bottom.png" type="BINDATA" /> <include name="IDR_AURA_SHADOW_RECT_BOTTOM_RIGHT" file="aura/shadow_rect_bottom_right.png" type="BINDATA" /> <include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPER" file="aura/damask.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPER" file="aura/wallpaper.jpg" type="BINDATA" /> <include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" type="BINDATA" /> <include name="IDR_AURA_WINDOW_BOTTOM_LEFT" file="aura/window_bottom_left.png" type="BINDATA" /> <include name="IDR_AURA_WINDOW_BOTTOM_RIGHT" file="aura/window_bottom_right.png" type="BINDATA" /> |
