SkPDF: unify drawText and drawPosText

src/pdf/SkPDFDevice.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPDFDevice_DEFINED
 #define SkPDFDevice_DEFINED
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
 #include "SkData.h"
 #include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
+#include "SkSinglyLinkedList.h"
 #include "SkStream.h"
 #include "SkTDArray.h"
-
-#include "SkSinglyLinkedList.h"
+#include "SkTextBlob.h"
 
 class SkImageBitmap;
 class SkPath;
 class SkPDFArray;
 class SkPDFCanon;
 class SkPDFDevice;
 class SkPDFDocument;
 class SkPDFDict;
 class SkPDFFont;
 class SkPDFObject;
@@ skipping 83 matching lines @@
                       const SkPoint texs[], const SkColor colors[],
                       SkXfermode* xmode, const uint16_t indices[],
                       int indexCount, const SkPaint& paint) override;
     void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
                     const SkPaint&) override;
 
     SkImageInfo imageInfo() const override;
 
     // PDF specific methods.
 
+    void drawTextInternal(const SkDraw&, const void*, size_t, const SkScalar pos[],

[bungeman-skia, 2016/08/15 17:03:37]

Any particular reason for this to be public?

[hal.canary, 2016/08/15 18:14:22]

no.

fixed.

+                          SkTextBlob::GlyphPositioning, SkPoint, const SkPaint&);
+
     /** Create the resource dictionary for this device. */
     sk_sp<SkPDFDict> makeResourceDict() const;
 
     /** Get the fonts used on this device.
      */
     const SkTDArray<SkPDFFont*>& getFontResources() const;
 
     /** Add our annotations (link to urls and destinations) to the supplied
      *  array.
      *  @param array Array to add annotations to.
@@ skipping 48 matching lines @@
 
         // We may change the font (i.e. for Type1 support) within a
         // ContentEntry.  This is the one currently in effect, or nullptr if none.
         SkPDFFont* fFont;
         // In PDF, text size has no default value. It is only valid if fFont is
         // not nullptr.
         SkScalar fTextSize;
     };
 
 protected:
     sk_sp<SkSurface> makeSurface(const SkImageInfo&, const SkSurfaceProps&) override;

[bungeman-skia, 2016/08/15 17:03:37]

Since I was looking at visibility, these are protected, but the class is final,
so these are private anyway. Not sure if there's anything one may wish to do
about that though.

[hal.canary, 2016/08/15 18:14:22]

Acknowledged.

 
     void drawAnnotation(const SkDraw&, const SkRect&, const char key[], SkData* value) override;
 
     void drawSpecial(const SkDraw&, SkSpecialImage*, int x, int y, const SkPaint&) override;
     sk_sp<SkSpecialImage> makeSpecial(const SkBitmap&) override;
     sk_sp<SkSpecialImage> makeSpecial(const SkImage*) override;
     sk_sp<SkSpecialImage> snapSpecial() override;
 
 private:
     struct RectWithData {
@@ skipping 106 matching lines @@
 
     typedef SkBaseDevice INHERITED;
 
     // TODO(edisonn): Only SkDocument_PDF and SkPDFImageShader should be able to create
     // an SkPDFDevice
     //friend class SkDocument_PDF;
     //friend class SkPDFImageShader;
 };
 
 #endif