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

Side by Side Diff: cc/test/layer_tree_pixel_test.h

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/test/fake_video_frame_provider.h ('k') | cc/test/layer_tree_test.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_ 5 #ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
6 #define CC_TEST_LAYER_TREE_PIXEL_TEST_H_ 6 #define CC_TEST_LAYER_TREE_PIXEL_TEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 16 matching lines...) Expand all
27 class PixelComparator; 27 class PixelComparator;
28 class SolidColorLayer; 28 class SolidColorLayer;
29 class TextureLayer; 29 class TextureLayer;
30 class TextureMailbox; 30 class TextureMailbox;
31 31
32 class LayerTreePixelTest : public LayerTreeTest { 32 class LayerTreePixelTest : public LayerTreeTest {
33 protected: 33 protected:
34 LayerTreePixelTest(); 34 LayerTreePixelTest();
35 virtual ~LayerTreePixelTest(); 35 virtual ~LayerTreePixelTest();
36 36
37 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) OVERRIDE; 37 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) override;
38 virtual void CommitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE; 38 virtual void CommitCompleteOnThread(LayerTreeHostImpl* impl) override;
39 39
40 virtual scoped_ptr<CopyOutputRequest> CreateCopyOutputRequest(); 40 virtual scoped_ptr<CopyOutputRequest> CreateCopyOutputRequest();
41 41
42 void ReadbackResult(scoped_ptr<CopyOutputResult> result); 42 void ReadbackResult(scoped_ptr<CopyOutputResult> result);
43 43
44 virtual void BeginTest() OVERRIDE; 44 virtual void BeginTest() override;
45 virtual void SetupTree() OVERRIDE; 45 virtual void SetupTree() override;
46 virtual void AfterTest() OVERRIDE; 46 virtual void AfterTest() override;
47 virtual void EndTest() OVERRIDE; 47 virtual void EndTest() override;
48 48
49 void TryEndTest(); 49 void TryEndTest();
50 50
51 scoped_refptr<SolidColorLayer> CreateSolidColorLayer(const gfx::Rect& rect, 51 scoped_refptr<SolidColorLayer> CreateSolidColorLayer(const gfx::Rect& rect,
52 SkColor color); 52 SkColor color);
53 scoped_refptr<SolidColorLayer> CreateSolidColorLayerWithBorder( 53 scoped_refptr<SolidColorLayer> CreateSolidColorLayerWithBorder(
54 const gfx::Rect& rect, 54 const gfx::Rect& rect,
55 SkColor color, 55 SkColor color,
56 int border_width, 56 int border_width,
57 SkColor border_color); 57 SkColor border_color);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 base::FilePath ref_file_; 101 base::FilePath ref_file_;
102 scoped_ptr<SkBitmap> result_bitmap_; 102 scoped_ptr<SkBitmap> result_bitmap_;
103 std::vector<scoped_refptr<TextureLayer> > texture_layers_; 103 std::vector<scoped_refptr<TextureLayer> > texture_layers_;
104 int pending_texture_mailbox_callbacks_; 104 int pending_texture_mailbox_callbacks_;
105 bool impl_side_painting_; 105 bool impl_side_painting_;
106 }; 106 };
107 107
108 } // namespace cc 108 } // namespace cc
109 109
110 #endif // CC_TEST_LAYER_TREE_PIXEL_TEST_H_ 110 #endif // CC_TEST_LAYER_TREE_PIXEL_TEST_H_
OLDNEW
« no previous file with comments | « cc/test/fake_video_frame_provider.h ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698