Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Gr...

webkit/glue/plugins/pepper_font.h

Index: webkit/glue/plugins/pepper_font.h
===================================================================
--- webkit/glue/plugins/pepper_font.h	(revision 57791)
+++ webkit/glue/plugins/pepper_font.h	(working copy)
@@ -6,7 +6,7 @@
 #define WEBKIT_GLUE_PLUGINS_PEPPER_FONT_H_
 
 #include "base/scoped_ptr.h"
-#include "third_party/ppapi/c/ppb_font.h"
+#include "third_party/ppapi/c/dev/ppb_font_dev.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
 namespace WebKit {
@@ -19,29 +19,29 @@
 
 class Font : public Resource {
  public:
-  Font(PluginModule* module, const PP_FontDescription& desc);
+  Font(PluginModule* module, const PP_FontDescription_Dev& desc);
   virtual ~Font();
 
   // Returns a pointer to the interface implementing PPB_Font that is exposed to
   // the plugin.
-  static const PPB_Font* GetInterface();
+  static const PPB_Font_Dev* GetInterface();
 
   // Resource overrides.
   Font* AsFont() { return this; }
 
   // PPB_Font implementation.
-  bool Describe(PP_FontDescription* description,
-                PP_FontMetrics* metrics);
+  bool Describe(PP_FontDescription_Dev* description,
+                PP_FontMetrics_Dev* metrics);
   bool DrawTextAt(PP_Resource image_data,
-                  const PP_TextRun* text,
+                  const PP_TextRun_Dev* text,
                   const PP_Point* position,
                   uint32_t color,
                   const PP_Rect* clip,
                   bool image_data_is_opaque);
-  int32_t MeasureText(const PP_TextRun* text);
-  uint32_t CharacterOffsetForPixel(const PP_TextRun* text,
+  int32_t MeasureText(const PP_TextRun_Dev* text);
+  uint32_t CharacterOffsetForPixel(const PP_TextRun_Dev* text,
                                    int32_t pixel_position);
-  int32_t PixelOffsetForCharacter(const PP_TextRun* text,
+  int32_t PixelOffsetForCharacter(const PP_TextRun_Dev* text,
                                   uint32_t char_offset);
 
  private: