Chromium Code Reviews| Index: printing/pdf_ps_metafile_cairo.cc |
| diff --git a/printing/pdf_ps_metafile_cairo.cc b/printing/pdf_ps_metafile_cairo.cc |
| index 798ee1608e5898ff9d78452e2bf067b9ddffb26e..bf59260f6865c8c6ed8a526305a3a818b6bafd4a 100644 |
| --- a/printing/pdf_ps_metafile_cairo.cc |
| +++ b/printing/pdf_ps_metafile_cairo.cc |
| @@ -8,7 +8,6 @@ |
| #include <cairo.h> |
| #include <cairo-pdf.h> |
| -#include <cairo-ps.h> |
| #include "base/eintr_wrapper.h" |
| #include "base/file_descriptor_posix.h" |
| @@ -71,13 +70,7 @@ void DestroyContextData(void* data) { |
| namespace printing { |
| PdfPsMetafile::PdfPsMetafile() |
| - : format_(PDF), |
| - surface_(NULL), context_(NULL) { |
| -} |
| - |
| -PdfPsMetafile::PdfPsMetafile(const FileFormat& format) |
| - : format_(format), |
| - surface_(NULL), context_(NULL) { |
| + : surface_(NULL), context_(NULL) { |
|
vandebo (ex-Chrome)
2011/02/25 00:10:35
This should be either one two lines, or both on th
dpapad
2011/02/25 02:26:34
Done.
|
| } |
| PdfPsMetafile::~PdfPsMetafile() { |
| @@ -91,23 +84,10 @@ bool PdfPsMetafile::Init() { |
| DCHECK(!context_); |
| DCHECK(data_.empty()); |
| - // Creates an 1 by 1 Cairo surface for entire PDF/PS file. |
| + // Creates an 1 by 1 Cairo surface for the entire PDF file. |
| // The size for each page will be overwritten later in StartPage(). |
| - switch (format_) { |
| - case PDF: |
| - surface_ = cairo_pdf_surface_create_for_stream(WriteCairoStream, |
| - &data_, 1, 1); |
| - break; |
| - |
| - case PS: |
| - surface_ = cairo_ps_surface_create_for_stream(WriteCairoStream, |
| - &data_, 1, 1); |
| - break; |
| - |
| - default: |
| - NOTREACHED(); |
| - return false; |
| - } |
| + surface_ = cairo_pdf_surface_create_for_stream(WriteCairoStream, |
| + &data_, 1, 1); |
| // Cairo always returns a valid pointer. |
| // Hence, we have to check if it points to a "nil" object. |
| @@ -188,21 +168,7 @@ cairo_t* PdfPsMetafile::StartPage(double width_in_points, |
| margin_left_in_points, |
| margin_top_in_points); |
| - switch (format_) { |
| - case PDF: |
| - cairo_pdf_surface_set_size(surface_, width, height); |
| - break; |
| - |
| - case PS: |
| - cairo_ps_surface_set_size(surface_, width, height); |
| - break; |
| - |
| - default: |
| - NOTREACHED(); |
| - CleanUpAll(); |
| - return NULL; |
| - } |
| - |
| + cairo_pdf_surface_set_size(surface_, width, height); |
| return context_; |
| } |