| Index: printing/pdf_render_settings.h
|
| diff --git a/printing/pdf_render_settings.h b/printing/pdf_render_settings.h
|
| index d9e8f9e7801fe134fa689712a33a3eb4f4c9a9aa..60425ec187c55eacf81bf5934e4c31e71c63d12b 100644
|
| --- a/printing/pdf_render_settings.h
|
| +++ b/printing/pdf_render_settings.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef PRINTING_PDF_RENDER_SETTINGS_H_
|
| #define PRINTING_PDF_RENDER_SETTINGS_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| +#include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_message_utils.h"
|
| #include "ipc/ipc_param_traits.h"
|
| #include "printing/printing_export.h"
|
| @@ -16,45 +19,28 @@ namespace printing {
|
|
|
| // Defining PDF rendering settings.
|
| struct PdfRenderSettings {
|
| - PdfRenderSettings() : dpi(0), autorotate(false) {}
|
| - PdfRenderSettings(gfx::Rect area, int dpi, bool autorotate)
|
| - : area(area), dpi(dpi), autorotate(autorotate) {}
|
| + enum Mode {
|
| + NORMAL = 0,
|
| +#if defined(OS_WIN)
|
| + GDI_TEXT,
|
| + LAST = GDI_TEXT,
|
| +#else
|
| + LAST = NORMAL,
|
| +#endif
|
| + };
|
| +
|
| + PdfRenderSettings() : dpi(0), autorotate(false), mode(Mode::NORMAL) {}
|
| + PdfRenderSettings(gfx::Rect area, int dpi, bool autorotate, Mode mode)
|
| + : area(area), dpi(dpi), autorotate(autorotate), mode(mode) {}
|
| ~PdfRenderSettings() {}
|
|
|
| gfx::Rect area;
|
| int dpi;
|
| bool autorotate;
|
| + Mode mode;
|
| };
|
|
|
| } // namespace printing
|
|
|
| -namespace IPC {
|
| -template <>
|
| -struct ParamTraits<printing::PdfRenderSettings> {
|
| - typedef printing::PdfRenderSettings param_type;
|
| - static void Write(base::Pickle* m, const param_type& p) {
|
| - WriteParam(m, p.area);
|
| - WriteParam(m, p.dpi);
|
| - WriteParam(m, p.autorotate);
|
| - }
|
| -
|
| - static bool Read(const base::Pickle* m,
|
| - base::PickleIterator* iter,
|
| - param_type* r) {
|
| - return ReadParam(m, iter, &r->area) &&
|
| - ReadParam(m, iter, &r->dpi) &&
|
| - ReadParam(m, iter, &r->autorotate);
|
| - }
|
| -
|
| - static void Log(const param_type& p, std::string* l) {
|
| - LogParam(p.area, l);
|
| - l->append(", ");
|
| - LogParam(p.dpi, l);
|
| - l->append(", ");
|
| - LogParam(p.autorotate, l);
|
| - }
|
| -};
|
| -
|
| -} // namespace IPC
|
| -
|
| #endif // PRINTING_PDF_RENDER_SETTINGS_H_
|
| +
|
|
|