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

Unified Diff: pdf/pdfium/pdfium_engine.cc

Issue 1129223005: Roll PDFium to 8f6445b. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « pdf/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pdf/pdfium/pdfium_engine.cc
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
index b1b83a41ff5a776178746fe110f25dbb8be0073b..e580fede6aba69640b283f2395d9c2b5252c2021 100644
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -34,8 +34,6 @@
#include "ppapi/cpp/var.h"
#include "ppapi/cpp/var_dictionary.h"
#include "printing/units.h"
-#include "third_party/pdfium/fpdfsdk/include/pdfwindow/PDFWindow.h"
-#include "third_party/pdfium/fpdfsdk/include/pdfwindow/PWL_FontMap.h"
#include "third_party/pdfium/public/fpdf_edit.h"
#include "third_party/pdfium/public/fpdf_ext.h"
#include "third_party/pdfium/public/fpdf_flatten.h"
@@ -146,12 +144,9 @@ PP_BrowserFont_Trusted_Weight WeightToBrowserFontTrustedWeight(int weight) {
void EnumFonts(struct _FPDF_SYSFONTINFO* sysfontinfo, void* mapper) {
FPDF_AddInstalledFont(mapper, "Arial", FXFONT_DEFAULT_CHARSET);
- int i = 0;
- while (CPWL_FontMap::defaultTTFMap[i].charset != -1) {
- FPDF_AddInstalledFont(mapper,
- CPWL_FontMap::defaultTTFMap[i].fontname,
- CPWL_FontMap::defaultTTFMap[i].charset);
- ++i;
+ const FPDF_CharsetFontMap* font_map = FPDF_GetDefaultTTFMap();
+ for (; font_map->charset != -1; ++font_map) {
+ FPDF_AddInstalledFont(mapper, font_map->fontname, font_map->charset);
}
}
« no previous file with comments | « pdf/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698