| 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_impl.h" | 7 #include "cc/layer_tree_host_impl.h" |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 | 10 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "cc/video_layer_impl.h" | 42 #include "cc/video_layer_impl.h" |
| 43 #include "media/base/media.h" | 43 #include "media/base/media.h" |
| 44 #include "media/base/video_frame.h" | 44 #include "media/base/video_frame.h" |
| 45 #include "testing/gmock/include/gmock/gmock.h" | 45 #include "testing/gmock/include/gmock/gmock.h" |
| 46 #include "testing/gtest/include/gtest/gtest.h" | 46 #include "testing/gtest/include/gtest/gtest.h" |
| 47 #include "ui/gfx/size_conversions.h" | 47 #include "ui/gfx/size_conversions.h" |
| 48 #include "ui/gfx/vector2d_conversions.h" | 48 #include "ui/gfx/vector2d_conversions.h" |
| 49 #include <public/WebVideoFrame.h> | 49 #include <public/WebVideoFrame.h> |
| 50 #include <public/WebVideoFrameProvider.h> | 50 #include <public/WebVideoFrameProvider.h> |
| 51 | 51 |
| 52 using namespace cc; | |
| 53 using namespace LayerTestCommon; | 52 using namespace LayerTestCommon; |
| 54 using namespace WebKit; | 53 using namespace WebKit; |
| 55 using namespace WebKitTests; | 54 using namespace WebKitTests; |
| 56 | 55 |
| 57 using media::VideoFrame; | 56 using media::VideoFrame; |
| 58 using ::testing::Mock; | 57 using ::testing::Mock; |
| 59 using ::testing::Return; | 58 using ::testing::Return; |
| 60 using ::testing::AnyNumber; | 59 using ::testing::AnyNumber; |
| 61 using ::testing::AtLeast; | 60 using ::testing::AtLeast; |
| 62 using ::testing::_; | 61 using ::testing::_; |
| 63 | 62 |
| 63 namespace cc { |
| 64 namespace { | 64 namespace { |
| 65 | 65 |
| 66 // This test is parametrized to run all tests with the | 66 // This test is parametrized to run all tests with the |
| 67 // Settings::pageScalePinchZoomEnabled field enabled and disabled. | 67 // Settings::pageScalePinchZoomEnabled field enabled and disabled. |
| 68 class LayerTreeHostImplTest : public testing::TestWithParam<bool>, | 68 class LayerTreeHostImplTest : public testing::TestWithParam<bool>, |
| 69 public LayerTreeHostImplClient { | 69 public LayerTreeHostImplClient { |
| 70 public: | 70 public: |
| 71 LayerTreeHostImplTest() | 71 LayerTreeHostImplTest() |
| 72 : m_proxy(scoped_ptr<Thread>(NULL)) | 72 : m_proxy(scoped_ptr<Thread>(NULL)) |
| 73 , m_alwaysImplThread(&m_proxy) | 73 , m_alwaysImplThread(&m_proxy) |
| (...skipping 4341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4415 LayerTreeHostImpl::removeRenderPasses(LayerTreeHostImpl::CullRenderPasse
sWithCachedTextures(*renderer), testData); | 4415 LayerTreeHostImpl::removeRenderPasses(LayerTreeHostImpl::CullRenderPasse
sWithCachedTextures(*renderer), testData); |
| 4416 verifyRenderPassTestData(removeRenderPassesCases[testCaseIndex], testDat
a); | 4416 verifyRenderPassTestData(removeRenderPassesCases[testCaseIndex], testDat
a); |
| 4417 testCaseIndex++; | 4417 testCaseIndex++; |
| 4418 } | 4418 } |
| 4419 } | 4419 } |
| 4420 | 4420 |
| 4421 INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests, | 4421 INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests, |
| 4422 LayerTreeHostImplTest, | 4422 LayerTreeHostImplTest, |
| 4423 ::testing::Values(false, true)); | 4423 ::testing::Values(false, true)); |
| 4424 | 4424 |
| 4425 } // anonymous namespace | 4425 } // namespace |
| 4426 } // namespace cc |
| OLD | NEW |