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

Side by Side Diff: core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

Issue 1700183002: Remove CFX_PtrList from renderer main loop. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Nits. Created 4 years, 10 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/fpdfapi/fpdf_render/fpdf_render.cpp ('k') | core/src/fpdftext/fpdf_text_int.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/src/fpdfapi/fpdf_render/render_int.h" 7 #include "core/src/fpdfapi/fpdf_render/render_int.h"
8 8
9 #include "core/include/fpdfapi/fpdf_pageobj.h" 9 #include "core/include/fpdfapi/fpdf_pageobj.h"
10 #include "core/include/fpdfapi/fpdf_render.h" 10 #include "core/include/fpdfapi/fpdf_render.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 if (!pFont->m_pDocument) { 309 if (!pFont->m_pDocument) {
310 return; 310 return;
311 } 311 }
312 pFont->m_pDocument->GetRenderData()->ReleaseCachedType3(pFont); 312 pFont->m_pDocument->GetRenderData()->ReleaseCachedType3(pFont);
313 pFont->m_pDocument->GetPageData()->ReleaseFont(pFont->GetFontDict()); 313 pFont->m_pDocument->GetPageData()->ReleaseFont(pFont->GetFontDict());
314 } 314 }
315 FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) { 315 FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) {
316 if (m_pBitmap || !m_pForm) { 316 if (m_pBitmap || !m_pForm) {
317 return TRUE; 317 return TRUE;
318 } 318 }
319 if (m_pForm->GetPageObjectList()->GetCount() == 1 && !m_bColored) { 319 if (m_pForm->GetPageObjectList()->size() == 1 && !m_bColored) {
320 CPDF_PageObject* pPageObj = m_pForm->GetPageObjectList()->GetObjectAt( 320 auto& pPageObj = m_pForm->GetPageObjectList()->front();
321 m_pForm->GetPageObjectList()->GetHeadPosition());
322 if (pPageObj->m_Type == CPDF_PageObject::IMAGE) { 321 if (pPageObj->m_Type == CPDF_PageObject::IMAGE) {
323 CPDF_ImageObject* pImage = (CPDF_ImageObject*)pPageObj; 322 CPDF_ImageObject* pImage = static_cast<CPDF_ImageObject*>(pPageObj.get());
324 m_ImageMatrix = pImage->m_Matrix; 323 m_ImageMatrix = pImage->m_Matrix;
325 const CFX_DIBSource* pSource = pImage->m_pImage->LoadDIBSource(); 324 const CFX_DIBSource* pSource = pImage->m_pImage->LoadDIBSource();
326 if (pSource) { 325 if (pSource) {
327 m_pBitmap = pSource->Clone(); 326 m_pBitmap = pSource->Clone();
328 delete pSource; 327 delete pSource;
329 } 328 }
330 delete m_pForm; 329 delete m_pForm;
331 m_pForm = NULL; 330 m_pForm = NULL;
332 return TRUE; 331 return TRUE;
333 } 332 }
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 ProcessPath(&path, pObj2Device); 782 ProcessPath(&path, pObj2Device);
784 } 783 }
785 } 784 }
786 785
787 CFX_PathData* CPDF_Font::LoadGlyphPath(FX_DWORD charcode, int dest_width) { 786 CFX_PathData* CPDF_Font::LoadGlyphPath(FX_DWORD charcode, int dest_width) {
788 int glyph_index = GlyphFromCharCode(charcode); 787 int glyph_index = GlyphFromCharCode(charcode);
789 if (!m_Font.GetFace()) 788 if (!m_Font.GetFace())
790 return nullptr; 789 return nullptr;
791 return m_Font.LoadGlyphPath(glyph_index, dest_width); 790 return m_Font.LoadGlyphPath(glyph_index, dest_width);
792 } 791 }
OLDNEW
« no previous file with comments | « core/src/fpdfapi/fpdf_render/fpdf_render.cpp ('k') | core/src/fpdftext/fpdf_text_int.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698