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

Side by Side Diff: cc/render_surface_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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/render_surface_impl.h" 7 #include "cc/render_surface_impl.h"
8 8
9 #include "cc/append_quads_data.h" 9 #include "cc/append_quads_data.h"
10 #include "cc/layer_impl.h" 10 #include "cc/layer_impl.h"
11 #include "cc/render_pass_sink.h" 11 #include "cc/render_pass_sink.h"
12 #include "cc/scoped_ptr_vector.h" 12 #include "cc/scoped_ptr_vector.h"
13 #include "cc/shared_quad_state.h" 13 #include "cc/shared_quad_state.h"
14 #include "cc/single_thread_proxy.h" 14 #include "cc/single_thread_proxy.h"
15 #include "cc/test/geometry_test_utils.h" 15 #include "cc/test/geometry_test_utils.h"
16 #include "cc/test/mock_quad_culler.h" 16 #include "cc/test/mock_quad_culler.h"
17 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 #include <public/WebTransformationMatrix.h> 19 #include <public/WebTransformationMatrix.h>
20 20
21 using namespace cc;
22 using WebKit::WebTransformationMatrix; 21 using WebKit::WebTransformationMatrix;
23 22
23 namespace cc {
24 namespace { 24 namespace {
25 25
26 #define EXECUTE_AND_VERIFY_SURFACE_CHANGED(codeToTest) \ 26 #define EXECUTE_AND_VERIFY_SURFACE_CHANGED(codeToTest) \
27 renderSurface->resetPropertyChangedFlag(); \ 27 renderSurface->resetPropertyChangedFlag(); \
28 codeToTest; \ 28 codeToTest; \
29 EXPECT_TRUE(renderSurface->surfacePropertyChanged()) 29 EXPECT_TRUE(renderSurface->surfacePropertyChanged())
30 30
31 #define EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(codeToTest) \ 31 #define EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(codeToTest) \
32 renderSurface->resetPropertyChangedFlag(); \ 32 renderSurface->resetPropertyChangedFlag(); \
33 codeToTest; \ 33 codeToTest; \
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 renderSurface->appendRenderPasses(passSink); 146 renderSurface->appendRenderPasses(passSink);
147 147
148 ASSERT_EQ(1u, passSink.renderPasses().size()); 148 ASSERT_EQ(1u, passSink.renderPasses().size());
149 RenderPass* pass = passSink.renderPasses()[0]; 149 RenderPass* pass = passSink.renderPasses()[0];
150 150
151 EXPECT_EQ(RenderPass::Id(2, 0), pass->id()); 151 EXPECT_EQ(RenderPass::Id(2, 0), pass->id());
152 EXPECT_RECT_EQ(contentRect, pass->outputRect()); 152 EXPECT_RECT_EQ(contentRect, pass->outputRect());
153 EXPECT_EQ(origin, pass->transformToRootTarget()); 153 EXPECT_EQ(origin, pass->transformToRootTarget());
154 } 154 }
155 155
156 } // anonymous namespace 156 } // namespace
157 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698