| 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" | |
| 6 | |
| 7 #include "cc/resource_provider.h" | 5 #include "cc/resource_provider.h" |
| 8 | 6 |
| 9 #include "base/logging.h" | 7 #include "base/logging.h" |
| 10 #include "cc/graphics_context.h" | 8 #include "cc/graphics_context.h" |
| 11 #include "cc/scoped_ptr_deque.h" | 9 #include "cc/scoped_ptr_deque.h" |
| 12 #include "cc/scoped_ptr_hash_map.h" | 10 #include "cc/scoped_ptr_hash_map.h" |
| 13 #include "cc/test/compositor_fake_web_graphics_context_3d.h" | 11 #include "cc/test/compositor_fake_web_graphics_context_3d.h" |
| 14 #include "cc/test/fake_web_compositor_output_surface.h" | 12 #include "cc/test/fake_web_compositor_output_surface.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 16 #include "third_party/khronos/GLES2/gl2.h" | 14 #include "third_party/khronos/GLES2/gl2.h" |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 } | 579 } |
| 582 EXPECT_EQ(0u, childResourceProvider->numResources()); | 580 EXPECT_EQ(0u, childResourceProvider->numResources()); |
| 583 } | 581 } |
| 584 | 582 |
| 585 INSTANTIATE_TEST_CASE_P(ResourceProviderTests, | 583 INSTANTIATE_TEST_CASE_P(ResourceProviderTests, |
| 586 ResourceProviderTest, | 584 ResourceProviderTest, |
| 587 ::testing::Values(ResourceProvider::GLTexture, | 585 ::testing::Values(ResourceProvider::GLTexture, |
| 588 ResourceProvider::Bitmap)); | 586 ResourceProvider::Bitmap)); |
| 589 | 587 |
| 590 } // anonymous namespace | 588 } // anonymous namespace |
| OLD | NEW |