use skia text

This adds text to the _SUPPORT_SKIA_PATHS_
variant.

The output of the test corpus has more
differences, but no feature changes or
dropouts that I can see.

The text is a bit lighter. Bungeman thinks
this is because of our support of SRGB
color, although the fonts also look different
so maybe there's more to the story.

The output looks compatible with the
variations I see in Adobe Reader and Firefox
on the same platform.

There's probably more text tuning to do.

Additionally, this turns off the caching
feature for this variation. Caching can't
work because the drawing alternates between
Skia and PDFium's native blits, so any
state caching won't know about changes
and drawing performed by the other.

R=dsinclair@chromium.org, bungeman@chromium.org

Review-Url: https://codereview.chromium.org/2520483002

1 files changed, 6 insertions, 1 deletions

diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index e14ea7c458..bbbbdaa2dd 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -15,10 +15,13 @@ class SkMatrix;
 class SkPaint;
 class SkPath;
 class SkPictureRecorder;
-class SkiaState;
 struct FXTEXT_CHARPOS;
 struct SkIRect;
 
+#ifdef _SKIA_SUPPORT_
+class SkiaState;
+#endif
+
 class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
  public:
   CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap,
@@ -166,7 +169,9 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
   CFX_DIBitmap* m_pOriDevice;
   SkCanvas* m_pCanvas;
   SkPictureRecorder* const m_pRecorder;
+#ifdef _SKIA_SUPPORT_
   std::unique_ptr<SkiaState> m_pCache;
+#endif
 #ifdef _SKIA_SUPPORT_PATHS_
   std::unique_ptr<CFX_ClipRgn> m_pClipRgn;
   std::vector<std::unique_ptr<CFX_ClipRgn>> m_StateStack;