diff options
author | 2017-07-25 14:11:29 +0000 | |
---|---|---|
committer | 2017-07-25 14:11:45 +0000 | |
commit | 6af2a668f4343bc0db87d27d28b0edc60f5cd6b9 (patch) | |
tree | 1c3272b266424d38a8b68850ac81806987276bc0 /include/private/GrSurfaceProxy.h | |
parent | 0e05a823f6ff6e9d799172f002e77ab9f2015f0f (diff) |
Revert "Reduce dependence on GrSurface's origin field (take 2)"
This reverts commit 22115b4fc6ab169d45a1cfb65dae2dc7e544c80a.
Reason for revert: GrAHardwareBufferImageGenerator.cpp
Original change's description:
> Reduce dependence on GrSurface's origin field (take 2)
>
> TBR=bsalomon@google.com
> Change-Id: Ia238fc66b0fe10a3626c7967b2ac1f1a4bf4cd71
> Reviewed-on: https://skia-review.googlesource.com/25800
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: I6dc77f02eed3073317128c48f0b426b81926787f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/26480
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/private/GrSurfaceProxy.h')
-rw-r--r-- | include/private/GrSurfaceProxy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index efd078a1c3..71eaf138bf 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -173,8 +173,8 @@ private: class GrSurfaceProxy : public GrIORefProxy { public: - static sk_sp<GrSurfaceProxy> MakeWrapped(sk_sp<GrSurface>, GrSurfaceOrigin); - static sk_sp<GrTextureProxy> MakeWrapped(sk_sp<GrTexture>, GrSurfaceOrigin); + static sk_sp<GrSurfaceProxy> MakeWrapped(sk_sp<GrSurface>); + static sk_sp<GrTextureProxy> MakeWrapped(sk_sp<GrTexture>); static sk_sp<GrTextureProxy> MakeDeferred(GrResourceProvider*, const GrSurfaceDesc&, SkBackingFit, @@ -352,7 +352,7 @@ protected: } // Wrapped version - GrSurfaceProxy(sk_sp<GrSurface> surface, GrSurfaceOrigin origin, SkBackingFit fit); + GrSurfaceProxy(sk_sp<GrSurface> surface, SkBackingFit fit); virtual ~GrSurfaceProxy(); |