From d93e11ceb427ff433d219081b74d10b8757d0b03 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Wed, 24 May 2017 21:15:46 +0000 Subject: Revert "SkShaderBase" This reverts commit 58a756435ca3700d9766a4580bb0771a9774f603. Reason for revert: g3, Android borkage. Original change's description: > SkShaderBase > > Introduce a private base class (SkShaderBase), to hide > implementation details from the public interface (SkShader). > > Change-Id: If3ec26ca6abc9da20e3f139c11fdc023bdd85176 > Reviewed-on: https://skia-review.googlesource.com/17241 > Commit-Queue: Florin Malita > Reviewed-by: Mike Reed > TBR=mtklein@google.com,fmalita@chromium.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I32b012ee466dd006c074593f211f43ed602f1078 Reviewed-on: https://skia-review.googlesource.com/17845 Reviewed-by: Florin Malita Commit-Queue: Florin Malita --- 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 1212833c0e..bb49df0528 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -18,7 +18,6 @@ #include "SkNormalSource.h" #include "SkOSFile.h" #include "SkPictureRecorder.h" -#include "SkShaderBase.h" #include "SkTableColorFilter.h" #include "SkTemplates.h" #include "SkTypeface.h" @@ -611,22 +610,22 @@ DEF_TEST(Serialization, reporter) { sk_sp lightingShader = SkLightingShader::Make(diffuseShader, normalSource, fLights); - sk_sp(TestFlattenableSerialization(as_SB(lightingShader.get()), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); lightingShader = SkLightingShader::Make(std::move(diffuseShader), nullptr, fLights); - sk_sp(TestFlattenableSerialization(as_SB(lightingShader.get()), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); lightingShader = SkLightingShader::Make(nullptr, std::move(normalSource), fLights); - sk_sp(TestFlattenableSerialization(as_SB(lightingShader.get()), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); lightingShader = SkLightingShader::Make(nullptr, nullptr, fLights); - sk_sp(TestFlattenableSerialization(as_SB(lightingShader.get()), true, reporter)); + sk_sp(TestFlattenableSerialization(lightingShader.get(), true, reporter)); } // Test NormalBevelSource serialization -- cgit v1.2.3