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

Side by Side Diff: cc/resource_provider_unittest.cc

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased - fixed the conflicts hopefuly 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/resource_provider.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 "CCResourceProvider.h" 7 #include "cc/resource_provider.h"
8 8
9 #include "CCGraphicsContext.h" 9 #include "CCGraphicsContext.h"
10 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread 10 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
11 #include "Extensions3DChromium.h" 11 #include "Extensions3DChromium.h"
12 #include "cc/test/compositor_fake_web_graphics_context_3d.h" 12 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
13 #include "cc/test/fake_web_compositor_output_surface.h" 13 #include "cc/test/fake_web_compositor_output_surface.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include <public/WebGraphicsContext3D.h> 15 #include <public/WebGraphicsContext3D.h>
16 #include <wtf/HashMap.h> 16 #include <wtf/HashMap.h>
17 #include <wtf/OwnPtr.h> 17 #include <wtf/OwnPtr.h>
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 } 578 }
579 EXPECT_EQ(0u, childResourceProvider->numResources()); 579 EXPECT_EQ(0u, childResourceProvider->numResources());
580 } 580 }
581 581
582 INSTANTIATE_TEST_CASE_P(CCResourceProviderTests, 582 INSTANTIATE_TEST_CASE_P(CCResourceProviderTests,
583 CCResourceProviderTest, 583 CCResourceProviderTest,
584 ::testing::Values(CCResourceProvider::GLTexture, 584 ::testing::Values(CCResourceProvider::GLTexture,
585 CCResourceProvider::Bitmap)); 585 CCResourceProvider::Bitmap));
586 586
587 } // namespace 587 } // namespace
OLDNEW
« no previous file with comments | « cc/resource_provider.cc ('k') | cc/scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698