SkPDF: SK_PDF_NEVER_RELY_ON_ADVANCE

src/pdf/SkPDFDevice.cpp

Index: src/pdf/SkPDFDevice.cpp
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 73d41b1c36ac0e33bbf2a14259db5a230020f2fe..815b49db471bd17cb3a6491d2d7ab57ddae89ccb 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -37,6 +37,10 @@
 
 #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
@@ -995,7 +999,11 @@ public:
         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(" ");