mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix building on Linux

Browse source
This commit is contained in:
Cheng Zhao 2016-09-06 17:44:34 +09:00
parent f28e8d7168
commit 4aa292c7cd
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/common/chrome_version.h
View file

@ -8,7 +8,7 @@
#ifndef ATOM_COMMON_CHROME_VERSION_H_ #ifndef ATOM_COMMON_CHROME_VERSION_H_
#define ATOM_COMMON_CHROME_VERSION_H_ #define ATOM_COMMON_CHROME_VERSION_H_
#define CHROME_VERSION_STRING "52.0.2743.82" #define CHROME_VERSION_STRING "53.0.2785.89"
#define CHROME_VERSION "v" CHROME_VERSION_STRING #define CHROME_VERSION "v" CHROME_VERSION_STRING
#endif // ATOM_COMMON_CHROME_VERSION_H_ #endif // ATOM_COMMON_CHROME_VERSION_H_

8
chromium_src/chrome/renderer/printing/print_web_view_helper_linux.cc
View file

@ -33,7 +33,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
std::unique_ptr<PdfMetafileSkia> draft_metafile; std::unique_ptr<PdfMetafileSkia> draft_metafile;
PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile(); PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) { if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
draft_metafile.reset(new PdfMetafileSkia); draft_metafile.reset(new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
initial_render_metafile = draft_metafile.get(); initial_render_metafile = draft_metafile.get();
} }
@ -49,14 +49,16 @@ bool PrintWebViewHelper::RenderPreviewPage(
print_preview_context_.generate_draft_pages()) { print_preview_context_.generate_draft_pages()) {
DCHECK(!draft_metafile.get()); DCHECK(!draft_metafile.get());
draft_metafile = draft_metafile =
print_preview_context_.metafile()->GetMetafileForCurrentPage(); print_preview_context_.metafile()->GetMetafileForCurrentPage(
PDF_SKIA_DOCUMENT_TYPE);
} }
return PreviewPageRendered(page_number, draft_metafile.get()); return PreviewPageRendered(page_number, draft_metafile.get());
} }
bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame, bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
int page_count) { int page_count) {
PdfMetafileSkia metafile; PdfMetafileSkia metafile(PDF_SKIA_DOCUMENT_TYPE);
if (!metafile.Init()) if (!metafile.Init())
return false; return false;

5
chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
View file

@ -49,14 +49,15 @@ bool PrintWebViewHelper::RenderPreviewPage(
print_preview_context_.generate_draft_pages()) { print_preview_context_.generate_draft_pages()) {
DCHECK(!draft_metafile.get()); DCHECK(!draft_metafile.get());
draft_metafile = draft_metafile =
print_preview_context_.metafile()->GetMetafileForCurrentPage(); print_preview_context_.metafile()->GetMetafileForCurrentPage(
PDF_SKIA_DOCUMENT_TYPE);
} }
return PreviewPageRendered(page_number, draft_metafile.get()); return PreviewPageRendered(page_number, draft_metafile.get());
} }
bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame, bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
int page_count) { int page_count) {
PdfMetafileSkia metafile; PdfMetafileSkia metafile(PDF_SKIA_DOCUMENT_TYPE);
if (!metafile.Init()) if (!metafile.Init())
return false; return false;