move BrowserFontResource_Trusted to content/child

content/child/browser_font_resource_trusted.h

Index: content/child/browser_font_resource_trusted.h
diff --git a/ppapi/proxy/browser_font_resource_trusted.h b/content/child/browser_font_resource_trusted.h
similarity index 79%
rename from ppapi/proxy/browser_font_resource_trusted.h
rename to content/child/browser_font_resource_trusted.h
index a3b9a7028dfdb3b5840eab72e4e6d97a2cb27e18..e5cede9aea938423f98aa23b98694149a442201f 100644
--- a/ppapi/proxy/browser_font_resource_trusted.h
+++ b/content/child/browser_font_resource_trusted.h
@@ -1,85 +1,83 @@
-// 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.
-
-#ifndef PPAPI_PROXY_BROWSER_FONT_TRUSTED_RESOURCE_H_
-#define PPAPI_PROXY_BROWSER_FONT_TRUSTED_RESOURCE_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_stdint.h"
-#include "ppapi/proxy/plugin_resource.h"
-#include "ppapi/proxy/ppapi_proxy_export.h"
-#include "ppapi/shared_impl/ppapi_preferences.h"
-#include "ppapi/thunk/ppb_browser_font_trusted_api.h"
-
-class SkCanvas;
-
-namespace WebKit {
-class WebFont;
-}
-
-namespace ppapi {
-namespace proxy {
-
-class PPAPI_PROXY_EXPORT BrowserFontResource_Trusted
-    : public PluginResource,
-      public thunk::PPB_BrowserFont_Trusted_API {
- public:
-  BrowserFontResource_Trusted(Connection connection,
-                              PP_Instance instance,
-                              const PP_BrowserFont_Trusted_Description& desc,
-                              const Preferences& prefs);
-
-  virtual ~BrowserFontResource_Trusted();
-
-  // Validates the parameters in thee description. Can be called on any thread.
-  static bool IsPPFontDescriptionValid(
-      const PP_BrowserFont_Trusted_Description& desc);
-
-  // Resource override.
-  virtual ::ppapi::thunk::PPB_BrowserFont_Trusted_API*
-      AsPPB_BrowserFont_Trusted_API() OVERRIDE;
-
-  // PPB_BrowserFont_Trusted_API implementation.
-  virtual PP_Bool Describe(PP_BrowserFont_Trusted_Description* description,
-                           PP_BrowserFont_Trusted_Metrics* metrics) OVERRIDE;
-  virtual PP_Bool DrawTextAt(PP_Resource image_data,
-                             const PP_BrowserFont_Trusted_TextRun* text,
-                             const PP_Point* position,
-                             uint32_t color,
-                             const PP_Rect* clip,
-                             PP_Bool image_data_is_opaque) OVERRIDE;
-  virtual int32_t MeasureText(
-      const PP_BrowserFont_Trusted_TextRun* text) OVERRIDE;
-  virtual uint32_t CharacterOffsetForPixel(
-      const PP_BrowserFont_Trusted_TextRun* text,
-      int32_t pixel_position) OVERRIDE;
-  virtual int32_t PixelOffsetForCharacter(
-      const PP_BrowserFont_Trusted_TextRun* text,
-      uint32_t char_offset) OVERRIDE;
-
- private:
-  // Internal version of DrawTextAt that takes a mapped PlatformCanvas.
-  void DrawTextToCanvas(SkCanvas* destination,
-                        const PP_BrowserFont_Trusted_TextRun& text,
-                        const PP_Point* position,
-                        uint32_t color,
-                        const PP_Rect* clip,
-                        PP_Bool image_data_is_opaque);
-
- private:
-  scoped_ptr<WebKit::WebFont> font_;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserFontResource_Trusted);
-};
-
-}  // namespace proxy
-}  // namespace ppapi
-
-#endif  // PPAPI_PROXY_BROWSER_FONT_TRUSTED_RESOURCE_H_
+// 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.
+
+#ifndef CONTENT_CHILD_BROWSER_FONT_RESOURCE_TRUSTED_H_
+#define CONTENT_CHILD_BROWSER_FONT_RESOURCE_TRUSTED_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
+#include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_resource.h"
+#include "ppapi/c/pp_stdint.h"
+#include "ppapi/proxy/plugin_resource.h"
+#include "ppapi/shared_impl/ppapi_preferences.h"
+#include "ppapi/thunk/ppb_browser_font_trusted_api.h"
+
+class SkCanvas;
+
+namespace WebKit {
+class WebFont;
+}
+
+namespace content {
+
+class CONTENT_EXPORT BrowserFontResource_Trusted

[jam, 2013/07/25 17:20:24]

are you sure it needs to be exported now? it doesn't look like it

[scottmg, 2013/07/25 17:39:49]

Done.

+    : public ppapi::proxy::PluginResource,
+      public ppapi::thunk::PPB_BrowserFont_Trusted_API {
+ public:
+  BrowserFontResource_Trusted(ppapi::proxy::Connection connection,
+                              PP_Instance instance,
+                              const PP_BrowserFont_Trusted_Description& desc,
+                              const ppapi::Preferences& prefs);
+
+  // Validates the parameters in thee description. Can be called on any thread.
+  static bool IsPPFontDescriptionValid(
+      const PP_BrowserFont_Trusted_Description& desc);
+
+  // Resource override.
+  virtual ::ppapi::thunk::PPB_BrowserFont_Trusted_API*
+      AsPPB_BrowserFont_Trusted_API() OVERRIDE;
+
+  // PPB_BrowserFont_Trusted_API implementation.
+  virtual PP_Bool Describe(PP_BrowserFont_Trusted_Description* description,
+                           PP_BrowserFont_Trusted_Metrics* metrics) OVERRIDE;
+  virtual PP_Bool DrawTextAt(PP_Resource image_data,
+                             const PP_BrowserFont_Trusted_TextRun* text,
+                             const PP_Point* position,
+                             uint32_t color,
+                             const PP_Rect* clip,
+                             PP_Bool image_data_is_opaque) OVERRIDE;
+  virtual int32_t MeasureText(
+      const PP_BrowserFont_Trusted_TextRun* text) OVERRIDE;
+  virtual uint32_t CharacterOffsetForPixel(
+      const PP_BrowserFont_Trusted_TextRun* text,
+      int32_t pixel_position) OVERRIDE;
+  virtual int32_t PixelOffsetForCharacter(
+      const PP_BrowserFont_Trusted_TextRun* text,
+      uint32_t char_offset) OVERRIDE;
+
+ private:
+  virtual ~BrowserFontResource_Trusted();
+
+  // Internal version of DrawTextAt that takes a mapped PlatformCanvas.
+  void DrawTextToCanvas(SkCanvas* destination,
+                        const PP_BrowserFont_Trusted_TextRun& text,
+                        const PP_Point* position,
+                        uint32_t color,
+                        const PP_Rect* clip,
+                        PP_Bool image_data_is_opaque);
+
+ private:
+  scoped_ptr<WebKit::WebFont> font_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserFontResource_Trusted);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_CHILD_BROWSER_FONT_RESOURCE_TRUSTED_H_