| Index: core/fxge/skia/fx_skia_device.h
 | 
| diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
 | 
| index c9ff9f163209dfc04045c13a46187b6a642d4a43..15f6306cb0ed2922687bf9de605a319c787b7b94 100644
 | 
| --- a/core/fxge/skia/fx_skia_device.h
 | 
| +++ b/core/fxge/skia/fx_skia_device.h
 | 
| @@ -52,15 +52,11 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 | 
|                     uint32_t fill_color,
 | 
|                     uint32_t stroke_color,
 | 
|                     int fill_mode,
 | 
| -                   int alpha_flag = 0,
 | 
| -                   void* pIccTransform = nullptr,
 | 
| -                   int blend_type = FXDIB_BLEND_NORMAL) override;
 | 
| +                   int blend_type) override;
 | 
|  
 | 
| -  FX_BOOL FillRect(const FX_RECT* pRect,
 | 
| -                   uint32_t fill_color,
 | 
| -                   int alpha_flag = 0,
 | 
| -                   void* pIccTransform = nullptr,
 | 
| -                   int blend_type = FXDIB_BLEND_NORMAL) override;
 | 
| +  FX_BOOL FillRectWithBlend(const FX_RECT* pRect,
 | 
| +                            uint32_t fill_color,
 | 
| +                            int blend_type) override;
 | 
|  
 | 
|    /** Draw a single pixel (device dependant) line */
 | 
|    FX_BOOL DrawCosmeticLine(FX_FLOAT x1,
 | 
| @@ -68,20 +64,14 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 | 
|                             FX_FLOAT x2,
 | 
|                             FX_FLOAT y2,
 | 
|                             uint32_t color,
 | 
| -                           int alpha_flag = 0,
 | 
| -                           void* pIccTransform = nullptr,
 | 
| -                           int blend_type = FXDIB_BLEND_NORMAL) override {
 | 
| +                           int blend_type) override {
 | 
|      return FALSE;
 | 
|    }
 | 
|  
 | 
|    FX_BOOL GetClipBox(FX_RECT* pRect) override;
 | 
|  
 | 
|    /** Load device buffer into a DIB */
 | 
| -  FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap,
 | 
| -                    int left,
 | 
| -                    int top,
 | 
| -                    void* pIccTransform = nullptr,
 | 
| -                    FX_BOOL bDEdge = FALSE) override;
 | 
| +  FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override;
 | 
|  
 | 
|    CFX_DIBitmap* GetBackDrop() override { return m_pOriDevice; }
 | 
|  
 | 
| @@ -90,9 +80,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 | 
|                      const FX_RECT* pSrcRect,
 | 
|                      int dest_left,
 | 
|                      int dest_top,
 | 
| -                    int blend_type,
 | 
| -                    int alpha_flag = 0,
 | 
| -                    void* pIccTransform = nullptr) override;
 | 
| +                    int blend_type) override;
 | 
|    FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
 | 
|                          uint32_t color,
 | 
|                          int dest_left,
 | 
| @@ -101,9 +89,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 | 
|                          int dest_height,
 | 
|                          const FX_RECT* pClipRect,
 | 
|                          uint32_t flags,
 | 
| -                        int alpha_flag = 0,
 | 
| -                        void* pIccTransform = nullptr,
 | 
| -                        int blend_type = FXDIB_BLEND_NORMAL) override;
 | 
| +                        int blend_type) override;
 | 
|  
 | 
|    FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
 | 
|                        int bitmap_alpha,
 | 
| @@ -111,9 +97,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 | 
|                        const CFX_Matrix* pMatrix,
 | 
|                        uint32_t flags,
 | 
|                        void*& handle,
 | 
| -                      int alpha_flag = 0,
 | 
| -                      void* pIccTransform = nullptr,
 | 
| -                      int blend_type = FXDIB_BLEND_NORMAL) override;
 | 
| +                      int blend_type) override;
 | 
|  
 | 
|    FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override {
 | 
|      return FALSE;
 | 
| @@ -127,9 +111,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
 | 
|                           CFX_FontCache* pCache,
 | 
|                           const CFX_Matrix* pObject2Device,
 | 
|                           FX_FLOAT font_size,
 | 
| -                         uint32_t color,
 | 
| -                         int alpha_flag = 0,
 | 
| -                         void* pIccTransform = nullptr) override;
 | 
| +                         uint32_t color) override;
 | 
|  
 | 
|    FX_BOOL DrawShading(const CPDF_ShadingPattern* pPattern,
 | 
|                        const CFX_Matrix* pMatrix,
 | 
| 
 |