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

linux: Fix compilation error

Browse source
This commit is contained in:
Cheng Zhao 2015-03-14 18:54:02 +00:00
parent ff724634f2
commit 105ad369ab
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/atom_browser_main_parts.cc
View file

@ -93,7 +93,7 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
brightray::BrowserMainParts::PreMainMessageLoopRun(); brightray::BrowserMainParts::PreMainMessageLoopRun();
#if defined(USE_X11) #if defined(USE_X11)
libgtk2ui::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); libgtk2ui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
#endif #endif
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)

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

@ -131,7 +131,7 @@ void PrintWebViewHelper::PrintPageInternal(
gfx::Rect canvas_area = content_area; gfx::Rect canvas_area = content_area;
skia::PlatformCanvas* canvas = metafile->GetVectorCanvasForNewPage( skia::PlatformCanvas* canvas = metafile->GetVectorCanvasForNewPage(
*page_size, canvas_area, scale_factor); page_size, canvas_area, scale_factor);
if (!canvas) if (!canvas)
return; return;
@ -139,7 +139,7 @@ void PrintWebViewHelper::PrintPageInternal(
skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_); skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
RenderPageContent(frame, params.page_number, canvas_area, content_area, RenderPageContent(frame, params.page_number, canvas_area, content_area,
scale_factor, canvas.get()); scale_factor, canvas);
// Done printing. Close the device context to retrieve the compiled metafile. // Done printing. Close the device context to retrieve the compiled metafile.
if (!metafile->FinishPage()) if (!metafile->FinishPage())

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

@ -210,7 +210,7 @@ void PrintWebViewHelper::PrintPageInternal(
canvas_area, canvas_area,
content_area, content_area,
scale_factor, scale_factor,
canvas.get()); canvas);
DCHECK_GT(webkit_scale_factor, 0.0f); DCHECK_GT(webkit_scale_factor, 0.0f);
// Done printing. Close the device context to retrieve the compiled metafile. // Done printing. Close the device context to retrieve the compiled metafile.
if (!metafile->FinishPage()) if (!metafile->FinishPage())

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 5493d5f8bde6226c051f766d2068aea118528da7 Subproject commit 4670aeb7104172f9d22f02c8621a586d984055c6

2
vendor/native_mate vendored

@ -1 +1 @@
Subproject commit a636fad51e862d52c7bdb527c91300c85ed3c254 Subproject commit 38aba072908357b4eebc68462714b01a9c2d0138