diff options
| author |  Mike Klein <mtklein@google.com> | 2018-01-27 17:30:04 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-27 17:30:15 +0000 |
| commit | 88d90714fad0fed2739fb8c5f90fe814c8a274ef (patch) | |
| tree | 85d26395c1fbcdd21ca0e2029b022862ca09fe79 /src/shaders/SkPictureShader.cpp | |
| parent | fc20008819f39e1504aa572e28c56e83e14bff79 (diff) | |
Revert "hide picture virtuals (no public callers)"
This reverts commit 8005bff7e631a269f0dfaae93ff9963dc0e5ff39.
Reason for revert: hwui, flutter, and headless blink in G3 all still using these.
Original change's description:
> hide picture virtuals (no public callers)
>
> This prepares the way for a clean impl of a "placeholder" picture that never unrolls
>
> Bug: skia:
> Change-Id: I3b5785c5c94432b54e9a7dc280b2a6e716592473
> Reviewed-on: https://skia-review.googlesource.com/100260
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,mtklein@google.com,reed@google.com
Change-Id: I385789dd420588ea9a9390c8a44c6ecb96c7f358
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/100880
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/shaders/SkPictureShader.cpp')
| -rw-r--r-- | src/shaders/SkPictureShader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp index fb15f6603b..21bd5a531c 100644 --- a/src/shaders/SkPictureShader.cpp +++ b/src/shaders/SkPictureShader.cpp @@ -15,7 +15,7 @@ #include "SkImage.h" #include "SkImageShader.h" #include "SkMatrixUtils.h" -#include "SkPicturePriv.h" +#include "SkPicture.h" #include "SkPictureImageGenerator.h" #include "SkReadBuffer.h" #include "SkResourceCache.h" @@ -176,7 +176,7 @@ void SkPictureShader::flatten(SkWriteBuffer& buffer) const { buffer.writeRect(fTile); buffer.writeBool(true); - SkPicturePriv::Flatten(buffer, fPicture.get()); + fPicture->flatten(buffer); } sk_sp<SkShader> SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix, const SkMatrix* localM, |