diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-14 11:55:21 -0500 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-14 18:13:11 +0000 |
commit | 940f559b985d4a742c21b21cb077a232e44dd289 (patch) | |
tree | ceae19d15f2e97b332dd4ef7eb0dcc458d0281d9 /core/fxge/skia/fx_skia_device_unittest.cpp | |
parent | f528eee136a602643a7777d87a2cce52cf83f38a (diff) | |
download | pdfium-940f559b985d4a742c21b21cb077a232e44dd289.tar.xz |
Reland Cleanup CPDF_MeshStream
This CL fixes up the bits of the CPDF_MeshStream CL that depended on the Origin
CL and integrates the fixes for the Skia bots.
Change-Id: I470e49c35b809f00fecbaeb303de15c0db3fe590
Reviewed-on: https://pdfium-review.googlesource.com/2698
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/skia/fx_skia_device_unittest.cpp')
-rw-r--r-- | core/fxge/skia/fx_skia_device_unittest.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/fxge/skia/fx_skia_device_unittest.cpp b/core/fxge/skia/fx_skia_device_unittest.cpp index 693cf1b616..3b799e6190 100644 --- a/core/fxge/skia/fx_skia_device_unittest.cpp +++ b/core/fxge/skia/fx_skia_device_unittest.cpp @@ -35,7 +35,12 @@ void EmptyTest(CFX_SkiaDeviceDriver* driver, const State&) { } void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { - FXTEXT_CHARPOS charPos[] = {{{0, 0, 0, 0}, 0, 1, 1, 4, false, false}}; + FXTEXT_CHARPOS charPos[1]; + charPos[0].m_OriginX = 0; + charPos[0].m_OriginY = 1; + charPos[0].m_GlyphIndex = 1; + charPos[0].m_FontCharWidth = 4; + CFX_Font font; FX_FLOAT fontSize = 1; CFX_PathData clipPath, clipPath2; |