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

Side by Side Diff: cc/scoped_resource_unittest.cc

Issue 11410022: cc: Remove forbidden using namespace directives. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
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/scoped_resource.h" 7 #include "cc/scoped_resource.h"
8 8
9 #include "cc/renderer.h" 9 #include "cc/renderer.h"
10 #include "cc/test/fake_graphics_context.h" 10 #include "cc/test/fake_graphics_context.h"
11 #include "cc/test/tiled_layer_test_common.h" 11 #include "cc/test/tiled_layer_test_common.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "third_party/khronos/GLES2/gl2.h" 13 #include "third_party/khronos/GLES2/gl2.h"
14 14
15 using namespace cc;
16 using namespace WebKit; 15 using namespace WebKit;
17 using namespace WebKitTests;
18 16
17 namespace cc {
19 namespace { 18 namespace {
20 19
21 TEST(ScopedResourceTest, NewScopedResource) 20 TEST(ScopedResourceTest, NewScopedResource)
22 { 21 {
23 scoped_ptr<GraphicsContext> context(createFakeGraphicsContext()); 22 scoped_ptr<GraphicsContext> context(createFakeGraphicsContext());
24 scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(conte xt.get())); 23 scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(conte xt.get()));
25 scoped_ptr<ScopedResource> texture = ScopedResource::create(resourceProvider .get()); 24 scoped_ptr<ScopedResource> texture = ScopedResource::create(resourceProvider .get());
26 25
27 // New scoped textures do not hold a texture yet. 26 // New scoped textures do not hold a texture yet.
28 EXPECT_EQ(0u, texture->id()); 27 EXPECT_EQ(0u, texture->id());
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 EXPECT_EQ(1u, resourceProvider->numResources()); 92 EXPECT_EQ(1u, resourceProvider->numResources());
94 93
95 texture->free(); 94 texture->free();
96 EXPECT_EQ(0u, texture->id()); 95 EXPECT_EQ(0u, texture->id());
97 EXPECT_EQ(1u, resourceProvider->numResources()); 96 EXPECT_EQ(1u, resourceProvider->numResources());
98 } 97 }
99 98
100 EXPECT_EQ(1u, resourceProvider->numResources()); 99 EXPECT_EQ(1u, resourceProvider->numResources());
101 } 100 }
102 101
103 } // anonymous namespace 102 } // namespace
103 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698