Merge sub-device annotations in SkPDFDevice::drawDevice()

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
 
@@ skipping 20 matching lines @@
 class SkPDFGraphicState;
 class SkPDFObject;
 class SkPDFShader;
 class SkPDFStream;
 class SkRRect;
 
 // Private classes.
 struct ContentEntry;
 struct GraphicStateEntry;
 struct NamedDestination;
+struct RectWithData;
 
 /** \class SkPDFDevice
 
     The drawing context for the PDF backend.
 */
 class SkPDFDevice : public SkBaseDevice {
 public:
     /** Create a PDF drawing context.  SkPDFDevice applies a
      *  scale-and-translate transform to move the origin from the
      *  bottom left (PDF default) to the top left (Skia default).
@@ skipping 83 matching lines @@
     // PDF specific methods.
 
     /** Create the resource dictionary for this device.
      */
     SkPDFDict* createResourceDict() 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.
+     */
+    void appendAnnotations(SkPDFArray* array) const;
+
     /** Add our named destinations to the supplied dictionary.
      *  @param dict  Dictionary to add destinations to.
      *  @param page  The PDF object representing the page for this device.
      */
     void appendDestinations(SkPDFDict* dict, SkPDFObject* page) const;
 
     /** Returns a copy of the media box for this device. The caller is required
      *  to unref() this when it is finished.
      */
     SkPDFArray* copyMediaBox() const;
 
-    /** Get the annotations from this page, or nullptr if there are none.
-     */
-    SkPDFArray* getAnnotations() const { return fAnnotations; }
-
     /** Returns a SkStream with the page contents.  The caller is responsible
      *  for a deleting the returned value.
      */
     SkStreamAsset* content() const;
 
     /** Writes the page contents to the stream. */
     void writeContent(SkWStream*) const;
 
     const SkMatrix& initialTransform() const {
         return fInitialTransform;
@@ skipping 20 matching lines @@
 private:
     // TODO(vandebo): push most of SkPDFDevice's state into a core object in
     // order to get the right access levels without using friend.
     friend class ScopedContentEntry;
 
     SkISize fPageSize;
     SkISize fContentSize;
     SkMatrix fInitialTransform;
     SkClipStack fExistingClipStack;
     SkRegion fExistingClipRegion;
-    SkPDFArray* fAnnotations;
+
+    SkTDArray<RectWithData*> fLinkToURLs;
+    SkTDArray<RectWithData*> fLinkToDestinations;
     SkTDArray<NamedDestination*> fNamedDestinations;
 
     SkTDArray<SkPDFObject*> fGraphicStateResources;
     SkTDArray<SkPDFObject*> fXObjectResources;
     SkTDArray<SkPDFFont*> fFontResources;
     SkTDArray<SkPDFObject*> fShaderResources;
 
     SkAutoTDelete<ContentEntry> fContentEntries;
     ContentEntry* fLastContentEntry;
     SkAutoTDelete<ContentEntry> fMarginContentEntries;
@@ skipping 74 matching lines @@
     /** Helper method for copyContentToData. It is responsible for copying the
      *  list of content entries |entry| to |data|.
      */
     void copyContentEntriesToData(ContentEntry* entry, SkWStream* data) const;
 
     bool handleInversePath(const SkDraw& d, const SkPath& origPath,
                            const SkPaint& paint, bool pathIsMutable,
                            const SkMatrix* prePathMatrix = nullptr);
     bool handlePointAnnotation(const SkPoint* points, size_t count,
                                const SkMatrix& matrix, SkAnnotation* annot);
-    void addAnnotation(SkPDFDict*);
+    bool handlePathAnnotation(const SkPath& path, const SkDraw& d,
+                              SkAnnotation* annot);
 
     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