diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:24:32 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:24:32 +0000 |
| commit | 04f726bb47f45d2603fa64f53e2213aeb0ff64c2 (patch) | |
| tree | 323f06d4c278cb3c658f457e57f2f196a576d9ba /views/desktop | |
| parent | c3b92bfa40aed1f312195936873b05ec0abd4aa7 (diff) | |
| download | chromium_src-04f726bb47f45d2603fa64f53e2213aeb0ff64c2.zip chromium_src-04f726bb47f45d2603fa64f53e2213aeb0ff64c2.tar.gz chromium_src-04f726bb47f45d2603fa64f53e2213aeb0ff64c2.tar.bz2 | |
Enable the new layer animation framework.
Depends on http://codereview.chromium.org/8247009/
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8362006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/desktop')
| -rw-r--r-- | views/desktop/desktop_window_view.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/views/desktop/desktop_window_view.cc b/views/desktop/desktop_window_view.cc index 24f0249..65d4801 100644 --- a/views/desktop/desktop_window_view.cc +++ b/views/desktop/desktop_window_view.cc @@ -7,9 +7,10 @@ #include "base/utf_string_conversions.h" #include "ui/gfx/canvas.h" #include "ui/gfx/transform.h" +#include "ui/gfx/compositor/layer.h" +#include "ui/gfx/compositor/layer_animator.h" #include "views/desktop/desktop_background.h" #include "views/desktop/desktop_window_manager.h" -#include "views/layer_property_setter.h" #include "views/widget/native_widget_view.h" #include "views/widget/native_widget_views.h" #include "views/widget/widget.h" @@ -160,12 +161,20 @@ void DesktopWindowView::CreateTestWindow(const string16& title, initial_bounds); window->Show(); + NativeWidgetViews* native_widget_views = + static_cast<NativeWidgetViews*>(window->native_widget()); + if (rotate) { ui::Transform transform; transform.SetRotate(90.0f); transform.SetTranslateX(window->GetWindowScreenBounds().width()); - static_cast<NativeWidgetViews*>(window->native_widget())->GetView()-> - SetTransform(transform); + native_widget_views->GetView()->SetTransform(transform); + } + + native_widget_views->GetView()->SetPaintToLayer(true); + if (native_widget_views->GetView()->layer()) { + native_widget_views->GetView()->layer()->SetAnimator( + ui::LayerAnimator::CreateImplicitAnimator()); } } |