SkPDF: revert changes to CMapName/Registry/Ordering in 3d01c62

src/pdf/SkPDFFont.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 "SkGlyphCache.h"
 #include "SkPaint.h"
@@ skipping 408 matching lines @@
     if (type == SkAdvancedTypefaceMetrics::kType1CID_Font) {
         newCIDFont->insertName("Subtype", "CIDFontType0");
     } else if (type == SkAdvancedTypefaceMetrics::kTrueType_Font) {
         newCIDFont->insertName("Subtype", "CIDFontType2");
         newCIDFont->insertName("CIDToGIDMap", "Identity");
     } else {
         SkASSERT(false);
     }
 
     auto sysInfo = sk_make_sp<SkPDFDict>();
-    sysInfo->insertString("Registry", "Skia");
-    // TODO: Registry+Ordering should be globally unique!
-    sysInfo->insertString("Ordering", "SkiaOrdering");
+    sysInfo->insertString("Registry", "Adobe");
+    sysInfo->insertString("Ordering", "Identity");
     sysInfo->insertInt("Supplement", 0);
     newCIDFont->insertObject("CIDSystemInfo", std::move(sysInfo));
 
     uint16_t emSize = metrics.fEmSize;
     int16_t defaultWidth = 0;
     {
         SkAutoGlyphCache glyphCache = vector_cache(face);
         sk_sp<SkPDFArray> widths = SkPDFMakeCIDGlyphWidthsArray(
                 glyphCache.get(), &this->glyphUsage(), emSize, &defaultWidth);
         if (widths && widths->size() > 0) {
@@ skipping 285 matching lines @@
 
 bool SkPDFFont::CanEmbedTypeface(SkTypeface* typeface, SkPDFCanon* canon) {
     const SkAdvancedTypefaceMetrics* metrics = SkPDFFont::GetMetrics(typeface, canon);
     return metrics && can_embed(*metrics);
 }
 
 void SkPDFFont::drop() {
     fTypeface = nullptr;
     this->SkPDFDict::drop();
 }