Revert 54173 - Hook up the new font API to WebKit. This moves the existing Ge...

webkit/glue/plugins/pepper_font.h

Index: webkit/glue/plugins/pepper_font.h
===================================================================
--- webkit/glue/plugins/pepper_font.h	(revision 54178)
+++ webkit/glue/plugins/pepper_font.h	(working copy)
@@ -5,15 +5,9 @@
 #ifndef WEBKIT_GLUE_PLUGINS_PEPPER_FONT_H_
 #define WEBKIT_GLUE_PLUGINS_PEPPER_FONT_H_
 
-#include <string>
-
-#include "base/scoped_ptr.h"
-#include "third_party/ppapi/c/ppb_font.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
-namespace WebKit {
-class WebFont;
-}
+typedef struct _ppb_Font PPB_Font;
 
 namespace pepper {
 
@@ -21,7 +15,7 @@
 
 class Font : public Resource {
  public:
-  Font(PluginModule* module, const PP_FontDescription& desc);
+  Font(PluginModule* module, int fd);
   virtual ~Font();
 
   // Returns a pointer to the interface implementing PPB_Font that is exposed to
@@ -32,22 +26,12 @@
   Font* AsFont() { return this; }
 
   // PPB_Font implementation.
-  bool Describe(PP_FontDescription* description,
-                PP_FontMetrics* metrics);
-  bool DrawTextAt(PP_Resource image_data,
-                  const PP_TextRun* 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 pixel_position);
-  int32_t PixelOffsetForCharacter(const PP_TextRun* text,
-                                  uint32_t char_offset);
+  bool GetFontTable(uint32_t table,
+                    void* output,
+                    uint32_t* output_length);
 
  private:
-  scoped_ptr<WebKit::WebFont> font_;
+  int fd_;
 };
 
 }  // namespace pepper