SkPDF: PDFShader code modernized.

src/pdf/SkPDFGraphicState.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkPaint.h"
 #include "SkPDFCanon.h"
@@ skipping 126 matching lines @@
     // Do not copy the trailing '\0' into the SkData.
     auto invertFunction = sk_make_sp<SkPDFStream>(
             SkData::MakeWithoutCopy(psInvert, strlen(psInvert)));
     invertFunction->dict()->insertInt("FunctionType", 4);
     invertFunction->dict()->insertObject("Domain", domainAndRange);
     invertFunction->dict()->insertObject("Range", std::move(domainAndRange));
     return invertFunction;
 }
 
 sk_sp<SkPDFDict> SkPDFGraphicState::GetSMaskGraphicState(
-        SkPDFObject* sMask,
+        sk_sp<SkPDFObject> sMask,
         bool invert,
         SkPDFSMaskMode sMaskMode,
         SkPDFCanon* canon) {
     // The practical chances of using the same mask more than once are unlikely
     // enough that it's not worth canonicalizing.
     auto sMaskDict = sk_make_sp<SkPDFDict>("Mask");
     if (sMaskMode == kAlpha_SMaskMode) {
         sMaskDict->insertName("S", "Alpha");
     } else if (sMaskMode == kLuminosity_SMaskMode) {
         sMaskDict->insertName("S", "Luminosity");
     }
-    sMaskDict->insertObjRef("G", sk_ref_sp(sMask));
+    sMaskDict->insertObjRef("G", std::move(sMask));
     if (invert) {
         // Instead of calling SkPDFGraphicState::MakeInvertFunction,
         // let the canon deduplicate this object.
         sMaskDict->insertObjRef("TR", canon->makeInvertFunction());
     }
 
     auto result = sk_make_sp<SkPDFDict>("ExtGState");
     result->insertObject("SMask", std::move(sMaskDict));
     return result;
 }
@@ skipping 32 matching lines @@
     static_assert(SkPaint::kJoinCount == 3, "paint_join_mismatch");
     SkASSERT(strokeJoin >= 0 && strokeJoin <= 2);
     dict->insertInt("LJ", strokeJoin);
 
     dict->insertScalar("LW", fStrokeWidth);
     dict->insertScalar("ML", fStrokeMiter);
     dict->insertBool("SA", true);  // SA = Auto stroke adjustment.
     dict->insertName("BM", as_blend_mode(xferMode));
     dict->emitObject(stream, objNumMap, substitutes);
 }