| 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 82%
|
| rename from ppapi/proxy/browser_font_resource_trusted.h
|
| rename to content/child/browser_font_resource_trusted.h
|
| index a3b9a7028dfdb3b5840eab72e4e6d97a2cb27e18..23a434423c8b9811e85ca4850dda34c4c0ec67e4 100644
|
| --- a/ppapi/proxy/browser_font_resource_trusted.h
|
| +++ b/content/child/browser_font_resource_trusted.h
|
| @@ -2,8 +2,8 @@
|
| // 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_
|
| +#ifndef CONTENT_CHILD_BROWSER_FONT_RESOURCE_TRUSTED_H_
|
| +#define CONTENT_CHILD_BROWSER_FONT_RESOURCE_TRUSTED_H_
|
|
|
| #include <string>
|
|
|
| @@ -14,7 +14,6 @@
|
| #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"
|
|
|
| @@ -24,19 +23,16 @@ namespace WebKit {
|
| class WebFont;
|
| }
|
|
|
| -namespace ppapi {
|
| -namespace proxy {
|
| +namespace content {
|
|
|
| -class PPAPI_PROXY_EXPORT BrowserFontResource_Trusted
|
| - : public PluginResource,
|
| - public thunk::PPB_BrowserFont_Trusted_API {
|
| +class BrowserFontResource_Trusted
|
| + : public ppapi::proxy::PluginResource,
|
| + public ppapi::thunk::PPB_BrowserFont_Trusted_API {
|
| public:
|
| - BrowserFontResource_Trusted(Connection connection,
|
| + BrowserFontResource_Trusted(ppapi::proxy::Connection connection,
|
| PP_Instance instance,
|
| const PP_BrowserFont_Trusted_Description& desc,
|
| - const Preferences& prefs);
|
| -
|
| - virtual ~BrowserFontResource_Trusted();
|
| + const ppapi::Preferences& prefs);
|
|
|
| // Validates the parameters in thee description. Can be called on any thread.
|
| static bool IsPPFontDescriptionValid(
|
| @@ -65,6 +61,8 @@ class PPAPI_PROXY_EXPORT BrowserFontResource_Trusted
|
| 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,
|
| @@ -79,7 +77,6 @@ class PPAPI_PROXY_EXPORT BrowserFontResource_Trusted
|
| DISALLOW_COPY_AND_ASSIGN(BrowserFontResource_Trusted);
|
| };
|
|
|
| -} // namespace proxy
|
| -} // namespace ppapi
|
| +} // namespace content
|
|
|
| -#endif // PPAPI_PROXY_BROWSER_FONT_TRUSTED_RESOURCE_H_
|
| +#endif // CONTENT_CHILD_BROWSER_FONT_RESOURCE_TRUSTED_H_
|
|
|