Apply structure packing to FXTEXT_CHARPOS to save space.
BUG=pdfium:562
Review-Url: https://codereview.chromium.org/2257313002
diff --git a/core/fxge/include/cfx_renderdevice.h b/core/fxge/include/cfx_renderdevice.h
index 390d39b..9dd5f55 100644
--- a/core/fxge/include/cfx_renderdevice.h
+++ b/core/fxge/include/cfx_renderdevice.h
@@ -68,15 +68,15 @@
#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;
};
diff --git a/core/fxge/skia/fx_skia_device_unittest.cpp b/core/fxge/skia/fx_skia_device_unittest.cpp
index 77d6576..5162e9c 100644
--- a/core/fxge/skia/fx_skia_device_unittest.cpp
+++ b/core/fxge/skia/fx_skia_device_unittest.cpp
@@ -36,7 +36,7 @@
}
void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) {
- FXTEXT_CHARPOS charPos[] = {{1, 0, 1, 4, false, {0, 0, 0, 0}, false}};
+ FXTEXT_CHARPOS charPos[] = {{{0, 0, 0, 0}, 0, 1, 1, 4, false, false}};
CFX_Font font;
FX_FLOAT fontSize = 1;
CFX_FontCache cache;