aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkSurface.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-07-20 20:48:12 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-20 20:48:23 +0000
commit807371c15bd742efb98a9df6e1dee73e8bda8af5 (patch)
tree3fd563c6347d5948e3a1410adffdf46492bdbd4a /src/image/SkSurface.cpp
parent3b59af5bf88920515835c79fe07c302438dc8e55 (diff)
Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget."
This reverts commit e2d37c2a07f5473e5fc6fb65e9e23e14127580e9. Reason for revert: <INSERT REASONING HERE> Original change's description: > Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget. > > Also removes a reference to GrBackendTextureDesc in a comment and updates markdown docs. > > Docs-Preview: https://skia.org/?cl=24861 > Bug: skia: > Change-Id: Ic6490d5ef46953450e6dee69271397bb2b94d0d6 > Reviewed-on: https://skia-review.googlesource.com/24861 > Commit-Queue: Brian Salomon <bsalomon@google.com> > Reviewed-by: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I4b85b529727f0bf5aec21d87e725a8195666e2e5 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/25182 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.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp
index e0a058093b..d7fa60589a 100644
--- a/src/image/SkSurface.cpp
+++ b/src/image/SkSurface.cpp
@@ -241,6 +241,13 @@ 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>,