OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/layer_tree_host.h" | 5 #include "cc/layer_tree_host.h" |
6 | 6 |
7 #include "base/synchronization/lock.h" | 7 #include "base/synchronization/lock.h" |
8 #include "cc/content_layer.h" | 8 #include "cc/content_layer.h" |
9 #include "cc/content_layer_client.h" | 9 #include "cc/content_layer_client.h" |
10 #include "cc/graphics_context.h" | 10 #include "cc/graphics_context.h" |
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1233 LayerTreeHostTestDoNotSkipLayersWithAnimatedOpacity() | 1233 LayerTreeHostTestDoNotSkipLayersWithAnimatedOpacity() |
1234 : m_updateCheckLayer(ContentLayerWithUpdateTracking::create(&m_client)) | 1234 : m_updateCheckLayer(ContentLayerWithUpdateTracking::create(&m_client)) |
1235 { | 1235 { |
1236 } | 1236 } |
1237 | 1237 |
1238 virtual void beginTest() OVERRIDE | 1238 virtual void beginTest() OVERRIDE |
1239 { | 1239 { |
1240 m_layerTreeHost->setViewportSize(gfx::Size(10, 10), gfx::Size(10, 10)); | 1240 m_layerTreeHost->setViewportSize(gfx::Size(10, 10), gfx::Size(10, 10)); |
1241 m_layerTreeHost->rootLayer()->addChild(m_updateCheckLayer); | 1241 m_layerTreeHost->rootLayer()->addChild(m_updateCheckLayer); |
1242 m_updateCheckLayer->setOpacity(0); | 1242 m_updateCheckLayer->setOpacity(0); |
1243 m_updateCheckLayer->setDrawOpacity(0); | 1243 m_updateCheckLayer->drawProperties().opacity = 0; |
1244 postAddAnimationToMainThread(m_updateCheckLayer.get()); | 1244 postAddAnimationToMainThread(m_updateCheckLayer.get()); |
1245 } | 1245 } |
1246 | 1246 |
1247 virtual void commitCompleteOnThread(LayerTreeHostImpl*) OVERRIDE | 1247 virtual void commitCompleteOnThread(LayerTreeHostImpl*) OVERRIDE |
1248 { | 1248 { |
1249 endTest(); | 1249 endTest(); |
1250 } | 1250 } |
1251 | 1251 |
1252 virtual void afterTest() OVERRIDE | 1252 virtual void afterTest() OVERRIDE |
1253 { | 1253 { |
(...skipping 2003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3257 int m_numCompleteCommits; | 3257 int m_numCompleteCommits; |
3258 }; | 3258 }; |
3259 | 3259 |
3260 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) | 3260 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) |
3261 { | 3261 { |
3262 runTest(true); | 3262 runTest(true); |
3263 } | 3263 } |
3264 | 3264 |
3265 } // namespace | 3265 } // namespace |
3266 } // namespace cc | 3266 } // namespace cc |
OLD | NEW |