commit 48810a023705ffac466adb93efdb3861cf2e197a
author halcanary <halcanary@google.com> Mon Mar 07 14:57:50 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Mar 07 14:57:50 2016 -0800
tree 265df5a79df70d3651c05f1997a9fe843eb97b33
parent 28f45b949acc746849100fbe112ee5280f0594c9

SkPDF: s/SkAutoTUnref/sk_sp/g

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

src/pdf/SkPDFShader.cpp

diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp
index 56926f3..8d5ee5a 100644
--- a/src/pdf/SkPDFShader.cpp
+++ b/src/pdf/SkPDFShader.cpp
@@ -587,15 +587,15 @@
 
     SkAutoTDelete<SkPDFShader::State> alphaToLuminosityState(
             state.CreateAlphaToLuminosityState());
-    SkAutoTUnref<SkPDFObject> luminosityShader(
+    sk_sp<SkPDFObject> luminosityShader(
             get_pdf_shader_by_state(canon, dpi, &alphaToLuminosityState));
 
     SkAutoTDelete<SkStream> alphaStream(create_pattern_fill_content(-1, bbox));
 
-    SkAutoTUnref<SkPDFDict>
+    sk_sp<SkPDFDict>
         resources(get_gradient_resource_dict(luminosityShader.get(), nullptr));
 
-    SkAutoTUnref<SkPDFFormXObject> alphaMask(
+    sk_sp<SkPDFFormXObject> alphaMask(
             new SkPDFFormXObject(alphaStream.get(), bbox, resources.get()));
 
     return SkPDFGraphicState::GetSMaskGraphicState(
@@ -613,7 +613,7 @@
 
     SkAutoTDelete<SkPDFShader::State> opaqueState(state.CreateOpaqueState());
 
-    SkAutoTUnref<SkPDFObject> colorShader(
+    sk_sp<SkPDFObject> colorShader(
             get_pdf_shader_by_state(canon, dpi, &opaqueState));
     if (!colorShader) {
         return nullptr;
@@ -621,13 +621,13 @@
 
     // Create resource dict with alpha graphics state as G0 and
     // pattern shader as P0, then write content stream.
-    SkAutoTUnref<SkPDFObject> alphaGs(
+    sk_sp<SkPDFObject> alphaGs(
             create_smask_graphic_state(canon, dpi, state));
 
     SkPDFAlphaFunctionShader* alphaFunctionShader =
             new SkPDFAlphaFunctionShader(autoState->detach());
 
-    SkAutoTUnref<SkPDFDict> resourceDict(
+    sk_sp<SkPDFDict> resourceDict(
             get_gradient_resource_dict(colorShader.get(), alphaGs.get()));
 
     SkAutoTDelete<SkStream> colorStream(
@@ -771,7 +771,7 @@
         return nullptr;
     }
 
-    SkAutoTUnref<SkPDFArray> domain(new SkPDFArray);
+    sk_sp<SkPDFArray> domain(new SkPDFArray);
     domain->reserve(4);
     domain->appendScalar(bbox.fLeft);
     domain->appendScalar(bbox.fRight);
@@ -799,16 +799,16 @@
         functionCode = codeFunction(*info, perspectiveInverseOnly);
     }
 
-    SkAutoTUnref<SkPDFDict> pdfShader(new SkPDFDict);
+    sk_sp<SkPDFDict> pdfShader(new SkPDFDict);
     pdfShader->insertInt("ShadingType", 1);
     pdfShader->insertName("ColorSpace", "DeviceRGB");
     pdfShader->insertObject("Domain", SkRef(domain.get()));
 
-    SkAutoTUnref<SkPDFStream> function(
+    sk_sp<SkPDFStream> function(
             make_ps_function(functionCode, domain.get()));
     pdfShader->insertObjRef("Function", function.release());
 
-    SkAutoTUnref<SkPDFFunctionShader> pdfFunctionShader(new SkPDFFunctionShader(autoState->detach()));
+    sk_sp<SkPDFFunctionShader> pdfFunctionShader(new SkPDFFunctionShader(autoState->detach()));
 
     pdfFunctionShader->insertInt("PatternType", 2);
     pdfFunctionShader->insertObject("Matrix",
@@ -859,7 +859,7 @@
 
     SkISize size = SkISize::Make(SkScalarRoundToInt(deviceBounds.width()),
                                  SkScalarRoundToInt(deviceBounds.height()));
-    SkAutoTUnref<SkPDFDevice> patternDevice(
+    sk_sp<SkPDFDevice> patternDevice(
             SkPDFDevice::CreateUnflipped(size, dpi, canon));
     SkCanvas canvas(patternDevice.get());
 
@@ -1024,7 +1024,7 @@
     SkPDFImageShader* imageShader = new SkPDFImageShader(autoState->detach());
     imageShader->setData(content.get());
 
-    SkAutoTUnref<SkPDFDict> resourceDict(
+    sk_sp<SkPDFDict> resourceDict(
             patternDevice->createResourceDict());
     populate_tiling_pattern_dict(imageShader, patternBBox,
                                  resourceDict.get(), finalMatrix);