Remove default arguments from CFX_FxgeDevice.

core/fxge/include/fx_ge.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FXGE_INCLUDE_FX_GE_H_
 #define CORE_FXGE_INCLUDE_FX_GE_H_
 
 #include "core/fxge/include/fx_dib.h"
@@ skipping 143 matching lines @@
   FX_FLOAT m_LineWidth;
 };
 
 #define FXDC_DEVICE_CLASS 1
 #define FXDC_PIXEL_WIDTH 2
 #define FXDC_PIXEL_HEIGHT 3
 #define FXDC_BITS_PIXEL 4
 #define FXDC_HORZ_SIZE 5
 #define FXDC_VERT_SIZE 6
 #define FXDC_RENDER_CAPS 7
-#define FXDC_DITHER_BITS 8
 #define FXDC_DISPLAY 1
 #define FXDC_PRINTER 2
 #define FXRC_GET_BITS 0x01
 #define FXRC_BIT_MASK 0x02
 #define FXRC_ALPHA_MASK 0x04
 #define FXRC_ALPHA_PATH 0x10
 #define FXRC_ALPHA_IMAGE 0x20
 #define FXRC_ALPHA_OUTPUT 0x40
 #define FXRC_BLEND_MODE 0x80
 #define FXRC_SOFT_CLIP 0x100
@@ skipping 219 matching lines @@
   int m_DeviceClass;
   FX_RECT m_ClipBox;
   IFX_RenderDeviceDriver* m_pDeviceDriver;
 };
 
 class CFX_FxgeDevice : public CFX_RenderDevice {
  public:
   CFX_FxgeDevice();
   ~CFX_FxgeDevice() override;
 
-  bool Attach(CFX_DIBitmap* pBitmap,
-              int dither_bits = 0,
-              bool bRgbByteOrder = false,
-              CFX_DIBitmap* pOriDevice = NULL,
-              bool bGroupKnockout = false);
+  bool Attach(CFX_DIBitmap* pBitmap) {
+    return AttachEx(pBitmap, false, nullptr, false);
+  }
+  bool AttachEx(CFX_DIBitmap* pBitmap,

[Lei Zhang, 2016/05/26 18:11:29]

If you have better name suggestions, let me know. Or if we should merge
Attach/AttachEx. It's a slight pain, but there aren't that many Attach()
callers.

Ditto for Create().

[dsinclair, 2016/05/26 18:26:14]

My vote would be to merge them and just pass the default values through.

[Lei Zhang, 2016/05/26 21:06:11]

Done. See PS2 -> 4.

+                bool bRgbByteOrder,
+                CFX_DIBitmap* pOriDevice,
+                bool bGroupKnockout);
 
-  bool Create(int width,
-              int height,
-              FXDIB_Format format,
-              int dither_bits = 0,
-              CFX_DIBitmap* pOriDevice = NULL);
+  bool Create(int width, int height, FXDIB_Format format) {
+    return CreateEx(width, height, format, nullptr);
+  }
+  bool CreateEx(int width,
+                int height,
+                FXDIB_Format format,
+                CFX_DIBitmap* pOriDevice);
 
 #ifdef _SKIA_SUPPORT_
   bool AttachRecorder(SkPictureRecorder* recorder);
   SkPictureRecorder* CreateRecorder(int size_x, int size_y);
 #endif
 
  protected:
   bool m_bOwnedBitmap;
 };
 
@@ skipping 229 matching lines @@
   FX_BOOL m_bCmykOutput;
   FX_BOOL m_bColorSet;
   uint32_t m_LastColor;
   FX_RECT m_ClipBox;
   CFX_ArrayTemplate<CPSFont*> m_PSFontList;
   CFX_ArrayTemplate<FX_RECT> m_ClipBoxStack;
   FX_BOOL m_bInited;
 };
 
 #endif  // CORE_FXGE_INCLUDE_FX_GE_H_