aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/TessellatingPathRendererTests.cpp
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2017-05-24 21:15:46 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-24 21:15:57 +0000
commitd93e11ceb427ff433d219081b74d10b8757d0b03 (patch)
treea893280c0cef7dacada35555281ce8951cad4552 /tests/TessellatingPathRendererTests.cpp
parentffce079f4e0ca4ccb7f24aa647eee1de5feb6e02 (diff)
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 <fmalita@chromium.org> > Reviewed-by: Mike Reed <reed@google.com> > 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 <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tests/TessellatingPathRendererTests.cpp')
-rw-r--r--tests/TessellatingPathRendererTests.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp
index f799bd7e91..79385af956 100644
--- a/tests/TessellatingPathRendererTests.cpp
+++ b/tests/TessellatingPathRendererTests.cpp
@@ -13,7 +13,6 @@
#include "GrClip.h"
#include "GrContext.h"
#include "SkGradientShader.h"
-#include "SkShaderBase.h"
#include "ops/GrTessellatingPathRenderer.h"
/*
@@ -280,9 +279,9 @@ static sk_sp<GrFragmentProcessor> create_linear_gradient_processor(GrContext* ct
SkColor colors[2] = { SK_ColorGREEN, SK_ColorBLUE };
sk_sp<SkShader> shader = SkGradientShader::MakeLinear(
pts, colors, nullptr, SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode);
- SkShaderBase::AsFPArgs args(
+ SkShader::AsFPArgs args(
ctx, &SkMatrix::I(), &SkMatrix::I(), SkFilterQuality::kLow_SkFilterQuality, nullptr);
- return as_SB(shader)->asFragmentProcessor(args);
+ return shader->asFragmentProcessor(args);
}
static void test_path(GrContext* ctx,