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/SerializationTest.cpp | |
| 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/SerializationTest.cpp')
| -rw-r--r-- | tests/SerializationTest.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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, |