SkPDF: SK_PDF_NEVER_RELY_ON_ADVANCE

src/pdf/SkPDFDevice.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 "SkPDFDevice.h"
 #include "SkAnnotationKeys.h"
 #include "SkBitmapDevice.h"
@@ skipping 19 matching lines @@
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkSurface.h"
 #include "SkTextFormatParams.h"
 #include "SkTemplates.h"
 #include "SkTypefacePriv.h"
 #include "SkXfermodeInterpretation.h"
 
 #define DPI_FOR_RASTER_SCALE_ONE 72
 
+#if !defined(SK_PDF_NEVER_RELY_ON_ADVANCE) && defined(SK_BUILD_FOR_WIN)
+#define SK_PDF_NEVER_RELY_ON_ADVANCE
+#endif
+
 // Utility functions
 
 // If the paint will definitely draw opaquely, replace kSrc_Mode with
 // kSrcOver_Mode.  http://crbug.com/473572
 static void replace_srcmode_on_opaque_paint(SkPaint* paint) {
     if (kSrcOver_SkXfermodeInterpretation
         == SkInterpretXfermode(*paint, false)) {
         paint->setXfermode(nullptr);
     }
 }
@@ skipping 938 matching lines @@
             fWideChars = wideChars;
         }
     }
     void writeGlyph(SkScalar x,
                     SkScalar y,
                     SkScalar advanceWidth,
                     uint16_t glyph) {
         if (!fDefaultPositioning) {
             SkScalar xPosition = x - fCurrentMatrixX;
             SkScalar yPosition = y - fCurrentMatrixY;
-            if (xPosition != fXAdvance || yPosition != 0) {
+            bool alwaysPosition = false;
+            #ifdef SK_PDF_NEVER_RELY_ON_ADVANCE
+            alwaysPosition = true;
+            #endif
+            if (alwaysPosition || xPosition != fXAdvance || yPosition != 0) {
                 this->flush();
                 SkPDFUtils::AppendScalar(xPosition, fContent);
                 fContent->writeText(" ");
                 SkPDFUtils::AppendScalar(-yPosition, fContent);
                 fContent->writeText(" Td ");
                 fCurrentMatrixX = x;
                 fCurrentMatrixY = y;
                 fXAdvance = 0;
             }
             fXAdvance += advanceWidth;
@@ skipping 1142 matching lines @@
 }
 
 sk_sp<SkSpecialImage> SkPDFDevice::makeSpecial(const SkImage* image) {
     return SkSpecialImage::MakeFromImage(SkIRect::MakeWH(image->width(), image->height()),
                                          image->makeNonTextureImage());
 }
 
 sk_sp<SkSpecialImage> SkPDFDevice::snapSpecial() {
     return nullptr;
 }