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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« cc/playback/compositing_display_item.cc ('K') | « cc/playback/compositing_display_item.cc ('k') | cc/proto/skia_conversions.h » ('j') | cc/proto/skia_conversions_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/display_item_list_unittest.cc
diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc
index 9bbc5d92fe7834be8582bd8ca5ec88a4b0bb7570..6f84642a72ff918fb10521287c2d8379ed6dd995 100644
--- a/cc/playback/display_item_list_unittest.cc
+++ b/cc/playback/display_item_list_unittest.cc
@@ -32,7 +32,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"
#include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/core/SkXfermode.h"
+
#include "third_party/skia/include/effects/SkColorMatrixFilter.h"
#include "third_party/skia/include/effects/SkImageSource.h"
#include "third_party/skia/include/utils/SkPictureUtils.h"
@@ -225,7 +225,7 @@ TEST(DisplayItemListTest, SerializeCompositingItem) {
// Build the CompositingDisplayItem.
list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(
- 150, SkXfermode::Mode::kDst_Mode, nullptr,
+ 150, SkBlendMode::kDst, nullptr,
SkColorMatrixFilter::MakeLightingFilter(SK_ColorRED, SK_ColorGREEN),
false);
« cc/playback/compositing_display_item.cc ('K') | « cc/playback/compositing_display_item.cc ('k') | cc/proto/skia_conversions.h » ('j') | cc/proto/skia_conversions_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698