diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-07-27 16:16:25 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-27 22:16:06 +0000 |
| commit | 16d8ec66cdce2f30ce89b87066d3ac7a244c460d (patch) | |
| tree | c1428954ad363f7e2b6ce13bbb1640911c7a8262 /src/image | |
| parent | 713195071dc7bdeddec2d1c9fab9b3720f049f07 (diff) | |
Pull non-substantive changes out of omnibus GrSurface CL
https://skia-review.googlesource.com/c/26363 (Remove origin field from GrSurface) is
already too large. This pulls some of the cosmetic changes out for separate review.
Change-Id: I1d8b95522144b2f4cbd916ef38faa3dde6f78087
Reviewed-on: https://skia-review.googlesource.com/27840
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImage_Gpu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 3bed9e8298..a19556b653 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -230,10 +230,10 @@ bool SkImage_Gpu::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size sk_sp<SkImage> SkImage_Gpu::onMakeSubset(const SkIRect& subset) const { GrSurfaceDesc desc; - desc.fConfig = fProxy->config(); + desc.fOrigin = fProxy->origin(); desc.fWidth = subset.width(); desc.fHeight = subset.height(); - desc.fOrigin = fProxy->origin(); + desc.fConfig = fProxy->config(); sk_sp<GrSurfaceContext> sContext(fContext->contextPriv().makeDeferredSurfaceContext( desc, @@ -491,8 +491,8 @@ sk_sp<SkImage> SkImage::MakeCrossContextFromEncoded(GrContext* context, sk_sp<Sk sk_sp<GrSemaphore> sema = context->getGpu()->prepareTextureForCrossContextUsage(texture.get()); - auto gen = GrBackendTextureImageGenerator::Make(std::move(texture), std::move(sema), - codecImage->alphaType(), + auto gen = GrBackendTextureImageGenerator::Make(std::move(texture), + std::move(sema), codecImage->alphaType(), std::move(texColorSpace)); return SkImage::MakeFromGenerator(std::move(gen)); } |