commit 5c1b360a89f85accd7dc446670f6f062c73e7e77
author Hal Canary <halcanary@google.com> Mon Apr 17 16:30:06 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 04 13:08:29 2017 +0000
tree a15f476b39778027f982d753719487bc4a6d34ca
parent bc6e5ff7cfbacc28659c0aecbe9f2989cad80336

src/pdf: code cleanup

  * SkPDFCanon: remove unnecessary abstraction
  * Make use of SkTHashMap<K, sk_sp<T>>.
  * Remove unncessary struct constructors.
  * More factory fns return sk_sp<T>
  * SkPDFUtility::GetCachedT<T> factored out.

Change-Id: I4055a131b43fe2588fd042b769cd09fff8a3466c
Reviewed-on: https://skia-review.googlesource.com/13655
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

src/pdf/SkPDFGraphicState.cpp

diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp
index d60526c..068f9bd 100644
--- a/src/pdf/SkPDFGraphicState.cpp
+++ b/src/pdf/SkPDFGraphicState.cpp
@@ -104,9 +104,8 @@
     , fStrokeJoin(SkToU8(p.getStrokeJoin()))
     , fMode(SkToU8((unsigned)mode_for_pdf(p.getBlendMode()))) {}
 
-// static
-SkPDFGraphicState* SkPDFGraphicState::GetGraphicStateForPaint(
-        SkPDFCanon* canon, const SkPaint& paint) {
+sk_sp<SkPDFGraphicState> SkPDFGraphicState::GetGraphicStateForPaint(SkPDFCanon* canon,
+                                                                    const SkPaint& paint) {
     SkASSERT(canon);
     SkPDFGraphicState key(paint);
     if (const SkPDFGraphicState* canonGS = canon->findGraphicState(key)) {
@@ -114,14 +113,14 @@
         // since the emitObject() interface is non-const.  But We
         // promise that there is no way to mutate this object from
         // here on out.
-        return SkRef(const_cast<SkPDFGraphicState*>(canonGS));
+        return sk_sp<SkPDFGraphicState>(SkRef(const_cast<SkPDFGraphicState*>(canonGS)));
     }
-    SkPDFGraphicState* pdfGraphicState = new SkPDFGraphicState(paint);
-    canon->addGraphicState(pdfGraphicState);
+    sk_sp<SkPDFGraphicState> pdfGraphicState(new SkPDFGraphicState(paint));
+    canon->addGraphicState(pdfGraphicState.get());
     return pdfGraphicState;
 }
 
-sk_sp<SkPDFStream> SkPDFGraphicState::MakeInvertFunction() {
+static sk_sp<SkPDFStream> make_invert_function() {
     // Acrobat crashes if we use a type 0 function, kpdf crashes if we use
     // a type 2 function, so we use a type 4 function.
     auto domainAndRange = sk_make_sp<SkPDFArray>();
@@ -156,7 +155,8 @@
     if (invert) {
         // Instead of calling SkPDFGraphicState::MakeInvertFunction,
         // let the canon deduplicate this object.
-        sMaskDict->insertObjRef("TR", canon->makeInvertFunction());
+        sMaskDict->insertObjRef(
+                "TR", SkPDFUtils::GetCachedT(&canon->fInvertFunction, &make_invert_function));
     }
 
     auto result = sk_make_sp<SkPDFDict>("ExtGState");