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

Side by Side Diff: cc/surfaces/surfaces_pixeltest.cc

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 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
« no previous file with comments | « cc/surfaces/surface_factory_unittest.cc ('k') | cc/test/animation_test_common.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "cc/output/compositor_frame.h" 5 #include "cc/output/compositor_frame.h"
6 #include "cc/quads/render_pass.h" 6 #include "cc/quads/render_pass.h"
7 #include "cc/quads/solid_color_draw_quad.h" 7 #include "cc/quads/solid_color_draw_quad.h"
8 #include "cc/quads/surface_draw_quad.h" 8 #include "cc/quads/surface_draw_quad.h"
9 #include "cc/surfaces/surface.h" 9 #include "cc/surfaces/surface.h"
10 #include "cc/surfaces/surface_aggregator.h" 10 #include "cc/surfaces/surface_aggregator.h"
11 #include "cc/surfaces/surface_factory.h" 11 #include "cc/surfaces/surface_factory.h"
12 #include "cc/surfaces/surface_factory_client.h" 12 #include "cc/surfaces/surface_factory_client.h"
13 #include "cc/surfaces/surface_id_allocator.h" 13 #include "cc/surfaces/surface_id_allocator.h"
14 #include "cc/surfaces/surface_manager.h" 14 #include "cc/surfaces/surface_manager.h"
15 #include "cc/test/pixel_comparator.h" 15 #include "cc/test/pixel_comparator.h"
16 #include "cc/test/pixel_test.h" 16 #include "cc/test/pixel_test.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 #if !defined(OS_ANDROID) 19 #if !defined(OS_ANDROID)
20 20
21 namespace cc { 21 namespace cc {
22 namespace { 22 namespace {
23 23
24 class EmptySurfaceFactoryClient : public SurfaceFactoryClient { 24 class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
25 public: 25 public:
26 virtual void ReturnResources( 26 virtual void ReturnResources(
27 const ReturnedResourceArray& resources) OVERRIDE {} 27 const ReturnedResourceArray& resources) override {}
28 }; 28 };
29 29
30 class SurfacesPixelTest : public RendererPixelTest<GLRenderer> { 30 class SurfacesPixelTest : public RendererPixelTest<GLRenderer> {
31 public: 31 public:
32 SurfacesPixelTest() : allocator_(1u), factory_(&manager_, &client_) {} 32 SurfacesPixelTest() : allocator_(1u), factory_(&manager_, &client_) {}
33 33
34 protected: 34 protected:
35 SurfaceManager manager_; 35 SurfaceManager manager_;
36 SurfaceIdAllocator allocator_; 36 SurfaceIdAllocator allocator_;
37 EmptySurfaceFactoryClient client_; 37 EmptySurfaceFactoryClient client_;
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 326
327 factory_.Destroy(root_surface_id); 327 factory_.Destroy(root_surface_id);
328 factory_.Destroy(left_child_id); 328 factory_.Destroy(left_child_id);
329 factory_.Destroy(right_child_id); 329 factory_.Destroy(right_child_id);
330 } 330 }
331 331
332 } // namespace 332 } // namespace
333 } // namespace cc 333 } // namespace cc
334 334
335 #endif // !defined(OS_ANDROID) 335 #endif // !defined(OS_ANDROID)
OLDNEW
« no previous file with comments | « cc/surfaces/surface_factory_unittest.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698