SkPDF: Always give a default advance for glyphs.

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 <ctype.h>
 
 #include "SkData.h"
@@ skipping 1119 matching lines @@
     sysInfo->insertString("Registry", "Adobe");
     sysInfo->insertString("Ordering", "Identity");
     sysInfo->insertInt("Supplement", 0);
     this->insertObject("CIDSystemInfo", std::move(sysInfo));
 
     if (!fontInfo()->fGlyphWidths.empty()) {
         int16_t defaultWidth = 0;
         sk_sp<SkPDFArray> widths(composeAdvanceData(
                 fontInfo()->fGlyphWidths, fontInfo()->fEmSize, &appendWidth,
                 &defaultWidth));
-        if (widths->size())
+        if (widths->size()) {
             this->insertObject("W", std::move(widths));
-        if (defaultWidth != 0) {
-            this->insertScalar(
-                    "DW",
-                    scaleFromFontUnits(defaultWidth, fontInfo()->fEmSize));
         }
+        this->insertScalar(
+                "DW", scaleFromFontUnits(defaultWidth, fontInfo()->fEmSize));
     }
     if (!fontInfo()->fVerticalMetrics.empty()) {
         struct SkAdvancedTypefaceMetrics::VerticalMetric defaultAdvance;
         defaultAdvance.fVerticalAdvance = 0;
         defaultAdvance.fOriginXDisp = 0;
         defaultAdvance.fOriginYDisp = 0;
         sk_sp<SkPDFArray> advances(composeAdvanceData(
                 fontInfo()->fVerticalMetrics, fontInfo()->fEmSize,
                 &appendVerticalAdvance, &defaultAdvance));
         if (advances->size())
@@ skipping 262 matching lines @@
     }
     return *canon->fCanEmbedTypeface.set(id, canEmbed);
 }
 
 void SkPDFFont::drop() {
     fTypeface = nullptr;
     fFontInfo = nullptr;
     fDescriptor = nullptr;
     this->SkPDFDict::drop();
 }