OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/host/transformer_helper.h" | 5 #include "ash/host/transformer_helper.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/host/ash_window_tree_host.h" | 9 #include "ash/host/ash_window_tree_host.h" |
10 #include "ash/host/root_window_transformer.h" | 10 #include "ash/host/root_window_transformer.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 66 |
67 void TransformerHelper::Init() { | 67 void TransformerHelper::Init() { |
68 SetTransform(gfx::Transform()); | 68 SetTransform(gfx::Transform()); |
69 } | 69 } |
70 | 70 |
71 gfx::Insets TransformerHelper::GetHostInsets() const { | 71 gfx::Insets TransformerHelper::GetHostInsets() const { |
72 return transformer_->GetHostInsets(); | 72 return transformer_->GetHostInsets(); |
73 } | 73 } |
74 | 74 |
75 void TransformerHelper::SetTransform(const gfx::Transform& transform) { | 75 void TransformerHelper::SetTransform(const gfx::Transform& transform) { |
76 scoped_ptr<RootWindowTransformer> transformer(new SimpleRootWindowTransformer( | 76 std::unique_ptr<RootWindowTransformer> transformer( |
77 ash_host_->AsWindowTreeHost()->window(), transform)); | 77 new SimpleRootWindowTransformer(ash_host_->AsWindowTreeHost()->window(), |
| 78 transform)); |
78 SetRootWindowTransformer(std::move(transformer)); | 79 SetRootWindowTransformer(std::move(transformer)); |
79 } | 80 } |
80 | 81 |
81 void TransformerHelper::SetRootWindowTransformer( | 82 void TransformerHelper::SetRootWindowTransformer( |
82 scoped_ptr<RootWindowTransformer> transformer) { | 83 std::unique_ptr<RootWindowTransformer> transformer) { |
83 transformer_ = std::move(transformer); | 84 transformer_ = std::move(transformer); |
84 aura::WindowTreeHost* host = ash_host_->AsWindowTreeHost(); | 85 aura::WindowTreeHost* host = ash_host_->AsWindowTreeHost(); |
85 aura::Window* window = host->window(); | 86 aura::Window* window = host->window(); |
86 window->SetTransform(transformer_->GetTransform()); | 87 window->SetTransform(transformer_->GetTransform()); |
87 // If the layer is not animating, then we need to update the root window | 88 // If the layer is not animating, then we need to update the root window |
88 // size immediately. | 89 // size immediately. |
89 if (!window->layer()->GetAnimator()->is_animating()) | 90 if (!window->layer()->GetAnimator()->is_animating()) |
90 host->UpdateRootWindowSize(host->GetBounds().size()); | 91 host->UpdateRootWindowSize(host->GetBounds().size()); |
91 } | 92 } |
92 | 93 |
(...skipping 13 matching lines...) Expand all Loading... |
106 transform.Scale(1.0f / scale, 1.0f / scale); | 107 transform.Scale(1.0f / scale, 1.0f / scale); |
107 return transformer_->GetInverseTransform() * transform; | 108 return transformer_->GetInverseTransform() * transform; |
108 } | 109 } |
109 | 110 |
110 void TransformerHelper::UpdateWindowSize(const gfx::Size& host_size) { | 111 void TransformerHelper::UpdateWindowSize(const gfx::Size& host_size) { |
111 ash_host_->AsWindowTreeHost()->window()->SetBounds( | 112 ash_host_->AsWindowTreeHost()->window()->SetBounds( |
112 transformer_->GetRootWindowBounds(host_size)); | 113 transformer_->GetRootWindowBounds(host_size)); |
113 } | 114 } |
114 | 115 |
115 } // namespace ash | 116 } // namespace ash |
OLD | NEW |