diff options
| author |  reed <reed@google.com> | 2016-08-05 12:07:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-05 12:07:41 -0700 |
| commit | 1ec04d9553af68b458c8dd6bd18d8c25ebd41d7a (patch) | |
| tree | 11c3db498c2c6705366cc02789597ee59c2cbd8c /tests | |
| parent | 40254c2c2dc28a34f96294d5a1ad94a99b0be8a6 (diff) | |
rename FoceCopyMode to SkCopyPixelMode
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2220603002
Review-Url: https://codereview.chromium.org/2220603002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageTest.cpp | 16 | ||||
| -rw-r--r-- | tests/SerializationTest.cpp | 9 |
2 files changed, 12 insertions, 13 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 671c479816..14b55a421a 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -194,20 +194,20 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageEncode_Gpu, reporter, ctxInfo) { DEF_TEST(Image_MakeFromRasterBitmap, reporter) { const struct { - ForceCopyMode fMode; - bool fExpectSameAsMutable; - bool fExpectSameAsImmutable; + SkCopyPixelsMode fCPM; + bool fExpectSameAsMutable; + bool fExpectSameAsImmutable; } recs[] = { - { kNo_ForceCopyMode, false, true }, - { kYes_ForceCopyMode, false, false }, - { kNever_ForceCopyMode, true, true }, + { kIfMutable_SkCopyPixelsMode, false, true }, + { kAlways_SkCopyPixelsMode, false, false }, + { kNever_SkCopyPixelsMode, true, true }, }; for (auto rec : recs) { SkPixmap pm; SkBitmap bm; bm.allocN32Pixels(100, 100); - auto img = SkMakeImageFromRasterBitmap(bm, rec.fMode); + auto img = SkMakeImageFromRasterBitmap(bm, rec.fCPM); REPORTER_ASSERT(reporter, img->peekPixels(&pm)); const bool sameMutable = pm.addr32(0, 0) == bm.getAddr32(0, 0); REPORTER_ASSERT(reporter, rec.fExpectSameAsMutable == sameMutable); @@ -215,7 +215,7 @@ DEF_TEST(Image_MakeFromRasterBitmap, reporter) { bm.notifyPixelsChanged(); // force a new generation ID bm.setImmutable(); - img = SkMakeImageFromRasterBitmap(bm, rec.fMode); + img = SkMakeImageFromRasterBitmap(bm, rec.fCPM); REPORTER_ASSERT(reporter, img->peekPixels(&pm)); const bool sameImmutable = pm.addr32(0, 0) == bm.getAddr32(0, 0); REPORTER_ASSERT(reporter, rec.fExpectSameAsImmutable == sameImmutable); diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index 0e53ac6009..86591b5d28 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -7,7 +7,6 @@ #include "Resources.h" #include "SkAnnotationKeys.h" -#include "SkBitmapProcShader.h" #include "SkCanvas.h" #include "SkFixed.h" #include "SkFontDescriptor.h" @@ -581,12 +580,12 @@ DEF_TEST(Serialization, reporter) { normals.allocN32Pixels(kTexSize, kTexSize); sk_tool_utils::create_frustum_normal_map(&normals, SkIRect::MakeWH(kTexSize, kTexSize)); - sk_sp<SkShader> normalMap = SkMakeBitmapShader(normals, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + sk_sp<SkShader> normalMap = SkShader::MakeBitmapShader(normals, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, &matrix); sk_sp<SkNormalSource> normalSource = SkNormalSource::MakeFromNormalMap(std::move(normalMap), ctm); - sk_sp<SkShader> diffuseShader = SkMakeBitmapShader(diffuse, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + sk_sp<SkShader> diffuseShader = SkShader::MakeBitmapShader(diffuse, + SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix); sk_sp<SkShader> lightingShader = SkLightingShader::Make(diffuseShader, normalSource, |