OLD | NEW |
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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "cc/layers/content_layer_client.h" | 8 #include "cc/layers/content_layer_client.h" |
9 #include "cc/layers/picture_image_layer.h" | 9 #include "cc/layers/picture_image_layer.h" |
10 #include "cc/layers/picture_layer.h" | 10 #include "cc/layers/picture_layer.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 mask->SetBounds(mask_bounds); | 104 mask->SetBounds(mask_bounds); |
105 | 105 |
106 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(200, 200); | 106 sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(200, 200); |
107 SkCanvas* canvas = surface->getCanvas(); | 107 SkCanvas* canvas = surface->getCanvas(); |
108 canvas->scale(SkIntToScalar(4), SkIntToScalar(4)); | 108 canvas->scale(SkIntToScalar(4), SkIntToScalar(4)); |
109 MaskContentLayerClient client(mask_bounds); | 109 MaskContentLayerClient client(mask_bounds); |
110 scoped_refptr<DisplayItemList> mask_display_list = | 110 scoped_refptr<DisplayItemList> mask_display_list = |
111 client.PaintContentsToDisplayList( | 111 client.PaintContentsToDisplayList( |
112 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); | 112 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); |
113 mask_display_list->Raster(canvas); | 113 mask_display_list->Raster(canvas); |
114 mask->SetImage(PaintImage(surface->makeImageSnapshot())); | 114 mask->SetImage( |
| 115 PaintImage(PaintImage::GetNextId(), surface->makeImageSnapshot())); |
115 | 116 |
116 scoped_refptr<SolidColorLayer> green = CreateSolidColorLayerWithBorder( | 117 scoped_refptr<SolidColorLayer> green = CreateSolidColorLayerWithBorder( |
117 gfx::Rect(25, 25, 50, 50), kCSSGreen, 1, SK_ColorBLACK); | 118 gfx::Rect(25, 25, 50, 50), kCSSGreen, 1, SK_ColorBLACK); |
118 green->SetMaskLayer(mask.get()); | 119 green->SetMaskLayer(mask.get()); |
119 background->AddChild(green); | 120 background->AddChild(green); |
120 | 121 |
121 RunPixelResourceTest( | 122 RunPixelResourceTest( |
122 background, base::FilePath(FILE_PATH_LITERAL("image_mask_of_layer.png"))); | 123 background, base::FilePath(FILE_PATH_LITERAL("image_mask_of_layer.png"))); |
123 } | 124 } |
124 | 125 |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 | 398 |
398 RunPixelResourceTest(background, | 399 RunPixelResourceTest(background, |
399 base::FilePath( | 400 base::FilePath( |
400 FILE_PATH_LITERAL("mask_of_layer_with_blend.png"))); | 401 FILE_PATH_LITERAL("mask_of_layer_with_blend.png"))); |
401 } | 402 } |
402 | 403 |
403 } // namespace | 404 } // namespace |
404 } // namespace cc | 405 } // namespace cc |
405 | 406 |
406 #endif // !defined(OS_ANDROID) | 407 #endif // !defined(OS_ANDROID) |
OLD | NEW |