Add bitmaps and skp output to Skia port

This is a first-cut at supporting bitmaps.

Also added a --skp option to pdfium_test to generate
a Skia picture file. The picture file can be loaded
in Skia's SampleApp, debugger, or skiaserver to
examine the generated picture.

(This also includes fixes suggested in the prior Skia CL.
My apologies for fat-fingers abandoning that one.)

R=dsinclair@chromium.org, tsepez@chromium.org, dsinclair

Review URL: https://codereview.chromium.org/1776313002 .

1 files changed, 7 insertions, 1 deletions

diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index 1a36fbe85b..bb0a651263 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -10,6 +10,7 @@
 class SkCanvas;
 class SkPaint;
 class SkPath;
+class SkPictureRecorder;
 struct SkIRect;
 
 class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
@@ -19,6 +20,8 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
                        FX_BOOL bRgbByteOrder,
                        CFX_DIBitmap* pOriDevice,
                        FX_BOOL bGroupKnockout);
+  CFX_SkiaDeviceDriver(SkPictureRecorder* recorder);
+  CFX_SkiaDeviceDriver(int size_x, int size_y);
   ~CFX_SkiaDeviceDriver() override;
 
   /** Options */
@@ -139,10 +142,13 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
   void SetClipMask(SkPath& skPath, SkPaint* spaint);
   virtual uint8_t* GetBuffer() const { return m_pAggDriver->GetBuffer(); }
   void PaintStroke(SkPaint* spaint, const CFX_GraphStateData* pGraphState);
+  SkPictureRecorder* GetRecorder() const { return m_pRecorder; }
 
  private:
   CFX_AggDeviceDriver* m_pAggDriver;
-  SkCanvas* m_canvas;
+  SkCanvas* m_pCanvas;
+  SkPictureRecorder* const m_pRecorder;
+  int m_ditherBits;
 };
 #endif  // defined(_SKIA_SUPPORT_)