diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 20:25:45 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 20:25:45 +0000 |
| commit | 1d14806658d0bfc9fdb55c6e80947dbe0521c263 (patch) | |
| tree | 9d1215cfeea08b9dec3bf0664a2b7aec5cf36449 /content/ppapi_plugin | |
| parent | f9c662a04b62b175bdacec3474eee4b7e3420f25 (diff) | |
| download | chromium_src-1d14806658d0bfc9fdb55c6e80947dbe0521c263.zip chromium_src-1d14806658d0bfc9fdb55c6e80947dbe0521c263.tar.gz chromium_src-1d14806658d0bfc9fdb55c6e80947dbe0521c263.tar.bz2 | |
move BrowserFontResource_Trusted to content/child
Needed to break dependency of ppapi_proxy on webkit code.
resource_creation_proxy now creates BrowserFontResource_Trusted
by going through PluginGlobals -> PluginProxyDelegate implemented
in content by PpapiThread.
R=jam@chromium.org, yzshen@chromium.org
BUG=237249
Review URL: https://codereview.chromium.org/20214004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 12 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.h | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 43e739cf..370e465 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -15,6 +15,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" +#include "content/child/browser_font_resource_trusted.h" #include "content/child/child_process.h" #include "content/common/child_process_messages.h" #include "content/common/sandbox_util.h" @@ -209,6 +210,17 @@ void PpapiThread::SetActiveURL(const std::string& url) { GetContentClient()->SetActiveURL(GURL(url)); } +PP_Resource PpapiThread::CreateBrowserFont( + ppapi::proxy::Connection connection, + PP_Instance instance, + const PP_BrowserFont_Trusted_Description& desc, + const ppapi::Preferences& prefs) { + if (!BrowserFontResource_Trusted::IsPPFontDescriptionValid(desc)) + return 0; + return (new BrowserFontResource_Trusted( + connection, instance, desc, prefs))->GetReference(); +} + uint32 PpapiThread::Register(ppapi::proxy::PluginDispatcher* plugin_dispatcher) { if (!plugin_dispatcher || plugin_dispatchers_.size() >= std::numeric_limits<uint32>::max()) { diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h index 24037ef..d1ca550 100644 --- a/content/ppapi_plugin/ppapi_thread.h +++ b/content/ppapi_plugin/ppapi_thread.h @@ -19,6 +19,7 @@ #include "ipc/ipc_listener.h" #include "ppapi/c/pp_module.h" #include "ppapi/c/trusted/ppp_broker.h" +#include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_globals.h" #include "ppapi/proxy/plugin_proxy_delegate.h" @@ -101,6 +102,11 @@ class PpapiThread : public ChildThread, virtual std::string GetUILanguage() OVERRIDE; virtual void PreCacheFont(const void* logfontw) OVERRIDE; virtual void SetActiveURL(const std::string& url) OVERRIDE; + virtual PP_Resource CreateBrowserFont( + ppapi::proxy::Connection connection, + PP_Instance instance, + const PP_BrowserFont_Trusted_Description& desc, + const ppapi::Preferences& prefs) OVERRIDE; // Message handlers. void OnLoadPlugin(const base::FilePath& path, |