Remove backwards compatibility for PPP_Printing_Dev 0.3

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // Copyright (c) 2011 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 WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 288 matching lines @@
   // (see has_webkit_focus_ below).
   bool PluginHasFocus() const;
 
   // Reports the current plugin geometry to the plugin by calling
   // DidChangeView.
   void ReportGeometry();
 
   // Queries the plugin for supported print formats and sets |format| to the
   // best format to use. Returns false if the plugin does not support any
   // print format that we can handle (we can handle raster and PDF).
-  bool GetPreferredPrintOutputFormat(PP_PrintOutputFormat_Dev_0_4* format);
+  bool GetPreferredPrintOutputFormat(PP_PrintOutputFormat_Dev* format);
   bool PrintPDFOutput(PP_Resource print_output, WebKit::WebCanvas* canvas);
   bool PrintRasterOutput(PP_Resource print_output, WebKit::WebCanvas* canvas);
 #if defined(OS_WIN)
   bool DrawJPEGToPlatformDC(const SkBitmap& bitmap,
                             const gfx::Rect& printable_area,
                             WebKit::WebCanvas* canvas);
 #elif defined(OS_MACOSX) && !defined(USE_SKIA)
   // Draws the given kARGB_8888_Config bitmap to the specified canvas starting
   // at the specified destination rect.
   void DrawSkBitmapToCanvas(const SkBitmap& bitmap, WebKit::WebCanvas* canvas,
@@ skipping 74 matching lines @@
   const PPP_Selection_Dev* plugin_selection_interface_;
   const PPP_Zoom_Dev* plugin_zoom_interface_;
 
   // Flags indicating whether we have asked this plugin instance for the
   // corresponding interfaces, so that we can ask only once.
   bool checked_for_plugin_input_event_interface_;
   bool checked_for_plugin_messaging_interface_;
 
   // This is only valid between a successful PrintBegin call and a PrintEnd
   // call.
-  PP_PrintSettings_Dev_0_4 current_print_settings_;
+  PP_PrintSettings_Dev current_print_settings_;
 #if defined(OS_MACOSX)
   // On the Mac, when we draw the bitmap to the PDFContext, it seems necessary
   // to keep the pixels valid until CGContextEndPage is called. We use this
   // variable to hold on to the pixels.
   scoped_refptr<PPB_ImageData_Impl> last_printed_page_;
 #endif  // defined(OS_MACOSX)
 #if defined(OS_LINUX) || defined(OS_WIN)
   // When printing to PDF (print preview, Linux) the entire document goes into
   // one metafile.  However, when users print only a subset of all the pages,
   // it is impossible to know if a call to PrintPage() is the last call.
   // Thus in PrintPage(), just store the page number in |ranges_|.
   // The hack is in PrintEnd(), where a valid |canvas_| is preserved in
   // PrintWebViewHelper::PrintPages. This makes it possible to generate the
   // entire PDF given the variables below:
   //
   // The most recently used WebCanvas, guaranteed to be valid.
   SkRefPtr<WebKit::WebCanvas> canvas_;
   // An array of page ranges.
   std::vector<PP_PrintPageNumberRange_Dev> ranges_;
 #endif  // OS_LINUX || OS_WIN
 
-  // The plugin print interface.  This nested struct adds functions needed for
-  // backwards compatibility.
-  struct PPP_Printing_Dev_Combined : public PPP_Printing_Dev_0_4 {
-    // Conversion constructor for the most current interface.  Sets all old
-    // functions to NULL, so we know not to try to use them.
-    PPP_Printing_Dev_Combined(const PPP_Printing_Dev_0_4& base_if)
-        : PPP_Printing_Dev_0_4(base_if),
-          QuerySupportedFormats_0_3(NULL),
-          Begin_0_3(NULL) {}
-
-    // Conversion constructor for version 0.3.  Sets unsupported functions to
-    // NULL, so we know not to try to use them.
-    PPP_Printing_Dev_Combined(const PPP_Printing_Dev_0_3& old_if)
-        : PPP_Printing_Dev_0_4(),  // NOTE: The parens are important, to zero-
-                                   // initialize the struct.
-                                   // Except older version of g++ doesn't!
-                                   // So do it explicitly in the ctor.
-          QuerySupportedFormats_0_3(old_if.QuerySupportedFormats),
-          Begin_0_3(old_if.Begin) {
-      QuerySupportedFormats = NULL;
-      Begin = NULL;
-      PrintPages = old_if.PrintPages;
-      End = old_if.End;
-    }
-
-    // The 0.3 version of 'QuerySupportedFormats'.
-    PP_PrintOutputFormat_Dev_0_3* (*QuerySupportedFormats_0_3)(
-        PP_Instance instance, uint32_t* format_count);
-    // The 0.3 version of 'Begin'.
-    int32_t (*Begin_0_3)(PP_Instance instance,
-                         const PP_PrintSettings_Dev_0_3* print_settings);
-  };
-  scoped_ptr<PPP_Printing_Dev_Combined> plugin_print_interface_;
+  // The plugin print interface.
+  const PPP_Printing_Dev* plugin_print_interface_;
 
   // The plugin 3D interface.
   const PPP_Graphics3D_Dev* plugin_graphics_3d_interface_;
 
   // Contains the cursor if it's set by the plugin.
   scoped_ptr<WebKit::WebCursorInfo> cursor_;
 
   // Set to true if this plugin thinks it will always be on top. This allows us
   // to use a more optimized painting path in some cases.
   bool always_on_top_;
@@ skipping 21 matching lines @@
   uint32_t input_event_mask_;
   uint32_t filtered_input_event_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_