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

Side by Side Diff: cc/resource_provider_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/resource_provider.h" 7 #include "cc/resource_provider.h"
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "cc/graphics_context.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/test/compositor_fake_web_graphics_context_3d.h" 13 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
14 #include "cc/test/fake_web_compositor_output_surface.h" 14 #include "cc/test/fake_web_compositor_output_surface.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "third_party/khronos/GLES2/gl2.h" 16 #include "third_party/khronos/GLES2/gl2.h"
17 #include "third_party/khronos/GLES2/gl2ext.h" 17 #include "third_party/khronos/GLES2/gl2ext.h"
18 #include "ui/gfx/rect.h" 18 #include "ui/gfx/rect.h"
19 #include <public/WebGraphicsContext3D.h> 19 #include <public/WebGraphicsContext3D.h>
20 20
21 using namespace cc;
22 using namespace WebKit; 21 using namespace WebKit;
23 22
23 namespace cc {
24 namespace { 24 namespace {
25 25
26 size_t textureSize(const gfx::Size& size, WGC3Denum format) 26 size_t textureSize(const gfx::Size& size, WGC3Denum format)
27 { 27 {
28 unsigned int componentsPerPixel = 4; 28 unsigned int componentsPerPixel = 4;
29 unsigned int bytesPerComponent = 1; 29 unsigned int bytesPerComponent = 1;
30 return size.width() * size.height() * componentsPerPixel * bytesPerComponent ; 30 return size.width() * size.height() * componentsPerPixel * bytesPerComponent ;
31 } 31 }
32 32
33 struct Texture { 33 struct Texture {
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 childResourceProvider->receiveFromParent(list); 584 childResourceProvider->receiveFromParent(list);
585 } 585 }
586 EXPECT_EQ(0u, childResourceProvider->numResources()); 586 EXPECT_EQ(0u, childResourceProvider->numResources());
587 } 587 }
588 588
589 INSTANTIATE_TEST_CASE_P(ResourceProviderTests, 589 INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
590 ResourceProviderTest, 590 ResourceProviderTest,
591 ::testing::Values(ResourceProvider::GLTexture, 591 ::testing::Values(ResourceProvider::GLTexture,
592 ResourceProvider::Bitmap)); 592 ResourceProvider::Bitmap));
593 593
594 } // anonymous namespace 594 } // namespace
595 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698