diff options
author | caryclark <caryclark@google.com> | 2016-02-09 16:28:46 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-09 16:28:46 -0800 |
commit | 64e75330916f670cf9db9eb7a850afc325b18645 (patch) | |
tree | c58dab2c288218be347258031e0a452dabafb8ec /include/core/SkSurface.h | |
parent | 77a5b0e1b48845c5b6715c2948df87f5df053696 (diff) |
Revert of skia: Add support for CHROMIUM_image backed textures. (patchset #19 id:380001 of https://codereview.chromium.org/1623653002/ )
Reason for revert:
Breaks ASAN bot:
Direct leak of 56 byte(s) in 1 object(s) allocated from:
...
test_CustomTexture
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Debug-ASAN/builds/2676/steps/dm/logs/stdio
Original issue's description:
> skia: Add support for CHROMIUM_image backed textures.
>
> I created a new abstract base class TextureStorageAllocator that consumers of
> Skia can subclass and pass back to Skia. When a surface is created with a
> pointer to a TextureStorageAllocator, any textures it creates, or that are
> derived from the original surface, will allocate and deallocate storage using
> the methods on TextureStorageAllocator.
>
> BUG=https://code.google.com/p/chromium/issues/detail?id=579664
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1623653002
>
> Committed: https://skia.googlesource.com/skia/+/92098e691f10a010e7421125ba4d44c02506bb55
>
> Committed: https://skia.googlesource.com/skia/+/7fec91ce6660190f8d7c5eb6f3061e4550cc672b
>
> Committed: https://skia.googlesource.com/skia/+/b8d6e088590160f1198110c2371b802c1d541a36
TBR=bsalomon@chromium.org,cblume@chromium.org,bsalomon@google.com,robertphillips@google.com,egdaniel@google.com,reed@google.com,erikchen@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=https://code.google.com/p/chromium/issues/detail?id=579664
Review URL: https://codereview.chromium.org/1684993002
Diffstat (limited to 'include/core/SkSurface.h')
-rw-r--r-- | include/core/SkSurface.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/core/SkSurface.h b/include/core/SkSurface.h index 45262d78e6..52097be66e 100644 --- a/include/core/SkSurface.h +++ b/include/core/SkSurface.h @@ -120,16 +120,12 @@ public: /** * Return a new surface whose contents will be drawn to an offscreen * render target, allocated by the surface. - * - * The GrTextureStorageAllocator will be reused if SkImage snapshots create - * additional textures. */ - static SkSurface* NewRenderTarget( - GrContext*, Budgeted, const SkImageInfo&, int sampleCount, const SkSurfaceProps* = NULL, - GrTextureStorageAllocator = GrTextureStorageAllocator()); + static SkSurface* NewRenderTarget(GrContext*, Budgeted, const SkImageInfo&, int sampleCount, + const SkSurfaceProps* = NULL); static SkSurface* NewRenderTarget(GrContext* gr, Budgeted b, const SkImageInfo& info) { - return NewRenderTarget(gr, b, info, 0); + return NewRenderTarget(gr, b, info, 0, NULL); } int width() const { return fWidth; } |