Index: ppapi/c/dev/ppp_printing_dev.h |
diff --git a/ppapi/c/dev/ppp_printing_dev.h b/ppapi/c/dev/ppp_printing_dev.h |
index b6003587ee34509f432c5a6e8ad5f3579eaf2fde..5da2df89610e5a9a5ea4e56fb27af4010c809a81 100644 |
--- a/ppapi/c/dev/ppp_printing_dev.h |
+++ b/ppapi/c/dev/ppp_printing_dev.h |
@@ -3,7 +3,7 @@ |
* found in the LICENSE file. |
*/ |
-/* From dev/ppp_printing_dev.idl modified Tue Apr 17 20:28:30 2012. */ |
+/* From dev/ppp_printing_dev.idl modified Tue May 15 15:17:01 2012. */ |
#ifndef PPAPI_C_DEV_PPP_PRINTING_DEV_H_ |
#define PPAPI_C_DEV_PPP_PRINTING_DEV_H_ |
@@ -17,8 +17,8 @@ |
#include "ppapi/c/pp_size.h" |
#include "ppapi/c/pp_stdint.h" |
-#define PPP_PRINTING_DEV_INTERFACE_0_5 "PPP_Printing(Dev);0.5" |
-#define PPP_PRINTING_DEV_INTERFACE PPP_PRINTING_DEV_INTERFACE_0_5 |
+#define PPP_PRINTING_DEV_INTERFACE_0_6 "PPP_Printing(Dev);0.6" |
+#define PPP_PRINTING_DEV_INTERFACE PPP_PRINTING_DEV_INTERFACE_0_6 |
/** |
* @file |
@@ -45,6 +45,13 @@ typedef enum { |
PP_PRINTOUTPUTFORMAT_EMF = 1u << 3 |
} PP_PrintOutputFormat_Dev; |
PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_PrintOutputFormat_Dev, 4); |
+ |
+typedef enum { |
+ PP_PRINTSCALINGOPTION_NONE = 0, |
+ PP_PRINTSCALINGOPTION_FIT_TO_PRINTABLE_AREA = 1, |
+ PP_PRINTSCALINGOPTION_SOURCE_SIZE = 2 |
+} PP_PrintScalingOption_Dev; |
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_PrintScalingOption_Dev, 4); |
/** |
* @} |
*/ |
@@ -56,13 +63,16 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_PrintOutputFormat_Dev, 4); |
struct PP_PrintSettings_Dev { |
/** This is the size of the printable area in points (1/72 of an inch) */ |
struct PP_Rect printable_area; |
+ struct PP_Rect content_area; |
+ struct PP_Size paper_size; |
int32_t dpi; |
PP_PrintOrientation_Dev orientation; |
+ PP_PrintScalingOption_Dev print_scaling_option; |
PP_Bool grayscale; |
/** Note that Chrome currently only supports PDF printing. */ |
PP_PrintOutputFormat_Dev format; |
}; |
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintSettings_Dev, 32); |
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintSettings_Dev, 60); |
/** |
* Specifies a contiguous range of page numbers to be printed. |
@@ -81,7 +91,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintPageNumberRange_Dev, 8); |
* @addtogroup Interfaces |
* @{ |
*/ |
-struct PPP_Printing_Dev_0_5 { |
+struct PPP_Printing_Dev_0_6 { |
/** |
* Returns a bit field representing the supported print output formats. For |
* example, if only PDF and PostScript are supported, |
@@ -115,7 +125,7 @@ struct PPP_Printing_Dev_0_5 { |
PP_Bool (*IsScalingDisabled)(PP_Instance instance); |
}; |
-typedef struct PPP_Printing_Dev_0_5 PPP_Printing_Dev; |
+typedef struct PPP_Printing_Dev_0_6 PPP_Printing_Dev; |
/** |
* @} |
*/ |