Add Pepper TrueType font API plumbing.

content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc

Index: content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc
diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc
similarity index 65%
copy from content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
copy to content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc
index 02ae2a8754d1b844b813a7ab7d588099793ad1ed..74e8653a8b0d7fd1b0592e6b7af1a133dd771a34 100644
--- a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc
@@ -1,15 +1,18 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h"
+#include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h"
 
+#include <algorithm>
+
+#include "base/safe_numerics.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "base/values.h"
-#include "content/common/font_list.h"
+#include "content/browser/renderer_host/pepper/pepper_truetype_font_list.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "ppapi/host/dispatch_host_message.h"
+#include "ppapi/host/host_message_context.h"
 #include "ppapi/host/resource_message_filter.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
@@ -56,7 +59,7 @@ int32_t FontMessageFilter::OnResourceMessageReceived(
     ppapi::host::HostMessageContext* context) {
   IPC_BEGIN_MESSAGE_MAP(FontMessageFilter, msg)
     PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
-        PpapiHostMsg_BrowserFontSingleton_GetFontFamilies,
+        PpapiHostMsg_TrueTypeFontSingleton_GetFontFamilies,
         OnHostMsgGetFontFamilies)
   IPC_END_MESSAGE_MAP()
   return PP_ERROR_FAILED;
@@ -65,35 +68,23 @@ int32_t FontMessageFilter::OnResourceMessageReceived(
 int32_t FontMessageFilter::OnHostMsgGetFontFamilies(
     ppapi::host::HostMessageContext* context) {
   // OK to use "slow blocking" version since we're on the blocking pool.
-  scoped_ptr<base::ListValue> list(GetFontList_SlowBlocking());
-
-  std::string output;
-  for (size_t i = 0; i < list->GetSize(); i++) {
-    base::ListValue* cur_font;
-    if (!list->GetList(i, &cur_font))
-      continue;
-
-    // Each entry is actually a list of (font name, localized name).
-    // We only care about the regular name.
-    std::string font_name;
-    if (!cur_font->GetString(0, &font_name))
-      continue;
-
-    // Font names are separated with nulls. We also want an explicit null at
-    // the end of the string (Pepper strings aren't null terminated so since
-    // we specify there will be a null, it should actually be in the string).
-    output.append(font_name);
-    output.push_back(0);
-  }
-
+  std::vector<std::string> font_families;
+  GetFontFamilies_SlowBlocking(&font_families);
+  // Sort the names in case the host platform returns them out of order.
+  std::sort(font_families.begin(), font_families.end());
+
+  int32_t result = base::checked_numeric_cast<int32_t>(font_families.size());
+  ppapi::host::ReplyMessageContext reply_context =
+      context->MakeReplyMessageContext();
+  reply_context.params.set_result(result);
   context->reply_msg =
-      PpapiPluginMsg_BrowserFontSingleton_GetFontFamiliesReply(output);
-  return PP_OK;
+      PpapiPluginMsg_TrueTypeFontSingleton_GetFontFamiliesReply(font_families);
+  return result;
 }
 
 }  // namespace
 
-PepperBrowserFontSingletonHost::PepperBrowserFontSingletonHost(
+PepperTrueTypeFontListHost::PepperTrueTypeFontListHost(
     BrowserPpapiHost* host,
     PP_Instance instance,
     PP_Resource resource)
@@ -102,7 +93,7 @@ PepperBrowserFontSingletonHost::PepperBrowserFontSingletonHost(
       new FontMessageFilter()));
 }
 
-PepperBrowserFontSingletonHost::~PepperBrowserFontSingletonHost() {
+PepperTrueTypeFontListHost::~PepperTrueTypeFontListHost() {
 }
 
 }  // namespace content