| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/layer_tree_host.h" | 7 #include "cc/layer_tree_host.h" |
| 8 | 8 |
| 9 #include "base/synchronization/lock.h" | 9 #include "base/synchronization/lock.h" |
| 10 #include "cc/content_layer.h" | 10 #include "cc/content_layer.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "cc/timing_function.h" | 22 #include "cc/timing_function.h" |
| 23 #include "testing/gmock/include/gmock/gmock.h" | 23 #include "testing/gmock/include/gmock/gmock.h" |
| 24 #include "third_party/khronos/GLES2/gl2.h" | 24 #include "third_party/khronos/GLES2/gl2.h" |
| 25 #include "third_party/khronos/GLES2/gl2ext.h" | 25 #include "third_party/khronos/GLES2/gl2ext.h" |
| 26 #include "ui/gfx/point_conversions.h" | 26 #include "ui/gfx/point_conversions.h" |
| 27 #include "ui/gfx/size_conversions.h" | 27 #include "ui/gfx/size_conversions.h" |
| 28 #include "ui/gfx/vector2d_conversions.h" | 28 #include "ui/gfx/vector2d_conversions.h" |
| 29 #include <public/WebLayerScrollClient.h> | 29 #include <public/WebLayerScrollClient.h> |
| 30 #include <public/WebSize.h> | 30 #include <public/WebSize.h> |
| 31 | 31 |
| 32 using namespace cc; | |
| 33 using namespace WebKit; | 32 using namespace WebKit; |
| 34 using namespace WebKitTests; | 33 using namespace WebKitTests; |
| 35 | 34 |
| 35 namespace cc { |
| 36 namespace { | 36 namespace { |
| 37 | 37 |
| 38 class LayerTreeHostTest : public ThreadedTest { }; | 38 class LayerTreeHostTest : public ThreadedTest { }; |
| 39 | 39 |
| 40 // Shortlived layerTreeHosts shouldn't die. | 40 // Shortlived layerTreeHosts shouldn't die. |
| 41 class LayerTreeHostTestShortlived1 : public LayerTreeHostTest { | 41 class LayerTreeHostTestShortlived1 : public LayerTreeHostTest { |
| 42 public: | 42 public: |
| 43 LayerTreeHostTestShortlived1() { } | 43 LayerTreeHostTestShortlived1() { } |
| 44 | 44 |
| 45 virtual void beginTest() OVERRIDE | 45 virtual void beginTest() OVERRIDE |
| (...skipping 3171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3217 private: | 3217 private: |
| 3218 int m_numCommitsDeferred; | 3218 int m_numCommitsDeferred; |
| 3219 int m_numCompleteCommits; | 3219 int m_numCompleteCommits; |
| 3220 }; | 3220 }; |
| 3221 | 3221 |
| 3222 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) | 3222 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) |
| 3223 { | 3223 { |
| 3224 runTest(true); | 3224 runTest(true); |
| 3225 } | 3225 } |
| 3226 | 3226 |
| 3227 } // anonymous namespace | 3227 } // namespace |
| 3228 } // namespace cc |
| OLD | NEW |