Remove default arguments from CFX_FxgeDevice.

core/fxge/include/fx_ge.h

Index: core/fxge/include/fx_ge.h
diff --git a/core/fxge/include/fx_ge.h b/core/fxge/include/fx_ge.h
index c025c1251ec7075a7f17edf71984f4dca1fd4a68..530c05ce1643dac19eae29efc9977634b047ff1e 100644
--- a/core/fxge/include/fx_ge.h
+++ b/core/fxge/include/fx_ge.h
@@ -161,7 +161,6 @@ class CFX_GraphStateData {
 #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
@@ -401,17 +400,21 @@ class CFX_FxgeDevice : public CFX_RenderDevice {
   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 Create(int width,
-              int height,
-              FXDIB_Format format,
-              int dither_bits = 0,
-              CFX_DIBitmap* pOriDevice = NULL);
+  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) {
+    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);