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

Side by Side Diff: cc/trees/layer_tree_host_pixeltest_masks.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
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 #include "build/build_config.h" 5 #include "build/build_config.h"
6 #include "cc/layers/content_layer.h" 6 #include "cc/layers/content_layer.h"
7 #include "cc/layers/content_layer_client.h" 7 #include "cc/layers/content_layer_client.h"
8 #include "cc/layers/image_layer.h" 8 #include "cc/layers/image_layer.h"
9 #include "cc/layers/solid_color_layer.h" 9 #include "cc/layers/solid_color_layer.h"
10 #include "cc/test/layer_tree_pixel_test.h" 10 #include "cc/test/layer_tree_pixel_test.h"
11 #include "cc/test/pixel_comparator.h" 11 #include "cc/test/pixel_comparator.h"
12 12
13 #if !defined(OS_ANDROID) 13 #if !defined(OS_ANDROID)
14 14
15 namespace cc { 15 namespace cc {
16 namespace { 16 namespace {
17 17
18 class LayerTreeHostMasksPixelTest : public LayerTreePixelTest {}; 18 class LayerTreeHostMasksPixelTest : public LayerTreePixelTest {};
19 19
20 class MaskContentLayerClient : public ContentLayerClient { 20 class MaskContentLayerClient : public ContentLayerClient {
21 public: 21 public:
22 MaskContentLayerClient() {} 22 MaskContentLayerClient() {}
23 virtual ~MaskContentLayerClient() {} 23 virtual ~MaskContentLayerClient() {}
24 24
25 virtual void DidChangeLayerCanUseLCDText() OVERRIDE {} 25 virtual void DidChangeLayerCanUseLCDText() override {}
26 26
27 virtual bool FillsBoundsCompletely() const OVERRIDE { return false; } 27 virtual bool FillsBoundsCompletely() const override { return false; }
28 28
29 virtual void PaintContents( 29 virtual void PaintContents(
30 SkCanvas* canvas, 30 SkCanvas* canvas,
31 const gfx::Rect& rect, 31 const gfx::Rect& rect,
32 ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE { 32 ContentLayerClient::GraphicsContextStatus gc_status) override {
33 SkPaint paint; 33 SkPaint paint;
34 paint.setStyle(SkPaint::kStroke_Style); 34 paint.setStyle(SkPaint::kStroke_Style);
35 paint.setStrokeWidth(SkIntToScalar(2)); 35 paint.setStrokeWidth(SkIntToScalar(2));
36 paint.setColor(SK_ColorWHITE); 36 paint.setColor(SK_ColorWHITE);
37 37
38 canvas->clear(SK_ColorTRANSPARENT); 38 canvas->clear(SK_ColorTRANSPARENT);
39 gfx::Rect inset_rect(rect); 39 gfx::Rect inset_rect(rect);
40 while (!inset_rect.IsEmpty()) { 40 while (!inset_rect.IsEmpty()) {
41 inset_rect.Inset(3, 3, 2, 2); 41 inset_rect.Inset(3, 3, 2, 2);
42 canvas->drawRect( 42 canvas->drawRect(
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 RunPixelTest(GL_WITH_BITMAP, 271 RunPixelTest(GL_WITH_BITMAP,
272 background, 272 background,
273 base::FilePath(FILE_PATH_LITERAL( 273 base::FilePath(FILE_PATH_LITERAL(
274 "mask_of_replica_of_clipped_layer.png"))); 274 "mask_of_replica_of_clipped_layer.png")));
275 } 275 }
276 276
277 } // namespace 277 } // namespace
278 } // namespace cc 278 } // namespace cc
279 279
280 #endif // OS_ANDROID 280 #endif // OS_ANDROID
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_pixeltest_filters.cc ('k') | cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698