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

Side by Side Diff: ui/compositor/layer_owner_unittest.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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
OLDNEW
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 "ui/compositor/layer_owner.h" 5 #include "ui/compositor/layer_owner.h"
6 6
7 #include "base/test/null_task_runner.h" 7 #include "base/test/null_task_runner.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/compositor/compositor.h" 9 #include "ui/compositor/compositor.h"
10 #include "ui/compositor/layer.h" 10 #include "ui/compositor/layer.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 LayerOwnerTestWithCompositor::~LayerOwnerTestWithCompositor() { 60 LayerOwnerTestWithCompositor::~LayerOwnerTestWithCompositor() {
61 } 61 }
62 62
63 void LayerOwnerTestWithCompositor::SetUp() { 63 void LayerOwnerTestWithCompositor::SetUp() {
64 scoped_refptr<base::SingleThreadTaskRunner> task_runner = 64 scoped_refptr<base::SingleThreadTaskRunner> task_runner =
65 new base::NullTaskRunner(); 65 new base::NullTaskRunner();
66 66
67 ui::ContextFactory* context_factory = 67 ui::ContextFactory* context_factory =
68 ui::InitializeContextFactoryForTests(false); 68 ui::InitializeContextFactoryForTests(false);
69 69
70 compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget, 70 compositor_.reset(new ui::Compositor(context_factory, task_runner));
71 context_factory, task_runner)); 71 compositor_->OnAcceleratedWidgetAvailable(gfx::kNullAcceleratedWidget);
72 } 72 }
73 73
74 void LayerOwnerTestWithCompositor::TearDown() { 74 void LayerOwnerTestWithCompositor::TearDown() {
75 compositor_.reset(); 75 compositor_.reset();
76 ui::TerminateContextFactoryForTests(); 76 ui::TerminateContextFactoryForTests();
77 } 77 }
78 78
79 } // namespace 79 } // namespace
80 80
81 TEST(LayerOwnerTest, RecreateLayerHonorsAnimationTargets) { 81 TEST(LayerOwnerTest, RecreateLayerHonorsAnimationTargets) {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 animation.AddObserver(observer.get()); 211 animation.AddObserver(observer.get());
212 gfx::Transform transform; 212 gfx::Transform transform;
213 transform.Scale(0.5f, 0.5f); 213 transform.Scale(0.5f, 0.5f);
214 child->SetTransform(transform); 214 child->SetTransform(transform);
215 } 215 }
216 216
217 scoped_ptr<Layer> layer_copy = owner.RecreateLayer(); 217 scoped_ptr<Layer> layer_copy = owner.RecreateLayer();
218 } 218 }
219 219
220 } // namespace ui 220 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698