Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Side by Side Diff: cc/resource_provider_unittest.cc

Issue 11228059: cc: Remove CC*.h temporary includes, part 6/4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase - fix conflicts Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/render_surface_unittest.cc ('k') | cc/scheduler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/resource_provider.h" 7 #include "cc/resource_provider.h"
8 8
9 #include "CCGraphicsContext.h"
10 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "cc/graphics_context.h"
11 #include "cc/scoped_ptr_deque.h" 11 #include "cc/scoped_ptr_deque.h"
12 #include "cc/scoped_ptr_hash_map.h" 12 #include "cc/scoped_ptr_hash_map.h"
13 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread 13 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
14 #include "cc/test/compositor_fake_web_graphics_context_3d.h" 14 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
15 #include "cc/test/fake_web_compositor_output_surface.h" 15 #include "cc/test/fake_web_compositor_output_surface.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "third_party/khronos/GLES2/gl2.h" 17 #include "third_party/khronos/GLES2/gl2.h"
18 #include "third_party/khronos/GLES2/gl2ext.h" 18 #include "third_party/khronos/GLES2/gl2ext.h"
19 #include <public/WebGraphicsContext3D.h> 19 #include <public/WebGraphicsContext3D.h>
20 20
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 } 580 }
581 EXPECT_EQ(0u, childResourceProvider->numResources()); 581 EXPECT_EQ(0u, childResourceProvider->numResources());
582 } 582 }
583 583
584 INSTANTIATE_TEST_CASE_P(ResourceProviderTests, 584 INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
585 ResourceProviderTest, 585 ResourceProviderTest,
586 ::testing::Values(ResourceProvider::GLTexture, 586 ::testing::Values(ResourceProvider::GLTexture,
587 ResourceProvider::Bitmap)); 587 ResourceProvider::Bitmap));
588 588
589 } // namespace 589 } // namespace
OLDNEW
« no previous file with comments | « cc/render_surface_unittest.cc ('k') | cc/scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698