Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: ppapi/c/dev/ppp_printing_dev.h

Issue 7794007: Remove backwards compatibility for PPP_Printing_Dev 0.3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded typedef Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2662826be00650844c814fc90aa3530cdbbebddf..336c588c3382553ec2569302e6981c7e859d05f8 100644
--- a/ppapi/c/dev/ppp_printing_dev.h
+++ b/ppapi/c/dev/ppp_printing_dev.h
@@ -20,26 +20,11 @@ typedef enum {
} PP_PrintOrientation_Dev;
PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_PrintOrientation_Dev, 4);
-/* TODO(dmichael): We should make published .h files contain only the latest
- version, with no explicit version number in the type name.
- For internal versions to be used by Chrome and NaCl, we
- should include all versions for every type, with no 'default'
- version (i.e., all type names are versioned). */
typedef enum {
- PP_PRINTOUTPUTFORMAT_RASTER_0_3 = 0,
- PP_PRINTOUTPUTFORMAT_PDF_0_3 = 1,
- PP_PRINTOUTPUTFORMAT_POSTSCRIPT_0_3 = 2
-} PP_PrintOutputFormat_Dev_0_3;
-typedef enum {
- PP_PRINTOUTPUTFORMAT_RASTER_0_4 = 1u << 0,
- PP_PRINTOUTPUTFORMAT_PDF_0_4 = 1u << 1,
- PP_PRINTOUTPUTFORMAT_POSTSCRIPT_0_4 = 1u << 2
-} PP_PrintOutputFormat_Dev_0_4;
-
-typedef PP_PrintOutputFormat_Dev_0_4 PP_PrintOutputFormat_Dev;
-#define PP_PRINTOUTPUTFORMAT_RASTER PP_PRINTOUTPUTFORMAT_RASTER_0_4
-#define PP_PRINTOUTPUTFORMAT_PDF PP_PRINTOUTPUTFORMAT_PDF_0_4
-#define PP_PRINTOUTPUTFORMAT_POSTSCRIPT PP_PRINTOUTPUTFORMAT_POSTSCRIPT_0_4
+ PP_PRINTOUTPUTFORMAT_RASTER = 1u << 0,
+ PP_PRINTOUTPUTFORMAT_PDF = 1u << 1,
+ PP_PRINTOUTPUTFORMAT_POSTSCRIPT = 1u << 2
+} PP_PrintOutputFormat_Dev;
PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_PrintOutputFormat_Dev, 4);
struct PP_PrintSettings_Dev {
@@ -52,30 +37,6 @@ struct PP_PrintSettings_Dev {
};
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintSettings_Dev, 32);
-/* The following versioned structs are exact copies of the above unversioned
- struct, except that PP_PrintOutputFormat_Dev_0_3 or
- PP_PrintOutputFormat_Dev_0_4 is used instead of PP_PrintOutputFormat_Dev.
- This is for use by Chrome & NaCl, which always use versioned type names. Each
- must be bit-for-bit compatible with the associated version of
- PPP_PrintOutputFormat_Dev above.
- TODO(dmichael,noelallen): Fix this by having separate internal vs external
- headers generated by IDL. */
-struct PP_PrintSettings_Dev_0_3 {
- struct PP_Rect printable_area;
- int32_t dpi;
- PP_PrintOrientation_Dev orientation;
- PP_Bool grayscale;
- PP_PrintOutputFormat_Dev_0_3 format;
-};
-
-struct PP_PrintSettings_Dev_0_4 {
- struct PP_Rect printable_area;
- int32_t dpi;
- PP_PrintOrientation_Dev orientation;
- PP_Bool grayscale;
- PP_PrintOutputFormat_Dev_0_4 format;
-};
-
/**
* Specifies a contiguous range of page numbers to be printed.
* The page numbers use a zero-based index.
@@ -87,7 +48,6 @@ struct PP_PrintPageNumberRange_Dev {
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_PrintPageNumberRange_Dev, 8);
/* Interface for the plugin to implement printing. */
-#define PPP_PRINTING_DEV_INTERFACE_0_3 "PPP_Printing(Dev);0.3"
#define PPP_PRINTING_DEV_INTERFACE_0_4 "PPP_Printing(Dev);0.4"
#define PPP_PRINTING_DEV_INTERFACE PPP_PRINTING_DEV_INTERFACE_0_4
@@ -125,34 +85,5 @@ struct PPP_Printing_Dev {
void (*End)(PP_Instance instance);
};
-/* The following versioned structs are exact copies of the above unversioned
- struct, except that PP_PrintSettings_Dev_0_3 or PP_PrintSettings_Dev_0_4 is
- used instead of PP_PrintSettings_Dev. This is for use by Chrome & NaCl, which
- always use versioned type names. Each must be bit-for-bit compatible with the
- associated version of PPP_Printing_Dev above.
- TODO(dmichael): Remove versioning from this header. */
-struct PPP_Printing_Dev_0_4 {
- uint32_t (*QuerySupportedFormats)(PP_Instance instance);
- int32_t (*Begin)(PP_Instance instance,
- const struct PP_PrintSettings_Dev_0_4* print_settings);
- PP_Resource (*PrintPages)(
- PP_Instance instance,
- const struct PP_PrintPageNumberRange_Dev* page_ranges,
- uint32_t page_range_count);
- void (*End)(PP_Instance instance);
-};
-
-struct PPP_Printing_Dev_0_3 {
- PP_PrintOutputFormat_Dev_0_3* (*QuerySupportedFormats)(
- PP_Instance instance, uint32_t* format_count);
- int32_t (*Begin)(PP_Instance instance,
- const struct PP_PrintSettings_Dev_0_3* print_settings);
- PP_Resource (*PrintPages)(
- PP_Instance instance,
- const struct PP_PrintPageNumberRange_Dev* page_ranges,
- uint32_t page_range_count);
- void (*End)(PP_Instance instance);
-};
-
#endif /* PPAPI_C_DEV_PPP_PRINTING_DEV_H_ */
« no previous file with comments | « no previous file | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698