Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: views/desktop/desktop_window_view.cc

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/compositor/test_layer_animation_delegate.cc ('k') | views/layer_property_setter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/desktop/desktop_window_view.h" 5 #include "views/desktop/desktop_window_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "ui/gfx/canvas.h" 8 #include "ui/gfx/canvas.h"
9 #include "ui/gfx/transform.h" 9 #include "ui/gfx/transform.h"
10 #include "ui/gfx/compositor/layer.h"
11 #include "ui/gfx/compositor/layer_animator.h"
10 #include "views/desktop/desktop_background.h" 12 #include "views/desktop/desktop_background.h"
11 #include "views/desktop/desktop_window_manager.h" 13 #include "views/desktop/desktop_window_manager.h"
12 #include "views/layer_property_setter.h"
13 #include "views/widget/native_widget_view.h" 14 #include "views/widget/native_widget_view.h"
14 #include "views/widget/native_widget_views.h" 15 #include "views/widget/native_widget_views.h"
15 #include "views/widget/widget.h" 16 #include "views/widget/widget.h"
16 #include "views/window/native_frame_view.h" 17 #include "views/window/native_frame_view.h"
17 18
18 #if defined(USE_AURA) 19 #if defined(USE_AURA)
19 #include "views/widget/native_widget_aura.h" 20 #include "views/widget/native_widget_aura.h"
20 #elif defined(OS_WIN) 21 #elif defined(OS_WIN)
21 #include "views/widget/native_widget_win.h" 22 #include "views/widget/native_widget_win.h"
22 #elif defined(USE_WAYLAND) 23 #elif defined(USE_WAYLAND)
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 154
154 void DesktopWindowView::CreateTestWindow(const string16& title, 155 void DesktopWindowView::CreateTestWindow(const string16& title,
155 SkColor color, 156 SkColor color,
156 gfx::Rect initial_bounds, 157 gfx::Rect initial_bounds,
157 bool rotate) { 158 bool rotate) {
158 views::Widget* window = views::Widget::CreateWindowWithBounds( 159 views::Widget* window = views::Widget::CreateWindowWithBounds(
159 new TestWindowContentView(title, color), 160 new TestWindowContentView(title, color),
160 initial_bounds); 161 initial_bounds);
161 window->Show(); 162 window->Show();
162 163
164 NativeWidgetViews* native_widget_views =
165 static_cast<NativeWidgetViews*>(window->native_widget());
166
163 if (rotate) { 167 if (rotate) {
164 ui::Transform transform; 168 ui::Transform transform;
165 transform.SetRotate(90.0f); 169 transform.SetRotate(90.0f);
166 transform.SetTranslateX(window->GetWindowScreenBounds().width()); 170 transform.SetTranslateX(window->GetWindowScreenBounds().width());
167 static_cast<NativeWidgetViews*>(window->native_widget())->GetView()-> 171 native_widget_views->GetView()->SetTransform(transform);
168 SetTransform(transform); 172 }
173
174 native_widget_views->GetView()->SetPaintToLayer(true);
175 if (native_widget_views->GetView()->layer()) {
176 native_widget_views->GetView()->layer()->SetAnimator(
177 ui::LayerAnimator::CreateImplicitAnimator());
169 } 178 }
170 } 179 }
171 180
172 void DesktopWindowView::AddObserver(DesktopWindowView::Observer* observer) { 181 void DesktopWindowView::AddObserver(DesktopWindowView::Observer* observer) {
173 observers_.AddObserver(observer); 182 observers_.AddObserver(observer);
174 } 183 }
175 184
176 void DesktopWindowView::RemoveObserver(DesktopWindowView::Observer* observer) { 185 void DesktopWindowView::RemoveObserver(DesktopWindowView::Observer* observer) {
177 observers_.RemoveObserver(observer); 186 observers_.RemoveObserver(observer);
178 } 187 }
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 return NULL; 264 return NULL;
256 265
257 case DESKTOP_OTHER: 266 case DESKTOP_OTHER:
258 return new NativeFrameView(widget_); 267 return new NativeFrameView(widget_);
259 } 268 }
260 return NULL; 269 return NULL;
261 } 270 }
262 271
263 } // namespace desktop 272 } // namespace desktop
264 } // namespace views 273 } // namespace views
OLDNEW
« no previous file with comments | « ui/gfx/compositor/test_layer_animation_delegate.cc ('k') | views/layer_property_setter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698