Rename PPB_Font to PPB_BrowserFont_Trusted.

ppapi/thunk/ppb_browser_font_trusted_thunk.cc

Index: ppapi/thunk/ppb_browser_font_trusted_thunk.cc
diff --git a/ppapi/thunk/ppb_font_thunk.cc b/ppapi/thunk/ppb_browser_font_trusted_thunk.cc
similarity index 59%
rename from ppapi/thunk/ppb_font_thunk.cc
rename to ppapi/thunk/ppb_browser_font_trusted_thunk.cc
index 23e21cd180dfa59d15bd37efb29d982424bd2517..bcbc798cee3a1cfff56de1e36e4a1d0dc269985c 100644
--- a/ppapi/thunk/ppb_font_thunk.cc
+++ b/ppapi/thunk/ppb_browser_font_trusted_thunk.cc
@@ -4,7 +4,7 @@
 
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_font_api.h"
+#include "ppapi/thunk/ppb_browser_font_trusted_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
@@ -12,30 +12,32 @@ namespace thunk {
 
 namespace {
 
+typedef EnterResource<PPB_BrowserFont_Trusted_API> EnterBrowserFont;
+
 PP_Var GetFontFamilies(PP_Instance instance) {
-  EnterFunction<PPB_Font_FunctionAPI> enter(instance, true);
+  EnterInstance enter(instance);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.functions()->GetFontFamilies(instance);
 }
 
 PP_Resource Create(PP_Instance instance,
-                   const PP_FontDescription_Dev* description) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
+                   const PP_BrowserFont_Trusted_Description* description) {
+  EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
-  return enter.functions()->CreateFontObject(instance, description);
+  return enter.functions()->CreateBrowserFont(instance, description);
 }
 
-PP_Bool IsFont(PP_Resource resource) {
-  EnterResource<PPB_Font_API> enter(resource, false);
+PP_Bool IsBrowserFont(PP_Resource resource) {
+  EnterBrowserFont enter(resource, false);
   return enter.succeeded() ? PP_TRUE : PP_FALSE;
 }
 
 PP_Bool Describe(PP_Resource font_id,
-                 PP_FontDescription_Dev* description,
-                 PP_FontMetrics_Dev* metrics) {
-  EnterResource<PPB_Font_API> enter(font_id, true);
+                 PP_BrowserFont_Trusted_Description* description,
+                 PP_BrowserFont_Trusted_Metrics* metrics) {
+  EnterBrowserFont enter(font_id, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->Describe(description, metrics);
@@ -43,47 +45,48 @@ PP_Bool Describe(PP_Resource font_id,
 
 PP_Bool DrawTextAt(PP_Resource font_id,
                    PP_Resource image_data,
-                   const PP_TextRun_Dev* text,
+                   const PP_BrowserFont_Trusted_TextRun* text,
                    const PP_Point* position,
                    uint32_t color,
                    const PP_Rect* clip,
                    PP_Bool image_data_is_opaque) {
-  EnterResource<PPB_Font_API> enter(font_id, true);
+  EnterBrowserFont enter(font_id, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->DrawTextAt(image_data, text, position, color, clip,
                                     image_data_is_opaque);
 }
 
-int32_t MeasureText(PP_Resource font_id, const PP_TextRun_Dev* text) {
-  EnterResource<PPB_Font_API> enter(font_id, true);
+int32_t MeasureText(PP_Resource font_id,
+                    const PP_BrowserFont_Trusted_TextRun* text) {
+  EnterBrowserFont enter(font_id, true);
   if (enter.failed())
     return -1;
   return enter.object()->MeasureText(text);
 }
 
 uint32_t CharacterOffsetForPixel(PP_Resource font_id,
-                                 const PP_TextRun_Dev* text,
+                                 const PP_BrowserFont_Trusted_TextRun* text,
                                  int32_t pixel_position) {
-  EnterResource<PPB_Font_API> enter(font_id, true);
+  EnterBrowserFont enter(font_id, true);
   if (enter.failed())
     return -1;
   return enter.object()->CharacterOffsetForPixel(text, pixel_position);
 }
 
 int32_t PixelOffsetForCharacter(PP_Resource font_id,
-                                const PP_TextRun_Dev* text,
+                                const PP_BrowserFont_Trusted_TextRun* text,
                                 uint32_t char_offset) {
-  EnterResource<PPB_Font_API> enter(font_id, true);
+  EnterBrowserFont enter(font_id, true);
   if (enter.failed())
     return -1;
   return enter.object()->PixelOffsetForCharacter(text, char_offset);
 }
 
-const PPB_Font_Dev g_ppb_font_thunk = {
+const PPB_BrowserFont_Trusted_1_0 g_ppb_browser_font_trusted_thunk = {
   &GetFontFamilies,
   &Create,
-  &IsFont,
+  &IsBrowserFont,
   &Describe,
   &DrawTextAt,
   &MeasureText,
@@ -93,8 +96,8 @@ const PPB_Font_Dev g_ppb_font_thunk = {
 
 }  // namespace
 
-const PPB_Font_Dev_0_6* GetPPB_Font_Dev_0_6_Thunk() {
-  return &g_ppb_font_thunk;
+const PPB_BrowserFont_Trusted_1_0* GetPPB_BrowserFont_Trusted_1_0_Thunk() {
+  return &g_ppb_browser_font_trusted_thunk;
 }
 
 }  // namespace thunk