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

Side by Side Diff: cc/trees/layer_tree_host_pixeltest_masks.cc

Issue 565043002: cc: Remove the opaque rect return-parameter from ContentLayerClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: contentlayerclientopaque: build Created 6 years, 3 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"
(...skipping 11 matching lines...) Expand all
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 gfx::RectF* opaque_rect,
33 ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE { 32 ContentLayerClient::GraphicsContextStatus gc_status) OVERRIDE {
34 SkPaint paint; 33 SkPaint paint;
35 paint.setStyle(SkPaint::kStroke_Style); 34 paint.setStyle(SkPaint::kStroke_Style);
36 paint.setStrokeWidth(SkIntToScalar(2)); 35 paint.setStrokeWidth(SkIntToScalar(2));
37 paint.setColor(SK_ColorWHITE); 36 paint.setColor(SK_ColorWHITE);
38 37
39 canvas->clear(SK_ColorTRANSPARENT); 38 canvas->clear(SK_ColorTRANSPARENT);
40 gfx::Rect inset_rect(rect); 39 gfx::Rect inset_rect(rect);
41 while (!inset_rect.IsEmpty()) { 40 while (!inset_rect.IsEmpty()) {
42 inset_rect.Inset(3, 3, 2, 2); 41 inset_rect.Inset(3, 3, 2, 2);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 mask->SetIsMask(true); 78 mask->SetIsMask(true);
80 mask->SetBounds(gfx::Size(100, 100)); 79 mask->SetBounds(gfx::Size(100, 100));
81 80
82 SkBitmap bitmap; 81 SkBitmap bitmap;
83 bitmap.allocN32Pixels(400, 400); 82 bitmap.allocN32Pixels(400, 400);
84 SkCanvas canvas(bitmap); 83 SkCanvas canvas(bitmap);
85 canvas.scale(SkIntToScalar(4), SkIntToScalar(4)); 84 canvas.scale(SkIntToScalar(4), SkIntToScalar(4));
86 MaskContentLayerClient client; 85 MaskContentLayerClient client;
87 client.PaintContents(&canvas, 86 client.PaintContents(&canvas,
88 gfx::Rect(100, 100), 87 gfx::Rect(100, 100),
89 NULL,
90 ContentLayerClient::GRAPHICS_CONTEXT_ENABLED); 88 ContentLayerClient::GRAPHICS_CONTEXT_ENABLED);
91 mask->SetBitmap(bitmap); 89 mask->SetBitmap(bitmap);
92 90
93 scoped_refptr<SolidColorLayer> green = CreateSolidColorLayerWithBorder( 91 scoped_refptr<SolidColorLayer> green = CreateSolidColorLayerWithBorder(
94 gfx::Rect(50, 50, 100, 100), kCSSGreen, 1, SK_ColorBLACK); 92 gfx::Rect(50, 50, 100, 100), kCSSGreen, 1, SK_ColorBLACK);
95 green->SetMaskLayer(mask.get()); 93 green->SetMaskLayer(mask.get());
96 background->AddChild(green); 94 background->AddChild(green);
97 95
98 this->impl_side_painting_ = false; 96 this->impl_side_painting_ = false;
99 RunPixelTest(GL_WITH_BITMAP, 97 RunPixelTest(GL_WITH_BITMAP,
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 RunPixelTest(GL_WITH_BITMAP, 271 RunPixelTest(GL_WITH_BITMAP,
274 background, 272 background,
275 base::FilePath(FILE_PATH_LITERAL( 273 base::FilePath(FILE_PATH_LITERAL(
276 "mask_of_replica_of_clipped_layer.png"))); 274 "mask_of_replica_of_clipped_layer.png")));
277 } 275 }
278 276
279 } // namespace 277 } // namespace
280 } // namespace cc 278 } // namespace cc
281 279
282 #endif // OS_ANDROID 280 #endif // OS_ANDROID
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_perftest.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