Move xfa/include/fxgraphics/fx_graphics.h to xfa/fxgraphics.

xfa/fxgraphics/cfx_pattern.h

Index: xfa/fxgraphics/cfx_pattern.h
diff --git a/xfa/fxgraphics/cfx_pattern.h b/xfa/fxgraphics/cfx_pattern.h
new file mode 100644
index 0000000000000000000000000000000000000000..bbe2857bfbf2819618e8223685ab291702b4c6fa
--- /dev/null
+++ b/xfa/fxgraphics/cfx_pattern.h
@@ -0,0 +1,58 @@
+// Copyright 2016 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 XFA_FXGRAPHICS_CFX_PATTERN_H_
+#define XFA_FXGRAPHICS_CFX_PATTERN_H_
+
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/fxgraphics/include/cfx_graphics.h"
+
+class CFX_DIBitmap;
+class CFX_Matrix;
+
+enum { FX_PATTERN_None = 0, FX_PATTERN_Bitmap, FX_PATTERN_Hatch };

[Tom Sepez, 2016/03/16 17:08:52]

Anon enum?  Is this the value used for |int32_t m_type|? can it be nested in the
class as private, named, and the int32_t replaced with the enum?

[dsinclair, 2016/03/16 19:21:07]

I removed the enum. The CFX_DIBitmap override is never called. We only call the
default constructor once, from xfa_ffwidget.cpp and that immediately calls
::Create with a FX_HatchStyle.

So, it can only ever be a hatch style.

+
+class CFX_Pattern {
+ public:
+  CFX_Pattern();
+  virtual ~CFX_Pattern();
+
+  FX_ERR Create(CFX_DIBitmap* bitmap,
+                const FX_FLOAT xStep,
+                const FX_FLOAT yStep,
+                CFX_Matrix* matrix = NULL);
+  FX_ERR Create(FX_HatchStyle hatchStyle,
+                const FX_ARGB foreArgb,
+                const FX_ARGB backArgb,
+                CFX_Matrix* matrix = NULL);
+
+ private:
+  friend class CFX_Graphics;
+
+  int32_t m_type;

[Tom Sepez, 2016/03/16 17:08:52]

can this be const if the ctor took the type as an argument? Looking at the .cpp,
it might be a lot of changes.

[dsinclair, 2016/03/16 19:21:07]

Ack.

+  CFX_Matrix m_matrix;
+  union {
+    struct {
+      CFX_RectF rect;
+      FX_FLOAT xStep;
+      FX_FLOAT yStep;
+      FX_BOOL isColored;
+    } m_rectInfo;
+    struct {
+      CFX_DIBitmap* bitmap;
+      FX_FLOAT x1Step;
+      FX_FLOAT y1Step;
+    } m_bitmapInfo;
+    struct {
+      FX_HatchStyle hatchStyle;
+      FX_ARGB foreArgb;
+      FX_ARGB backArgb;
+    } m_hatchInfo;
+  };
+};
+
+#endif  // XFA_FXGRAPHICS_CFX_PATTERN_H_