diff options
| author | thestig <thestig@chromium.org> | 2016-09-28 22:06:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-28 22:06:20 -0700 |
| commit | aca4fc767d663e43d323b96a75804a8f5cafd8d4 (patch) | |
| tree | 3e4e5c168af167ba6044c83431511b9a978773ed /core/fxge/ge | |
| parent | 3873f302948e37aad7066c8231575f486015cc34 (diff) | |
| download | pdfium-aca4fc767d663e43d323b96a75804a8f5cafd8d4.tar.xz | |
Replace a few more std::unique_ptr.reset() with WrapUnique assignments.
And fix a typo.
TBR=tsepez@chromium.org
Review-Url: https://codereview.chromium.org/2382443004
Diffstat (limited to 'core/fxge/ge')
| -rw-r--r-- | core/fxge/ge/cfx_font.cpp | 4 | ||||
| -rw-r--r-- | core/fxge/ge/cfx_fontmgr.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index ce77cbf661..a291b59ad4 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -244,7 +244,7 @@ FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) { m_bShallowCopy = true; if (pFont->m_pSubstFont) { - m_pSubstFont.reset(new CFX_SubstFont); + m_pSubstFont = WrapUnique(new CFX_SubstFont); m_pSubstFont->m_Charset = pFont->m_pSubstFont->m_Charset; m_pSubstFont->m_SubstFlags = pFont->m_pSubstFont->m_SubstFlags; m_pSubstFont->m_Weight = pFont->m_pSubstFont->m_Weight; @@ -319,7 +319,7 @@ void CFX_Font::LoadSubst(const CFX_ByteString& face_name, bool bVertical) { m_bEmbedded = false; m_bVertical = bVertical; - m_pSubstFont.reset(new CFX_SubstFont); + m_pSubstFont = WrapUnique(new CFX_SubstFont); m_Face = CFX_GEModule::Get()->GetFontMgr()->FindSubstFont( face_name, bTrueType, flags, weight, italic_angle, CharsetCP, m_pSubstFont.get()); diff --git a/core/fxge/ge/cfx_fontmgr.cpp b/core/fxge/ge/cfx_fontmgr.cpp index ec1d81b237..a3cc796a6d 100644 --- a/core/fxge/ge/cfx_fontmgr.cpp +++ b/core/fxge/ge/cfx_fontmgr.cpp @@ -81,7 +81,7 @@ int GetTTCIndex(const uint8_t* pFontData, CFX_FontMgr::CFX_FontMgr() : m_FTLibrary(nullptr), m_FTLibrarySupportsHinting(false) { - m_pBuiltinMapper.reset(new CFX_FontMapper(this)); + m_pBuiltinMapper = WrapUnique(new CFX_FontMapper(this)); } CFX_FontMgr::~CFX_FontMgr() { |