commit 7b05ff11ebc51f3f3abd1c1756337a04f563537e
author robertphillips <robertphillips@google.com> Fri Jun 19 14:14:54 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jun 19 14:14:55 2015 -0700
tree 81eb9b7e9ee2c28bf474d4540561929b1a435158
parent b7134b64c689f6cafcad9cb27ff2adb0706ab37c

Rename all things "leaky" in SkDevice

Review URL: https://codereview.chromium.org/1198603002

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 4eeb642..a67b2c2 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -150,7 +150,7 @@
     fLegacyBitmap.setInfo(info);
     fLegacyBitmap.setPixelRef(pr)->unref();
 
-    fDrawContext.reset(SkRef(fContext->drawContext(&this->getLeakyProperties())));
+    fDrawContext.reset(SkRef(fContext->drawContext(&this->surfaceProps())));
 }
 
 GrRenderTarget* SkGpuDevice::CreateRenderTarget(GrContext* context, SkSurface::Budgeted budgeted,
@@ -335,7 +335,7 @@
     SkPixelRef* pr = SkNEW_ARGS(SkGrPixelRef, (fRenderTarget->surfacePriv().info(), fRenderTarget));
     fLegacyBitmap.setPixelRef(pr)->unref();
 
-    fDrawContext.reset(SkRef(fRenderTarget->getContext()->drawContext(&this->getLeakyProperties())));
+    fDrawContext.reset(SkRef(fRenderTarget->getContext()->drawContext(&this->surfaceProps())));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1231,7 +1231,7 @@
 
     // FIXME: plumb actual surface props such that we don't have to lie about the flags here
     //        (https://code.google.com/p/skia/issues/detail?id=3148).
-    SkImageFilter::Proxy proxy(this, SkSurfaceProps(0, getLeakyProperties().pixelGeometry()));
+    SkImageFilter::Proxy proxy(this, SkSurfaceProps(0, this->surfaceProps().pixelGeometry()));
 
     if (filter->canFilterImageGPU()) {
         return filter->filterImageGPU(&proxy, wrap_texture(texture, width, height),
@@ -1684,7 +1684,7 @@
     texture.reset(fContext->textureProvider()->refScratchTexture(desc, match));
 
     if (texture) {
-        SkSurfaceProps props(this->getLeakyProperties().flags(), cinfo.fPixelGeometry);
+        SkSurfaceProps props(this->surfaceProps().flags(), cinfo.fPixelGeometry);
         return SkGpuDevice::Create(
             texture->asRenderTarget(), cinfo.fInfo.width(), cinfo.fInfo.height(), &props, flags);
     } else {