Expand print-related IPCs so we can implement CSS3 paged media.

chrome/common/render_messages.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 349 matching lines @@
 
   // Contains the id of the host renderer.
   int host_renderer_id;
 
   // Contains the id of the host render view.
   int host_render_view_id;
 };
 
 // Parameters for a render request.
 struct ViewMsg_Print_Params {
+  // Physical size of the page, including non-printable margins,
+  // in pixels according to dpi.
+  gfx::Size page_size;
+
   // In pixels according to dpi_x and dpi_y.
   gfx::Size printable_size;
 
+  // The y-offset of the printable area, in pixels according to dpi.
+  int margin_top;
+
+  // The x-offset of the printable area, in pixels according to dpi.
+  int margin_left;
+
   // Specifies dots per inch.
   double dpi;
 
   // Minimum shrink factor. See PrintSettings::min_shrink for more information.
   double min_shrink;
 
   // Maximum shrink factor. See PrintSettings::max_shrink for more information.
   double max_shrink;
 
   // Desired apparent dpi on paper.
   int desired_dpi;
 
   // Cookie for the document to ensure correctness.
   int document_cookie;
 
   // Should only print currently selected text.
   bool selection_only;
 
   // Warning: do not compare document_cookie.
   bool Equals(const ViewMsg_Print_Params& rhs) const {
-    return printable_size == rhs.printable_size &&
+    return page_size == rhs.page_size &&
+           printable_size == rhs.printable_size &&
+           margin_top == rhs.margin_top &&
+           margin_left == rhs.margin_left &&
            dpi == rhs.dpi &&
            min_shrink == rhs.min_shrink &&
            max_shrink == rhs.max_shrink &&
            desired_dpi == rhs.desired_dpi &&
            selection_only == rhs.selection_only;
   }
 
   // Checking if the current params is empty. Just initialized after a memset.
   bool IsEmpty() const {
     return !document_cookie && !desired_dpi && !max_shrink && !min_shrink &&
-           !dpi && printable_size.IsEmpty() && !selection_only;
+           !dpi && printable_size.IsEmpty() && !selection_only &&
+           page_size.IsEmpty() && !margin_top && !margin_left;
   }
 };
 
 struct ViewMsg_PrintPage_Params {
   // Parameters to render the page as a printed page. It must always be the same
   // value for all the document.
   ViewMsg_Print_Params params;
 
   // The page number is the indicator of the square that should be rendered
   // according to the layout specified in ViewMsg_Print_Params.
@@ skipping 19 matching lines @@
   uint32 data_size;
 
   // Cookie for the document to ensure correctness.
   int document_cookie;
 
   // Page number.
   int page_number;
 
   // Shrink factor used to render this page.
   double actual_shrink;
+
+  // The size of the page the page author specified.
+  gfx::Size page_size;
+
+  // The printable area the page author specified.
+  gfx::Rect content_area;
 };
 
 // Parameters for creating an audio output stream.
 struct ViewHostMsg_Audio_CreateStream_Params {
   // Format request for the stream.
   AudioManager::Format format;
 
   // Number of channels.
   int channels;
 
@@ skipping 1024 matching lines @@
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<FormData>");
   }
 };
 
 // Traits for ViewMsg_Print_Params
 template <>
 struct ParamTraits<ViewMsg_Print_Params> {
   typedef ViewMsg_Print_Params param_type;
   static void Write(Message* m, const param_type& p) {
+    WriteParam(m, p.page_size);
     WriteParam(m, p.printable_size);
+    WriteParam(m, p.margin_top);
+    WriteParam(m, p.margin_left);
     WriteParam(m, p.dpi);
     WriteParam(m, p.min_shrink);
     WriteParam(m, p.max_shrink);
     WriteParam(m, p.desired_dpi);
     WriteParam(m, p.document_cookie);
     WriteParam(m, p.selection_only);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
-    return ReadParam(m, iter, &p->printable_size) &&
+    return ReadParam(m, iter, &p->page_size) &&
+           ReadParam(m, iter, &p->printable_size) &&
+           ReadParam(m, iter, &p->margin_top) &&
+           ReadParam(m, iter, &p->margin_left) &&
            ReadParam(m, iter, &p->dpi) &&
            ReadParam(m, iter, &p->min_shrink) &&
            ReadParam(m, iter, &p->max_shrink) &&
            ReadParam(m, iter, &p->desired_dpi) &&
            ReadParam(m, iter, &p->document_cookie) &&
            ReadParam(m, iter, &p->selection_only);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<ViewMsg_Print_Params>");
   }
@@ skipping 36 matching lines @@
 // Traits for ViewHostMsg_DidPrintPage_Params
 template <>
 struct ParamTraits<ViewHostMsg_DidPrintPage_Params> {
   typedef ViewHostMsg_DidPrintPage_Params param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.metafile_data_handle);
     WriteParam(m, p.data_size);
     WriteParam(m, p.document_cookie);
     WriteParam(m, p.page_number);
     WriteParam(m, p.actual_shrink);
+    WriteParam(m, p.page_size);
+    WriteParam(m, p.content_area);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return ReadParam(m, iter, &p->metafile_data_handle) &&
            ReadParam(m, iter, &p->data_size) &&
            ReadParam(m, iter, &p->document_cookie) &&
            ReadParam(m, iter, &p->page_number) &&
-           ReadParam(m, iter, &p->actual_shrink);
+           ReadParam(m, iter, &p->actual_shrink) &&
+           ReadParam(m, iter, &p->page_size) &&
+           ReadParam(m, iter, &p->content_area);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<ViewHostMsg_DidPrintPage_Params>");
   }
 };
 
 // Traits for reading/writing CSS Colors
 template <>
 struct ParamTraits<CSSColors::CSSColorName> {
   typedef CSSColors::CSSColorName param_type;
@@ skipping 1222 matching lines @@
     l->append(L")");
   }
 };
 
 }  // namespace IPC
 
 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_