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

Side by Side Diff: ui/compositor/test/test_layer_animation_delegate.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "cc/layers/layer_settings.h"
6 #include "ui/compositor/layer.h" 5 #include "ui/compositor/layer.h"
7 #include "ui/compositor/test/test_layer_animation_delegate.h" 6 #include "ui/compositor/test/test_layer_animation_delegate.h"
8 7
9 namespace ui { 8 namespace ui {
10 9
11 TestLayerThreadedAnimationDelegate::TestLayerThreadedAnimationDelegate() {} 10 TestLayerThreadedAnimationDelegate::TestLayerThreadedAnimationDelegate() {}
12 11
13 TestLayerThreadedAnimationDelegate::~TestLayerThreadedAnimationDelegate() {} 12 TestLayerThreadedAnimationDelegate::~TestLayerThreadedAnimationDelegate() {}
14 13
15 TestLayerAnimationDelegate::TestLayerAnimationDelegate() 14 TestLayerAnimationDelegate::TestLayerAnimationDelegate()
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 cc::Layer* TestLayerAnimationDelegate::GetCcLayer() const { 109 cc::Layer* TestLayerAnimationDelegate::GetCcLayer() const {
111 return cc_layer_.get(); 110 return cc_layer_.get();
112 } 111 }
113 112
114 LayerThreadedAnimationDelegate* 113 LayerThreadedAnimationDelegate*
115 TestLayerAnimationDelegate::GetThreadedAnimationDelegate() { 114 TestLayerAnimationDelegate::GetThreadedAnimationDelegate() {
116 return &threaded_delegate_; 115 return &threaded_delegate_;
117 } 116 }
118 117
119 void TestLayerAnimationDelegate::CreateCcLayer() { 118 void TestLayerAnimationDelegate::CreateCcLayer() {
120 cc_layer_ = cc::Layer::Create(cc::LayerSettings()); 119 cc_layer_ = cc::Layer::Create();
121 } 120 }
122 121
123 void TestLayerThreadedAnimationDelegate::AddThreadedAnimation( 122 void TestLayerThreadedAnimationDelegate::AddThreadedAnimation(
124 scoped_ptr<cc::Animation> animation) {} 123 scoped_ptr<cc::Animation> animation) {}
125 124
126 void TestLayerThreadedAnimationDelegate::RemoveThreadedAnimation( 125 void TestLayerThreadedAnimationDelegate::RemoveThreadedAnimation(
127 int animation_id) {} 126 int animation_id) {}
128 127
129 } // namespace ui 128 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698