From afbf2d6273cd22c683f20a7e5773843876af3085 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 30 Sep 2014 12:18:44 -0700 Subject: Make "priv" classes for GrTexure and GrSurface. R=robertphillips@google.com, egdaniel@google.com, joshualitt@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/596053002 --- src/gpu/SkGpuDevice.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/gpu/SkGpuDevice.cpp') diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 455a8abe01..6eaed89828 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -151,9 +151,10 @@ SkGpuDevice::SkGpuDevice(GrSurface* surface, const SkSurfaceProps& props, unsign fRenderTarget = SkRef(surface->asRenderTarget()); + SkImageInfo info = surface->surfacePriv().info(); SkPixelRef* pr = SkNEW_ARGS(SkGrPixelRef, - (surface->info(), surface, SkToBool(flags & kCached_Flag))); - fLegacyBitmap.setInfo(surface->info()); + (info, surface, SkToBool(flags & kCached_Flag))); + fLegacyBitmap.setInfo(info); fLegacyBitmap.setPixelRef(pr)->unref(); this->setPixelGeometry(props.pixelGeometry()); @@ -691,7 +692,7 @@ bool create_mask_GPU(GrContext* context, SkBitmap wrap_texture(GrTexture* texture) { SkBitmap result; - result.setInfo(texture->info()); + result.setInfo(texture->surfacePriv().info()); result.setPixelRef(SkNEW_ARGS(SkGrPixelRef, (result.info(), texture)))->unref(); return result; } -- cgit v1.2.3