diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-08-31 20:04:00 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-31 20:04:12 +0000 |
| commit | f43d0001e4139978fa9699083f4c62f92eb03106 (patch) | |
| tree | 79857050daf6abad47633da4023c3d8989637a15 /src/image/SkSurface.cpp | |
| parent | 085c0862f674337c5a60f8c46da4c12f0d12511a (diff) | |
Revert "Revert "Revert "Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget.""""
This reverts commit 6df4d6be0d025211400de6a910e17f2a87219887.
Reason for revert: Google3 fix landed
Original change's description:
> Revert "Revert "Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget."""
>
> This reverts commit 71554bc256b705fe959b7aa2fb2f24ed48782362.
>
> Reason for revert: Google3
>
> Original change's description:
> > Revert "Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget.""
> >
> > This reverts commit 807371c15bd742efb98a9df6e1dee73e8bda8af5.
> >
> > Docs-Preview: https://skia.org/?cl=40260
> > Change-Id: I28e0434c455155ff39a5aaa4141abdf442474e87
> > Reviewed-on: https://skia-review.googlesource.com/40260
> > Reviewed-by: Greg Daniel <egdaniel@google.com>
> > Commit-Queue: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com
>
> Change-Id: Ifdfa896a70db69935473276d12dce54de5c6b6f7
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/41500
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com
Change-Id: I827419bb19972c3644929a8c984bb9534baab0ba
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/41700
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/image/SkSurface.cpp')
| -rw-r--r-- | src/image/SkSurface.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp index eba76be038..1de7b609e3 100644 --- a/src/image/SkSurface.cpp +++ b/src/image/SkSurface.cpp @@ -259,13 +259,6 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTexture(GrContext*, const GrBackendTe } sk_sp<SkSurface> SkSurface::MakeFromBackendRenderTarget(GrContext*, - const GrBackendRenderTargetDesc&, - sk_sp<SkColorSpace>, - const SkSurfaceProps*) { - return nullptr; -} - -sk_sp<SkSurface> SkSurface::MakeFromBackendRenderTarget(GrContext*, const GrBackendRenderTarget&, GrSurfaceOrigin origin, sk_sp<SkColorSpace>, |