move BrowserFontResource_Trusted to content/child

content/child/browser_font_resource_trusted.cc

 // Copyright (c) 2012 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 "ppapi/proxy/browser_font_resource_trusted.h"
+#include "content/child/browser_font_resource_trusted.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
+#include "ppapi/proxy/connection.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/web/WebFont.h"
 #include "third_party/WebKit/public/web/WebFontDescription.h"
 #include "third_party/WebKit/public/web/WebTextRun.h"
 #include "third_party/icu/source/common/unicode/ubidi.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_ImageData_API;
 using WebKit::WebFloatPoint;
 using WebKit::WebFloatRect;
 using WebKit::WebFont;
 using WebKit::WebFontDescription;
 using WebKit::WebRect;
 using WebKit::WebTextRun;
 using WebKit::WebCanvas;
 
-namespace ppapi {
-namespace proxy {
+namespace content {
 
 namespace {
 
 // Same as WebPreferences::kCommonScript. I'd use that directly here, but get an
 // undefined reference linker error.
 const char kCommonScript[] = "Zyyy";
 
 string16 GetFontFromMap(
     const webkit_glue::ScriptFontFamilyMap& map,
     const std::string& script) {
@@ skipping 87 matching lines @@
 // The PP_* version lacks "None", so is just one value shifted from the
 // WebFontDescription version. These values are checked in
 // PPFontDescToWebFontDesc to make sure the conversion is correct. This is a
 // macro so it can also be used in the COMPILE_ASSERTS.
 #define PP_FAMILY_TO_WEB_FAMILY(f) \
   static_cast<WebFontDescription::GenericFamily>(f + 1)
 
 // Assumes the given PP_FontDescription has been validated.
 WebFontDescription PPFontDescToWebFontDesc(
     const PP_BrowserFont_Trusted_Description& font,
-    const Preferences& prefs) {
+    const ppapi::Preferences& prefs) {
   // Verify that the enums match so we can just static cast.
   COMPILE_ASSERT(static_cast<int>(WebFontDescription::Weight100) ==
                  static_cast<int>(PP_BROWSERFONT_TRUSTED_WEIGHT_100),
                  FontWeight100);
   COMPILE_ASSERT(static_cast<int>(WebFontDescription::Weight900) ==
                  static_cast<int>(PP_BROWSERFONT_TRUSTED_WEIGHT_900),
                  FontWeight900);
   COMPILE_ASSERT(WebFontDescription::GenericFamilyStandard ==
                  PP_FAMILY_TO_WEB_FAMILY(PP_FONTFAMILY_DEFAULT),
                  StandardFamily);
@@ skipping 84 matching lines @@
     return false;
 
   // Check for excessive sizes which may cause layout to get confused.
   if (desc.size > 200)
     return false;
 
   return true;
 }
 
 BrowserFontResource_Trusted::BrowserFontResource_Trusted(
-    Connection connection,
+    ppapi::proxy::Connection connection,
     PP_Instance instance,
     const PP_BrowserFont_Trusted_Description& desc,
-    const Preferences& prefs)
+    const ppapi::Preferences& prefs)
     : PluginResource(connection, instance),
       font_(WebFont::create(PPFontDescToWebFontDesc(desc, prefs))) {
 }
 
 BrowserFontResource_Trusted::~BrowserFontResource_Trusted() {
 }
 
-thunk::PPB_BrowserFont_Trusted_API*
+ppapi::thunk::PPB_BrowserFont_Trusted_API*
 BrowserFontResource_Trusted::AsPPB_BrowserFont_Trusted_API() {
   return this;
 }
 
 PP_Bool BrowserFontResource_Trusted::Describe(
     PP_BrowserFont_Trusted_Description* description,
     PP_BrowserFont_Trusted_Metrics* metrics) {
   if (description->face.type != PP_VARTYPE_UNDEFINED)
     return PP_FALSE;
 
@@ skipping 145 matching lines @@
                     PP_ToBool(image_data_is_opaque));
 
     // Advance to the next run. Note that we avoid doing this for the last run
     // since it's unnecessary, measuring text is slow, and most of the time
     // there will be only one run anyway.
     if (i != runs.num_runs() - 1)
       web_position.x += font_->calculateWidth(run);
   }
 }
 
-}  // namespace proxy
-}  // namespace ppapi
+}  // namespace content