Reordering FXTEXT_CHARPOS

core/fxge/include/cfx_renderdevice.h

 // 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 CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_
 #define CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_
 
 #include <memory>
@@ skipping 50 matching lines @@
 #define FXFILL_NOPATHSMOOTH 512
 
 #define FXTEXT_CLEARTYPE 0x01
 #define FXTEXT_BGR_STRIPE 0x02
 #define FXTEXT_PRINTGRAPHICTEXT 0x04
 #define FXTEXT_NO_NATIVETEXT 0x08
 #define FXTEXT_PRINTIMAGETEXT 0x10
 #define FXTEXT_NOSMOOTH 0x20
 
 struct FXTEXT_CHARPOS {
-  uint32_t m_GlyphIndex;
+  FX_FLOAT m_AdjustMatrix[4];
   FX_FLOAT m_OriginX;
   FX_FLOAT m_OriginY;
-  int m_FontCharWidth;
-  FX_BOOL m_bGlyphAdjust;
-  FX_FLOAT m_AdjustMatrix[4];
+  uint32_t m_GlyphIndex;
+  int32_t m_FontCharWidth;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   uint32_t m_ExtGID;
 #endif
+  bool m_bGlyphAdjust;
   bool m_bFontStyle;
 };
 
 class CFX_RenderDevice {
  public:
   CFX_RenderDevice();
   virtual ~CFX_RenderDevice();
 
   // Take ownership of |pDriver|.
   void SetDeviceDriver(std::unique_ptr<IFX_RenderDeviceDriver> pDriver);
@@ skipping 187 matching lines @@
   int m_Width;
   int m_Height;
   int m_bpp;
   int m_RenderCaps;
   int m_DeviceClass;
   FX_RECT m_ClipBox;
   std::unique_ptr<IFX_RenderDeviceDriver> m_pDeviceDriver;
 };
 
 #endif  // CORE_FXGE_INCLUDE_CFX_RENDERDEVICE_H_