summaryrefslogtreecommitdiff
path: root/core/fxge/android/cfpf_skiafont.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-21 16:53:58 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-21 21:25:26 +0000
commitaee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (patch)
tree1e14d60adcffeb0791a0a6c8792d3e9c0109384e /core/fxge/android/cfpf_skiafont.h
parent8e9e3d8975eeea3429c3b3ea703f04ac34e20e28 (diff)
downloadpdfium-aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d.tar.xz
Move CFX_UnownedPtr to UnownedPtr
This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0 Reviewed-on: https://pdfium-review.googlesource.com/14620 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/android/cfpf_skiafont.h')
-rw-r--r--core/fxge/android/cfpf_skiafont.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/android/cfpf_skiafont.h b/core/fxge/android/cfpf_skiafont.h
index c842d5abb9..1b2f605838 100644
--- a/core/fxge/android/cfpf_skiafont.h
+++ b/core/fxge/android/cfpf_skiafont.h
@@ -7,8 +7,8 @@
#ifndef CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_
#define CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/fx_font.h"
class CFPF_SkiaFontDescriptor;
@@ -43,8 +43,8 @@ class CFPF_SkiaFont {
uint8_t uCharset);
private:
- CFX_UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr;
- CFX_UnownedPtr<CFPF_SkiaFontDescriptor> m_pFontDes;
+ UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr;
+ UnownedPtr<CFPF_SkiaFontDescriptor> m_pFontDes;
FXFT_Face m_Face;
uint32_t m_dwStyle;
uint8_t m_uCharset;