diff options
author | Tom Sepez <tsepez@chromium.org> | 2017-05-25 15:53:57 -0700 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-25 23:07:41 +0000 |
commit | d0409afc6a994a3e24043b8a96c83c022bcaa189 (patch) | |
tree | 15fa78b8a601ec97fc8bee39f8e56590c37babe3 /core/fxge/skia | |
parent | 2eddb665763f3e089d4c210d2a011d112683f3ea (diff) | |
download | pdfium-d0409afc6a994a3e24043b8a96c83c022bcaa189.tar.xz |
Mass conversion of remaining class members (non-xfa)
Change-Id: I8365ba80e3395d59a3cf35dbd9d9162e86e712e3
Reviewed-on: https://pdfium-review.googlesource.com/5970
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/skia')
-rw-r--r-- | core/fxge/skia/fx_skia_device.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 7d91ab2b72..f4b72fe2ad 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -822,7 +822,7 @@ class SkiaState { skPaint.setAntiAlias(true); skPaint.setColor(m_fillColor); if (m_pTypeFace) { // exclude placeholder test fonts - sk_sp<SkTypeface> typeface(SkSafeRef(m_pTypeFace)); + sk_sp<SkTypeface> typeface(SkSafeRef(m_pTypeFace.Get())); skPaint.setTypeface(typeface); } skPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); @@ -1266,8 +1266,8 @@ class SkiaState { CFX_GraphStateData m_clipState; CFX_GraphStateData m_drawState; CFX_Matrix m_clipMatrix; - CFX_SkiaDeviceDriver* m_pDriver; - CFX_TypeFace* m_pTypeFace; + CFX_UnownedPtr<CFX_SkiaDeviceDriver> m_pDriver; + CFX_UnownedPtr<CFX_TypeFace> m_pTypeFace; float m_fontSize; uint32_t m_fillColor; uint32_t m_strokeColor; |