core/fxge/ge/cfx_renderdevice.cpp - Issue 2158023002: Pdfium: Fix fonts leaking on ClosePage.

Unified Diff: core/fxge/ge/cfx_renderdevice.cpp

Issue 2158023002: Pdfium: Fix fonts leaking on ClosePage. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master

Patch Set: Fix leaks on PageClose Created 4 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: core/fxge/ge/cfx_renderdevice.cpp

diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp

index ad05ef743b1778a8f7304861247e8116f5f66156..1a6c2c88c32f219efe661208b0b3e366573fb60f 100644

--- a/core/fxge/ge/cfx_renderdevice.cpp

+++ b/core/fxge/ge/cfx_renderdevice.cpp

@@ -9,7 +9,6 @@

#include "core/fxcrt/include/fx_safe_types.h"

#include "core/fxge/include/cfx_autofontcache.h"

#include "core/fxge/include/cfx_facecache.h"

-#include "core/fxge/include/cfx_fontcache.h"

#include "core/fxge/include/cfx_fxgedevice.h"

#include "core/fxge/include/cfx_graphstatedata.h"

#include "core/fxge/include/cfx_pathdata.h"

@@ -824,7 +823,6 @@ bool CFX_RenderDevice::SetBitsWithMask(const CFX_DIBSource* pBitmap,

FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,

const FXTEXT_CHARPOS* pCharPos,

CFX_Font* pFont,

- CFX_FontCache* pCache,

FX_FLOAT font_size,

const CFX_Matrix* pText2Device,

uint32_t fill_color,

@@ -833,9 +831,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,

if (m_DeviceClass != FXDC_DISPLAY) {

if (!(text_flags & FXTEXT_PRINTGRAPHICTEXT)) {

if (ShouldDrawDeviceText(pFont, text_flags) &&

- m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pCache,

- pText2Device, font_size,

- fill_color)) {

+ m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pText2Device,

+ font_size, fill_color)) {

return TRUE;

}

@@ -843,8 +840,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,

return FALSE;

} else if (!(text_flags & FXTEXT_NO_NATIVETEXT)) {

if (ShouldDrawDeviceText(pFont, text_flags) &&

- m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pCache,

- pText2Device, font_size, fill_color)) {

+ m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pText2Device,

+ font_size, fill_color)) {

return TRUE;

}

@@ -862,9 +859,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,

(pFont->GetSubstFont()->m_SubstFlags & FXFONT_SUBST_GLYPHPATH)) {

int nPathFlags =

(text_flags & FXTEXT_NOSMOOTH) == 0 ? 0 : FXFILL_NOPATHSMOOTH;

- return DrawTextPath(nChars, pCharPos, pFont, pCache, font_size,

- pText2Device, nullptr, nullptr, fill_color, 0,

- nullptr, nPathFlags);

+ return DrawTextPath(nChars, pCharPos, pFont, font_size, pText2Device,

+ nullptr, nullptr, fill_color, 0, nullptr, nPathFlags);

}

int anti_alias = FXFT_RENDER_MODE_MONO;

@@ -895,10 +891,6 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,

}

- if (!pCache)

- pCache = CFX_GEModule::Get()->GetFontCache();

- CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont);

- CFX_AutoFontCache autoFontCache(pCache, pFont);

std::vector<FXTEXT_GLYPHPOS> glyphs(nChars);

CFX_Matrix matrixCTM = GetCTM();

FX_FLOAT scale_x = FXSYS_fabs(matrixCTM.a);

@@ -922,12 +914,12 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,

charpos.m_AdjustMatrix[0], charpos.m_AdjustMatrix[1],

charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3], 0, 0);

new_matrix.Concat(deviceCtm);

- glyph.m_pGlyph = pFaceCache->LoadGlyphBitmap(

- pFont, charpos.m_GlyphIndex, charpos.m_bFontStyle, &new_matrix,

+ glyph.m_pGlyph = pFont->GetFontCache()->LoadGlyphBitmap(

dsinclair 2016/09/14 17:51:51 It's strange we replaced the FaceCache with a Font

snake 2016/09/14 19:06:29 I did remove GetFontCache method, now should call

+ charpos.m_GlyphIndex, charpos.m_bFontStyle, &new_matrix,

charpos.m_FontCharWidth, anti_alias, nativetext_flags);

} else {

- glyph.m_pGlyph = pFaceCache->LoadGlyphBitmap(

- pFont, charpos.m_GlyphIndex, charpos.m_bFontStyle, &deviceCtm,

+ glyph.m_pGlyph = pFont->GetFontCache()->LoadGlyphBitmap(

+ charpos.m_GlyphIndex, charpos.m_bFontStyle, &deviceCtm,

charpos.m_FontCharWidth, anti_alias, nativetext_flags);

}

@@ -1048,7 +1040,6 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,

FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars,

const FXTEXT_CHARPOS* pCharPos,

CFX_Font* pFont,

- CFX_FontCache* pCache,

FX_FLOAT font_size,

const CFX_Matrix* pText2User,

const CFX_Matrix* pUser2Device,

@@ -1057,10 +1048,6 @@ FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars,

FX_ARGB stroke_color,

CFX_PathData* pClippingPath,

int nFlag) {

- if (!pCache)

- pCache = CFX_GEModule::Get()->GetFontCache();

- CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont);

- CFX_AutoFontCache autoFontCache(pCache, pFont);

for (int iChar = 0; iChar < nChars; iChar++) {

const FXTEXT_CHARPOS& charpos = pCharPos[iChar];

CFX_Matrix matrix;

@@ -1070,8 +1057,8 @@ FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars,

}

matrix.Concat(font_size, 0, 0, font_size, charpos.m_OriginX,

charpos.m_OriginY);

- const CFX_PathData* pPath = pFaceCache->LoadGlyphPath(

- pFont, charpos.m_GlyphIndex, charpos.m_FontCharWidth);

+ const CFX_PathData* pPath = pFont->GetFontCache()->LoadGlyphPath(

+ charpos.m_GlyphIndex, charpos.m_FontCharWidth);

if (!pPath)

continue;

matrix.Concat(*pText2User);

« core/fxge/ge/cfx_font.cpp ('K') | « core/fxge/ge/cfx_fontcache.cpp ('k') | core/fxge/ifx_renderdevicedriver.cpp » ('j') | core/fxge/include/cfx_fontcache.h » ('J')