diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 15:20:57 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 15:20:57 +0000 |
| commit | 6814fce80baccfca00f55555ae08402aadc2d6ed (patch) | |
| tree | ef8702b284a63c92cd869209233c9a1f27baa986 /ash/wm/frame_painter.h | |
| parent | eb8447a068c929bc5c6fdd80b5d0df14ed6d9189 (diff) | |
| download | chromium_src-6814fce80baccfca00f55555ae08402aadc2d6ed.zip chromium_src-6814fce80baccfca00f55555ae08402aadc2d6ed.tar.gz chromium_src-6814fce80baccfca00f55555ae08402aadc2d6ed.tar.bz2 | |
Fixes crash when switching from custom theme to default theme.
Changed ash/wm/frame_painter.cc to hold onto id of crossfade_theme_frame so that frame_painter can check the validity of crossfade_theme_frame before painting the bitmap.
Steps to repro
1. Go to settings Get themes, change theme.
2. Click 'Reset to default theme'
Bug=http://crosbug.com/28811
Test=Manual
Review URL: http://codereview.chromium.org/9982008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/frame_painter.h')
| -rw-r--r-- | ash/wm/frame_painter.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/wm/frame_painter.h b/ash/wm/frame_painter.h index ab22165..7187b2b 100644 --- a/ash/wm/frame_painter.h +++ b/ash/wm/frame_painter.h @@ -84,7 +84,7 @@ class ASH_EXPORT FramePainter : public aura::WindowObserver, void PaintHeader(views::NonClientFrameView* view, gfx::Canvas* canvas, HeaderMode header_mode, - const SkBitmap* theme_frame, + int theme_frame_id, const SkBitmap* theme_frame_overlay); // Paints the header/content separator line. Exists as a separate function @@ -147,12 +147,12 @@ class ASH_EXPORT FramePainter : public aura::WindowObserver, const SkBitmap* header_left_edge_; const SkBitmap* header_right_edge_; - // Bitmap and opacity last used for painting header. - const SkBitmap* previous_theme_frame_; + // Bitmap id and opacity last used for painting header. + int previous_theme_frame_id_; int previous_opacity_; - // Bitmap and opacity we are crossfading from. - const SkBitmap* crossfade_theme_frame_; + // Bitmap id and opacity we are crossfading from. + int crossfade_theme_frame_id_; int crossfade_opacity_; gfx::Rect header_frame_bounds_; |