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

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

Issue 1192743004: Cleanup: Do not check pointers before deleting them. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 5 years, 6 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') | core/src/fxge/skia/fx_skia_device.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 "../../../include/fxge/fx_ge.h" 7 #include "../../../include/fxge/fx_ge.h"
8 #include "../../../include/fxge/fx_freetype.h" 8 #include "../../../include/fxge/fx_freetype.h"
9 #include "../../../include/fxcodec/fx_codec.h" 9 #include "../../../include/fxcodec/fx_codec.h"
10 #include "text_int.h" 10 #include "text_int.h"
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 delete pSizeCache; 1075 delete pSizeCache;
1076 } 1076 }
1077 m_SizeMap.RemoveAll(); 1077 m_SizeMap.RemoveAll();
1078 pos = m_PathMap.GetStartPosition(); 1078 pos = m_PathMap.GetStartPosition();
1079 void* key1; 1079 void* key1;
1080 CFX_PathData* pPath; 1080 CFX_PathData* pPath;
1081 while (pos) { 1081 while (pos) {
1082 m_PathMap.GetNextAssoc(pos, key1, (void*&)pPath); 1082 m_PathMap.GetNextAssoc(pos, key1, (void*&)pPath);
1083 delete pPath; 1083 delete pPath;
1084 } 1084 }
1085 if (m_pBitmap) { 1085 delete m_pBitmap;
1086 delete m_pBitmap;
1087 }
1088 m_PathMap.RemoveAll(); 1086 m_PathMap.RemoveAll();
1089 } 1087 }
1090 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ 1088 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
1091 void CFX_FaceCache::InitPlatform() 1089 void CFX_FaceCache::InitPlatform()
1092 { 1090 {
1093 } 1091 }
1094 #endif 1092 #endif
1095 CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(CFX_Font* pFont, const CFX_Aff ineMatrix* pMatrix, 1093 CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(CFX_Font* pFont, const CFX_Aff ineMatrix* pMatrix,
1096 CFX_ByteStringC& FaceGlyphsKey, FX_DWORD glyph_index, FX_BOOL bFontStyle , 1094 CFX_ByteStringC& FaceGlyphsKey, FX_DWORD glyph_index, FX_BOOL bFontStyle ,
1097 int dest_width, int anti_alias) 1095 int dest_width, int anti_alias)
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
1708 { 1706 {
1709 va_list argList; 1707 va_list argList;
1710 va_start(argList, count); 1708 va_start(argList, count);
1711 for (int i = 0; i < count; i ++) { 1709 for (int i = 0; i < count; i ++) {
1712 int p = va_arg(argList, int); 1710 int p = va_arg(argList, int);
1713 ((FX_DWORD*)m_Key)[i] = p; 1711 ((FX_DWORD*)m_Key)[i] = p;
1714 } 1712 }
1715 va_end(argList); 1713 va_end(argList);
1716 m_KeyLen = count * sizeof(FX_DWORD); 1714 m_KeyLen = count * sizeof(FX_DWORD);
1717 } 1715 }
OLDNEW
« no previous file with comments | « core/src/fxge/ge/fx_ge_fontmap.cpp ('k') | core/src/fxge/skia/fx_skia_device.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698