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

Side by Side Diff: cc/playback/display_item_list_unittest.cc

Issue 2502373003: stop using SkXfermode -- use SkBlendMode instead (Closed)
Patch Set: Created 4 years, 1 month 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 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/playback/display_item_list.h" 5 #include "cc/playback/display_item_list.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 #include "cc/test/fake_image_serialization_processor.h" 25 #include "cc/test/fake_image_serialization_processor.h"
26 #include "cc/test/geometry_test_utils.h" 26 #include "cc/test/geometry_test_utils.h"
27 #include "cc/test/skia_common.h" 27 #include "cc/test/skia_common.h"
28 #include "testing/gmock/include/gmock/gmock.h" 28 #include "testing/gmock/include/gmock/gmock.h"
29 #include "testing/gtest/include/gtest/gtest.h" 29 #include "testing/gtest/include/gtest/gtest.h"
30 #include "third_party/skia/include/core/SkBitmap.h" 30 #include "third_party/skia/include/core/SkBitmap.h"
31 #include "third_party/skia/include/core/SkCanvas.h" 31 #include "third_party/skia/include/core/SkCanvas.h"
32 #include "third_party/skia/include/core/SkColor.h" 32 #include "third_party/skia/include/core/SkColor.h"
33 #include "third_party/skia/include/core/SkPictureRecorder.h" 33 #include "third_party/skia/include/core/SkPictureRecorder.h"
34 #include "third_party/skia/include/core/SkSurface.h" 34 #include "third_party/skia/include/core/SkSurface.h"
35 #include "third_party/skia/include/core/SkXfermode.h" 35
36 #include "third_party/skia/include/effects/SkColorMatrixFilter.h" 36 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
37 #include "third_party/skia/include/effects/SkImageSource.h" 37 #include "third_party/skia/include/effects/SkImageSource.h"
38 #include "third_party/skia/include/utils/SkPictureUtils.h" 38 #include "third_party/skia/include/utils/SkPictureUtils.h"
39 #include "ui/gfx/geometry/rect.h" 39 #include "ui/gfx/geometry/rect.h"
40 #include "ui/gfx/geometry/rect_conversions.h" 40 #include "ui/gfx/geometry/rect_conversions.h"
41 #include "ui/gfx/skia_util.h" 41 #include "ui/gfx/skia_util.h"
42 42
43 namespace cc { 43 namespace cc {
44 44
45 namespace { 45 namespace {
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 DisplayItemListSettings settings; 218 DisplayItemListSettings settings;
219 settings.use_cached_picture = true; 219 settings.use_cached_picture = true;
220 scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings); 220 scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
221 list->SetRetainVisualRectsForTesting(true); 221 list->SetRetainVisualRectsForTesting(true);
222 222
223 // Build the DrawingDisplayItem. 223 // Build the DrawingDisplayItem.
224 AppendFirstSerializationTestPicture(list, layer_size); 224 AppendFirstSerializationTestPicture(list, layer_size);
225 225
226 // Build the CompositingDisplayItem. 226 // Build the CompositingDisplayItem.
227 list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>( 227 list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(
228 150, SkXfermode::Mode::kDst_Mode, nullptr, 228 150, SkBlendMode::kDst, nullptr,
229 SkColorMatrixFilter::MakeLightingFilter(SK_ColorRED, SK_ColorGREEN), 229 SkColorMatrixFilter::MakeLightingFilter(SK_ColorRED, SK_ColorGREEN),
230 false); 230 false);
231 231
232 // Build the second DrawingDisplayItem. 232 // Build the second DrawingDisplayItem.
233 AppendSecondSerializationTestPicture(list, layer_size); 233 AppendSecondSerializationTestPicture(list, layer_size);
234 234
235 // Build the EndCompositingDisplayItem. 235 // Build the EndCompositingDisplayItem.
236 list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>(); 236 list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>();
237 237
238 ValidateDisplayItemListSerialization(layer_size, list); 238 ValidateDisplayItemListSerialization(layer_size, list);
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 list->CreateAndAppendPairedEndItem<EndClipDisplayItem>(); 944 list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
945 945
946 EXPECT_EQ(4u, list->size()); 946 EXPECT_EQ(4u, list->size());
947 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(0)); 947 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(0));
948 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(1)); 948 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(1));
949 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(2)); 949 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(2));
950 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(3)); 950 EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(3));
951 } 951 }
952 952
953 } // namespace cc 953 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698