diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:17:24 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:17:24 +0000 |
| commit | 595b52a3cb8b04192f47ac0039ac0a816b034b40 (patch) | |
| tree | 2be11a33f7da12c9de6201a6bded1b073df28d58 /ash/launcher | |
| parent | 80e776ae1d59c54371ae86623bea63fed23663f2 (diff) | |
| download | chromium_src-595b52a3cb8b04192f47ac0039ac0a816b034b40.zip chromium_src-595b52a3cb8b04192f47ac0039ac0a816b034b40.tar.gz chromium_src-595b52a3cb8b04192f47ac0039ac0a816b034b40.tar.bz2 | |
Makes the launcher use a layer with a solid color, which is cheaper
than a textured layer.
BUG=119581
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9835028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index a38b536..51b2c58 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -17,7 +17,6 @@ #include "ui/gfx/compositor/layer.h" #include "ui/gfx/image/image.h" #include "ui/views/accessible_pane_view.h" -#include "ui/views/background.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" @@ -118,7 +117,8 @@ Launcher::Launcher(aura::Window* window_container) widget_.reset(new views::Widget); views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.create_texture_for_layer = true; + // The launcher only ever draws a solid color. + params.layer_type = ui::LAYER_SOLID_COLOR; params.transparent = true; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.parent = Shell::GetInstance()->GetContainer( @@ -185,13 +185,8 @@ internal::LauncherView* Launcher::GetLauncherViewForTest() { } void Launcher::UpdateBackground(int alpha) { - if (alpha == 0) { - delegate_view_->set_background(NULL); - } else { - delegate_view_->set_background( - views::Background::CreateSolidBackground(0, 0, 0, alpha)); - } - delegate_view_->SchedulePaint(); + ui::Layer* layer = widget_->GetNativeView()->layer(); + layer->SetColor(SkColorSetARGB(alpha, 0, 0, 0)); } } // namespace ash |