commit 7c43678627e7797aefd3f74e0446f4dd0fea67cf
author Lei Zhang <thestig@chromium.org> Thu Aug 02 23:21:38 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Aug 02 23:21:38 2018 +0000
tree 43d1a633201fa1873d26a9de9e0ef40911daf247
parent 95340100f95f248defac47db8d63d6ce57b512d8

Skia Path: Fix text/xform size mismatch when calling drawTextRSXform().

BUG=chromium:751423

Change-Id: I2fcc46b80e89cb651e255bd1fd2d6883a05cf9c7
Reviewed-on: https://pdfium-review.googlesource.com/39153
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 93c3a1d..e654114 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -857,12 +857,15 @@
       m_drawIndex = m_commandIndex;
       m_type = Accumulator::kText;
     }
+    if (!hasRSX && !m_rsxform.isEmpty())
+      FlushText();
+
     int count = m_positions.count();
     m_positions.setCount(nChars + count);
     m_glyphs.setCount(nChars + count);
-    if (hasRSX) {
+    if (hasRSX)
       m_rsxform.setCount(nChars + count);
-    }
+
     SkScalar flip = m_fontSize < 0 ? -1 : 1;
     SkScalar vFlip = flip;
     if (pFont->IsVertical())