diff options
author | bsalomon <bsalomon@google.com> | 2016-02-25 06:52:12 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 06:52:12 -0800 |
commit | bd500f09ce5b1ca464431d693f9ec5da60a59230 (patch) | |
tree | 16d46d581f91f0ebbb9fbf2316be2be7fac32ad8 /tests/ImageTest.cpp | |
parent | 2d07b76405a672dced858aaa9ed475755ea13305 (diff) |
Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider (patchset #6 id:100001 of https://codereview.chromium.org/1728093005/ )
Reason for revert:
Need workaround for chrome to build
Original issue's description:
> Move Budgeted enum out of SkSurface, use in GrTextureProvider
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1728093005
> DOCS_PREVIEW= https://skia.org/?cl=1728093005
>
> Committed: https://skia.googlesource.com/skia/+/57599fe6c0336feaeeeb9b1996e77b70219b483c
TBR=reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1734043002
Diffstat (limited to 'tests/ImageTest.cpp')
-rw-r--r-- | tests/ImageTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 2ec1f342b3..1bf56c53a2 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -124,7 +124,7 @@ static SkImage* create_codec_image() { #if SK_SUPPORT_GPU static SkImage* create_gpu_image(GrContext* context) { const SkImageInfo info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType); - SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, SkBudgeted::kNo, + SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info)); draw_image_test_pattern(surface->getCanvas()); return surface->newImageSnapshot(); @@ -696,7 +696,7 @@ DEF_GPUTEST_FOR_NATIVE_CONTEXT(SkImage_NewFromTexture, reporter, context) { desc.fHeight = h; desc.fConfig = kSkia8888_GrPixelConfig; desc.fSampleCnt = 0; - SkAutoTUnref<GrTexture> tex(provider->createTexture(desc, SkBudgeted::kNo, storage, w * 4)); + SkAutoTUnref<GrTexture> tex(provider->createTexture(desc, false, storage, w * 4)); if (!tex) { REPORTER_ASSERT(reporter, false); return; |