commit c2f9ec1f5e4e8e98489cd5ea9356771cf4d8ce13
author halcanary <halcanary@google.com> Mon Sep 12 08:55:29 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Sep 12 08:55:30 2016 -0700
tree 17c22f5a3cf2090b222ea00d1c23eb8a6f27e1e5
parent 5192475bd8cb98e8e0c1192ab5ece7b8595701d6

SkPDF: refactor & code cleanup ahead of https://crrev.com/2322403002

SkPDFDevice::GraphicStateEntry: remove unnecessary fFont and
fTextSize.

SkPDFDevice::updateFont(): replace with update_font() and inlined
code.  De-duplicate this block of code.

SkPDFResourceDict::GetResourceTypePrefix function made public: removes
need for temporary SkString returned by
SkPDFResourceDict::getResourceName()

GlyphPositioner: delay writing intial matrix until first glyph.
Assert that widechars is a constant.

SkPDFFont::FontType(): make public so that PDFDevice can know about
multibyte status.

SkPDFFont::countStretch() removed, and the stretch loop flattened.

*no changes in PDF output*

BUG=skia:5434
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2327953002

Review-Url: https://codereview.chromium.org/2327953002

src/pdf/SkPDFResourceDict.cpp

diff --git a/src/pdf/SkPDFResourceDict.cpp b/src/pdf/SkPDFResourceDict.cpp
index b24f8a5..67e81b6 100644
--- a/src/pdf/SkPDFResourceDict.cpp
+++ b/src/pdf/SkPDFResourceDict.cpp
@@ -32,7 +32,7 @@
         "Font"
 };
 
-static char get_resource_type_prefix(
+char SkPDFResourceDict::GetResourceTypePrefix(
         SkPDFResourceDict::SkPDFResourceType type) {
     SkASSERT(type >= 0);
     SkASSERT(type < SkPDFResourceDict::kResourceTypeCount);
@@ -50,9 +50,7 @@
 
 SkString SkPDFResourceDict::getResourceName(
         SkPDFResourceDict::SkPDFResourceType type, int key) {
-    SkString keyString;
-    keyString.printf("%c%d", get_resource_type_prefix(type), key);
-    return keyString;
+    return SkStringPrintf("%c%d", SkPDFResourceDict::GetResourceTypePrefix(type), key);
 }
 
 static void add_subdict(