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..00cbe3929df6dfcfde16ae102f4afce5377f6366
--- /dev/null
+++ b/xfa/fxgraphics/cfx_pattern.h
@@ -0,0 +1,37 @@
+// 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;
+
+class CFX_Pattern {
+ public:
+  CFX_Pattern(FX_HatchStyle hatchStyle,
+              const FX_ARGB foreArgb,
+              const FX_ARGB backArgb,
+              CFX_Matrix* matrix = nullptr);
+
+  virtual ~CFX_Pattern();
+
+ private:
+  friend class CFX_Graphics;
+
+  CFX_Matrix m_matrix;
+  struct {

[Tom Sepez, 2016/03/16 20:53:17]

And this struct can go, too, and the members move up a level.

[dsinclair, 2016/03/16 21:13:39]

Done.

+    FX_HatchStyle hatchStyle;

[Tom Sepez, 2016/03/16 20:53:17]

can hatchstyle be const?

[dsinclair, 2016/03/16 21:13:39]

Done.

+    FX_ARGB foreArgb;
+    FX_ARGB backArgb;

[Tom Sepez, 2016/03/16 20:53:17]

And these?

[dsinclair, 2016/03/16 21:13:39]

Done.

+  } m_hatchInfo;
+};
+
+#endif  // XFA_FXGRAPHICS_CFX_PATTERN_H_