SkPDF: remove margin foolishness

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 113 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;
 
     void onAttachToCanvas(SkCanvas* canvas) override;
     void onDetachFromCanvas() override;
     SkImageInfo imageInfo() const override;
 
-    enum DrawingArea {
-        kContent_DrawingArea,  // Drawing area for the page content.
-        kMargin_DrawingArea,   // Drawing area for the margin content.
-    };
-
-    /** Sets the drawing area for the device. Subsequent draw calls are directed
-     *  to the specific drawing area (margin or content). The default drawing
-     *  area is the content drawing area.
-     *
-     *  Currently if margin content is drawn and then a complex (for PDF) xfer
-     *  mode is used, like SrcIn, Clear, etc, the margin content will get
-     *  clipped. A simple way to avoid the bug is to always draw the margin
-     *  content last.
-     */
-    void setDrawingArea(DrawingArea drawingArea);
-
     // PDF specific methods.
 
     /** 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
@@ skipping 83 matching lines @@
     SkTArray<RectWithData> fLinkToDestinations;
     SkTArray<NamedDestination> fNamedDestinations;
 
     SkTDArray<SkPDFObject*> fGraphicStateResources;
     SkTDArray<SkPDFObject*> fXObjectResources;
     SkTDArray<SkPDFFont*> fFontResources;
     SkTDArray<SkPDFObject*> fShaderResources;
 
     SkAutoTDelete<ContentEntry> fContentEntries;
     ContentEntry* fLastContentEntry;
-    SkAutoTDelete<ContentEntry> fMarginContentEntries;
-    ContentEntry* fLastMarginContentEntry;
-    DrawingArea fDrawingArea;
 
     const SkClipStack* fClipStack;
 
-    // Accessor and setter functions based on the current DrawingArea.
-    SkAutoTDelete<ContentEntry>* getContentEntries();
-
     // Glyph ids used for each font on this device.
     SkAutoTDelete<SkPDFGlyphSetMap> fFontGlyphUsage;
 
     SkScalar fRasterDpi;
 
     SkBitmap fLegacyBitmap;
 
     SkPDFDocument* fDocument;
     ////////////////////////////////////////////////////////////////////////////
 
     SkPDFDevice(SkISize pageSize,
                 SkScalar rasterDpi,
                 SkPDFDocument* doc,
                 bool flip);
 
-    ContentEntry* getLastContentEntry();
-    void setLastContentEntry(ContentEntry* contentEntry);
-
     SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
     void init();
     void cleanUp(bool clearFontUsage);
     SkPDFFormXObject* createFormXObjectFromDevice();
 
     void drawFormXObjectWithMask(int xObjectIndex,
                                  SkPDFFormXObject* mask,
                                  const SkClipStack* clipStack,
                                  const SkRegion& clipRegion,
@@ skipping 48 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