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

Side by Side Diff: core/src/fxge/ge/fx_ge_text.cpp

Issue 1769273002: Reland "Fix chromium-style errors." (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 9 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 | « core/src/fxge/ge/fx_ge_fontmap.cpp ('k') | pdfium.gyp » ('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/include/fxcodec/fx_codec.h" 7 #include "core/include/fxcodec/fx_codec.h"
8 #include "core/include/fxge/fx_freetype.h" 8 #include "core/include/fxge/fx_freetype.h"
9 #include "core/include/fxge/fx_ge.h" 9 #include "core/include/fxge/fx_ge.h"
10 #include "core/src/fxge/ge/fx_text_int.h" 10 #include "core/src/fxge/ge/fx_text_int.h"
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 blend_type)) { 1160 blend_type)) {
1161 return FALSE; 1161 return FALSE;
1162 } 1162 }
1163 } 1163 }
1164 if (pClippingPath) { 1164 if (pClippingPath) {
1165 pClippingPath->Append(&TransformedPath, pUser2Device); 1165 pClippingPath->Append(&TransformedPath, pUser2Device);
1166 } 1166 }
1167 } 1167 }
1168 return TRUE; 1168 return TRUE;
1169 } 1169 }
1170
1171 CFX_FontCache::CFX_FontCache() {}
1172
1170 CFX_FontCache::~CFX_FontCache() { 1173 CFX_FontCache::~CFX_FontCache() {
1171 FreeCache(TRUE); 1174 FreeCache(TRUE);
1172 } 1175 }
1173 1176
1174 CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) { 1177 CFX_FaceCache* CFX_FontCache::GetCachedFace(CFX_Font* pFont) {
1175 FXFT_Face internal_face = pFont->GetFace(); 1178 FXFT_Face internal_face = pFont->GetFace();
1176 const bool bExternal = !internal_face; 1179 const bool bExternal = !internal_face;
1177 FXFT_Face face = 1180 FXFT_Face face =
1178 bExternal ? (FXFT_Face)pFont->GetSubstFont()->m_ExtHandle : internal_face; 1181 bExternal ? (FXFT_Face)pFont->GetSubstFont()->m_ExtHandle : internal_face;
1179 CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap; 1182 CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap;
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 void _CFX_UniqueKeyGen::Generate(int count, ...) { 1863 void _CFX_UniqueKeyGen::Generate(int count, ...) {
1861 va_list argList; 1864 va_list argList;
1862 va_start(argList, count); 1865 va_start(argList, count);
1863 for (int i = 0; i < count; i++) { 1866 for (int i = 0; i < count; i++) {
1864 int p = va_arg(argList, int); 1867 int p = va_arg(argList, int);
1865 ((FX_DWORD*)m_Key)[i] = p; 1868 ((FX_DWORD*)m_Key)[i] = p;
1866 } 1869 }
1867 va_end(argList); 1870 va_end(argList);
1868 m_KeyLen = count * sizeof(FX_DWORD); 1871 m_KeyLen = count * sizeof(FX_DWORD);
1869 } 1872 }
OLDNEW
« no previous file with comments | « core/src/fxge/ge/fx_ge_fontmap.cpp ('k') | pdfium.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698