Move webpreferences.* from webkit/ to content/

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 "content/child/browser_font_resource_trusted.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/common/web_preferences.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"
@@ skipping 17 matching lines @@
 using blink::WebCanvas;
 
 namespace content {
 
 namespace {
 
 // Same as WebPreferences::kCommonScript. I'd use that directly here, but get an
 // undefined reference linker error.
 const char kCommonScript[] = "Zyyy";
 
-base::string16 GetFontFromMap(
-    const webkit_glue::ScriptFontFamilyMap& map,
-    const std::string& script) {
-  webkit_glue::ScriptFontFamilyMap::const_iterator it =
-      map.find(script);
+base::string16 GetFontFromMap(const ScriptFontFamilyMap& map,
+                              const std::string& script) {
+  ScriptFontFamilyMap::const_iterator it = map.find(script);
   if (it != map.end())
     return it->second;
   return base::string16();
 }
 
 // Splits a PP_BrowserFont_Trusted_TextRun into a sequence or LTR and RTL
 // WebTextRuns that can be used for WebKit. Normally WebKit does this for us,
 // but the font drawing and measurement routines we call happen after this
 // step. So for correct rendering of RTL content, we need to do it ourselves.
 class TextRunCollection {
@@ skipping 359 matching lines @@
 
     // 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 content