From 1ec04d9553af68b458c8dd6bd18d8c25ebd41d7a Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 5 Aug 2016 12:07:41 -0700 Subject: rename FoceCopyMode to SkCopyPixelMode BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2220603002 Review-Url: https://codereview.chromium.org/2220603002 --- tests/SerializationTest.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests/SerializationTest.cpp') 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 normalMap = SkMakeBitmapShader(normals, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + sk_sp normalMap = SkShader::MakeBitmapShader(normals, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, &matrix); sk_sp normalSource = SkNormalSource::MakeFromNormalMap(std::move(normalMap), ctm); - sk_sp diffuseShader = SkMakeBitmapShader(diffuse, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + sk_sp diffuseShader = SkShader::MakeBitmapShader(diffuse, + SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix); sk_sp lightingShader = SkLightingShader::Make(diffuseShader, normalSource, -- cgit v1.2.3