| 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 "cc/heads_up_display_layer.h" | 5 #include "cc/heads_up_display_layer.h" |
| 6 #include "cc/layer.h" | 6 #include "cc/layer.h" |
| 7 #include "cc/layer_tree_host.h" | 7 #include "cc/layer_tree_host.h" |
| 8 #include "cc/test/layer_tree_test_common.h" | 8 #include "cc/test/layer_tree_test_common.h" |
| 9 | 9 |
| 10 using namespace WebKitTests; | |
| 11 | |
| 12 namespace cc { | 10 namespace cc { |
| 13 namespace { | 11 namespace { |
| 14 | 12 |
| 15 class HeadsUpDisplayTest : public ThreadedTest { | 13 class HeadsUpDisplayTest : public ThreadedTest { |
| 16 protected: | 14 protected: |
| 17 virtual void initializeSettings(LayerTreeSettings& settings) OVERRIDE | 15 virtual void initializeSettings(LayerTreeSettings& settings) OVERRIDE |
| 18 { | 16 { |
| 19 // Enable the HUD without requiring text. | 17 // Enable the HUD without requiring text. |
| 20 settings.initialDebugState.showPropertyChangedRects = true; | 18 settings.initialDebugState.showPropertyChangedRects = true; |
| 21 } | 19 } |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 int m_numCommits; | 101 int m_numCommits; |
| 104 }; | 102 }; |
| 105 | 103 |
| 106 TEST_F(HudWithRootLayerChange, runMultiThread) | 104 TEST_F(HudWithRootLayerChange, runMultiThread) |
| 107 { | 105 { |
| 108 runTest(true); | 106 runTest(true); |
| 109 } | 107 } |
| 110 | 108 |
| 111 } // namespace | 109 } // namespace |
| 112 } // namespace cc | 110 } // namespace cc |
| OLD | NEW |