Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: core/fxge/ge/fx_ge_font.cpp

Issue 1995003002: bring pdfium file in sync with chrome, fix mac build (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: update skia DEPS Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « DEPS ('k') | core/fxge/ge/fx_ge_text.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fxge/include/fx_font.h" 7 #include "core/fxge/include/fx_font.h"
8 8
9 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" 9 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
10 #include "core/fxge/ge/fx_text_int.h" 10 #include "core/fxge/ge/fx_text_int.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 if (m_bEmbedded) { 111 if (m_bEmbedded) {
112 DeleteFace(); 112 DeleteFace();
113 } else { 113 } else {
114 CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face); 114 CFX_GEModule::Get()->GetFontMgr()->ReleaseFace(m_Face);
115 } 115 }
116 } 116 }
117 #ifdef PDF_ENABLE_XFA 117 #ifdef PDF_ENABLE_XFA
118 FX_Free(m_pOwnedStream); 118 FX_Free(m_pOwnedStream);
119 #endif // PDF_ENABLE_XFA 119 #endif // PDF_ENABLE_XFA
120 FX_Free(m_pGsubData); 120 FX_Free(m_pGsubData);
121 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ 121 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ && !defined _SKIA_SUPPORT_
122 ReleasePlatformResource(); 122 ReleasePlatformResource();
123 #endif 123 #endif
124 } 124 }
125 void CFX_Font::DeleteFace() { 125 void CFX_Font::DeleteFace() {
126 FXFT_Done_Face(m_Face); 126 FXFT_Done_Face(m_Face);
127 m_Face = nullptr; 127 m_Face = nullptr;
128 } 128 }
129 void CFX_Font::LoadSubst(const CFX_ByteString& face_name, 129 void CFX_Font::LoadSubst(const CFX_ByteString& face_name,
130 FX_BOOL bTrueType, 130 FX_BOOL bTrueType,
131 uint32_t flags, 131 uint32_t flags,
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) { 531 for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
532 CFX_UnicodeEncodingEx* pFontEncoding = 532 CFX_UnicodeEncodingEx* pFontEncoding =
533 _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]); 533 _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
534 if (pFontEncoding) { 534 if (pFontEncoding) {
535 return pFontEncoding; 535 return pFontEncoding;
536 } 536 }
537 } 537 }
538 return nullptr; 538 return nullptr;
539 } 539 }
540 #endif // PDF_ENABLE_XFA 540 #endif // PDF_ENABLE_XFA
OLDNEW
« no previous file with comments | « DEPS ('k') | core/fxge/ge/fx_ge_text.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698