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

Unified Diff: cc/proto/skia_conversions_unittest.cc

Issue 2502373003: stop using SkXfermode -- use SkBlendMode instead (Closed)
Patch Set: rebase 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
« no previous file with comments | « cc/proto/skia_conversions.cc ('k') | cc/quads/draw_quad_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/proto/skia_conversions_unittest.cc
diff --git a/cc/proto/skia_conversions_unittest.cc b/cc/proto/skia_conversions_unittest.cc
index c8e02a7bf0e360aaaefd178fab9dae4b9a7da6d7..fac61a40bfe10024dfb3f2100c819fe5672e96d5 100644
--- a/cc/proto/skia_conversions_unittest.cc
+++ b/cc/proto/skia_conversions_unittest.cc
@@ -10,9 +10,9 @@
#include "cc/proto/skrrect.pb.h"
#include "cc/proto/skxfermode.pb.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBlendMode.h"
#include "third_party/skia/include/core/SkRRect.h"
#include "third_party/skia/include/core/SkRegion.h"
-#include "third_party/skia/include/core/SkXfermode.h"
namespace cc {
namespace {
@@ -25,8 +25,8 @@ TEST(SkiaProtoConversionsTest, SerializeDeserializeSkRegionOp) {
}
TEST(SkiaProtoConversionsTest, SerializeDeserializeSkXfermodeMode) {
- for (size_t i = 0; i < SkXfermode::Mode::kLastMode; i++) {
- SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(i);
+ for (size_t i = 0; i < static_cast<size_t>(SkBlendMode::kLastMode); i++) {
+ SkBlendMode mode = static_cast<SkBlendMode>(i);
EXPECT_EQ(mode, SkXfermodeModeFromProto(SkXfermodeModeToProto(mode)));
}
}
« no previous file with comments | « cc/proto/skia_conversions.cc ('k') | cc/quads/draw_quad_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698