| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/heads_up_display_layer.h" | 7 #include "cc/heads_up_display_layer.h" |
| 8 #include "cc/layer.h" | 8 #include "cc/layer.h" |
| 9 #include "cc/layer_tree_host.h" | 9 #include "cc/layer_tree_host.h" |
| 10 #include "cc/test/layer_tree_test_common.h" | 10 #include "cc/test/layer_tree_test_common.h" |
| 11 | 11 |
| 12 using namespace cc; | |
| 13 using namespace WebKitTests; | 12 using namespace WebKitTests; |
| 14 | 13 |
| 14 namespace cc { |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 class HeadsUpDisplayTest : public ThreadedTest { | 17 class HeadsUpDisplayTest : public ThreadedTest { |
| 18 protected: | 18 protected: |
| 19 virtual void initializeSettings(LayerTreeSettings& settings) OVERRIDE | 19 virtual void initializeSettings(LayerTreeSettings& settings) OVERRIDE |
| 20 { | 20 { |
| 21 // Enable the HUD without requiring text. | 21 // Enable the HUD without requiring text. |
| 22 settings.showPropertyChangedRects = true; | 22 settings.showPropertyChangedRects = true; |
| 23 } | 23 } |
| 24 }; | 24 }; |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 scoped_refptr<DrawsContentLayer> m_rootLayer1; | 103 scoped_refptr<DrawsContentLayer> m_rootLayer1; |
| 104 scoped_refptr<DrawsContentLayer> m_rootLayer2; | 104 scoped_refptr<DrawsContentLayer> m_rootLayer2; |
| 105 int m_numCommits; | 105 int m_numCommits; |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 TEST_F(HudWithRootLayerChange, runMultiThread) | 108 TEST_F(HudWithRootLayerChange, runMultiThread) |
| 109 { | 109 { |
| 110 runTest(true); | 110 runTest(true); |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // anonymous namespace | 113 } // namespace |
| 114 } // namespace cc |
| OLD | NEW |