diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-05-24 21:15:46 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-24 21:15:57 +0000 |
| commit | d93e11ceb427ff433d219081b74d10b8757d0b03 (patch) | |
| tree | a893280c0cef7dacada35555281ce8951cad4552 /src/core/SkPaint.cpp | |
| parent | ffce079f4e0ca4ccb7f24aa647eee1de5feb6e02 (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 'src/core/SkPaint.cpp')
| -rw-r--r-- | src/core/SkPaint.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 2d3eb1822b..568ba6a021 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -26,7 +26,6 @@ #include "SkScalar.h" #include "SkScalerContext.h" #include "SkShader.h" -#include "SkShaderBase.h" #include "SkStringUtils.h" #include "SkStroke.h" #include "SkStrokeRec.h" @@ -1251,7 +1250,7 @@ static SkPaint::Hinting computeHinting(const SkPaint& paint) { static bool justAColor(const SkPaint& paint, SkColor* color) { SkColor c = paint.getColor(); - const auto* shader = as_SB(paint.getShader()); + SkShader* shader = paint.getShader(); if (shader && !shader->asLuminanceColor(&c)) { return false; } @@ -2072,7 +2071,8 @@ void SkPaint::toString(SkString* str) const { str->append("</dd>"); } - if (const auto* shader = as_SB(this->getShader())) { + SkShader* shader = this->getShader(); + if (shader) { str->append("<dt>Shader:</dt><dd>"); shader->toString(str); str->append("</dd>"); |