Chromium Code Reviews| Index: chrome/renderer/printing/print_web_view_helper_linux.cc |
| diff --git a/chrome/renderer/printing/print_web_view_helper_linux.cc b/chrome/renderer/printing/print_web_view_helper_linux.cc |
| index 3bdf60c5cb2b5c020c6921c8dce2a9af9cc658fd..a48d2b5026ab2f781b8d83edf13cca11d69ee9e1 100644 |
| --- a/chrome/renderer/printing/print_web_view_helper_linux.cc |
| +++ b/chrome/renderer/printing/print_web_view_helper_linux.cc |
| @@ -4,10 +4,7 @@ |
| #include "chrome/renderer/printing/print_web_view_helper.h" |
| -#include "base/file_descriptor_posix.h" |
| -#include "base/logging.h" |
|
Lei Zhang
2013/08/13 23:26:37
Undo - logging.h also contain DCHECK(), NOTREACHED
cimamoglu1
2013/08/14 16:10:36
Done.
|
| #include "base/memory/scoped_ptr.h" |
| -#include "base/metrics/histogram.h" |
| #include "chrome/common/print_messages.h" |
| #include "content/public/renderer/render_thread.h" |
| #include "printing/metafile.h" |
| @@ -18,9 +15,11 @@ |
| #include "skia/ext/vector_canvas.h" |
| #include "third_party/WebKit/public/web/WebFrame.h" |
| -#if !defined(OS_CHROMEOS) |
| +#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
| #include "base/process/process_handle.h" |
| -#endif // !defined(OS_CHROMEOS) |
| +#else |
| +#include "base/file_descriptor_posix.h" |
| +#endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
| namespace printing { |
| @@ -41,8 +40,7 @@ bool PrintWebViewHelper::RenderPreviewPage( |
| } |
| base::TimeTicks begin_time = base::TimeTicks::Now(); |
| - PrintPageInternal(page_params, |
| - print_preview_context_.GetPrintCanvasSize(), |
|
Lei Zhang
2013/08/13 23:26:37
one arg per line is acceptable, no need to change
cimamoglu1
2013/08/14 16:10:36
Done.
|
| + PrintPageInternal(page_params, print_preview_context_.GetPrintCanvasSize(), |
| print_preview_context_.prepared_frame(), |
| initial_render_metafile); |
| print_preview_context_.RenderedPreviewPage( |
| @@ -101,14 +99,16 @@ bool PrintWebViewHelper::PrintPagesNative(WebKit::WebFrame* frame, |
| uint32 buf_size = metafile.GetDataSize(); |
| DCHECK_GT(buf_size, 0u); |
| -#if defined(OS_CHROMEOS) |
| +#if defined(OS_CHROMEOS) || defined(OS_ANDROID) |
| int sequence_number = -1; |
| base::FileDescriptor fd; |
| // Ask the browser to open a file for us. |
| - Send(new PrintHostMsg_AllocateTempFileForPrinting(&fd, &sequence_number)); |
| + Send(new PrintHostMsg_AllocateTempFileForPrinting(routing_id(), |
| + &fd, |
| + &sequence_number)); |
| if (!metafile.SaveToFD(fd)) |
| - return false; |
| + return false; |
|
Lei Zhang
2013/08/13 23:26:37
bad indent
cimamoglu1
2013/08/14 16:10:36
Done.
|
| // Tell the browser we've finished writing the file. |
| Send(new PrintHostMsg_TempFileForPrintingWritten(routing_id(), |