diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 23:19:57 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 23:19:57 +0000 |
| commit | bcd90b701089e050a74b82f0670cf36ff72bd7d7 (patch) | |
| tree | 5cdab65729fe20ef41c05aa3b92f0a1748d134d6 /content/ppapi_plugin | |
| parent | 6289ffbc2945eda8893b5fcf899e87539214ddc9 (diff) | |
| download | chromium_src-bcd90b701089e050a74b82f0670cf36ff72bd7d7.zip chromium_src-bcd90b701089e050a74b82f0670cf36ff72bd7d7.tar.gz chromium_src-bcd90b701089e050a74b82f0670cf36ff72bd7d7.tar.bz2 | |
Create a public header with the child_process_sandbox_support_linux functions that are used in chrome. Also move everything to the content namespace, now that we have one. This gets rid of the last content/common includes from chrome/renderer and so I've tightened up the DEPS.
Also get rid of the webkit_glue versions of the font functions since they weren't used anymore.
BUG=98716
Review URL: http://codereview.chromium.org/8319017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc index 82f330c..4733909 100644 --- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc +++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc @@ -18,7 +18,7 @@ #elif defined(OS_MACOSX) #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h" #elif defined(OS_POSIX) -#include "content/common/child_process_sandbox_support_linux.h" +#include "content/common/child_process_sandbox_support_impl_linux.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h" #endif @@ -92,19 +92,17 @@ PpapiWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacters( if (iter != unicode_font_families_.end()) return WebString::fromUTF8(iter->second); - const std::string family_name = - child_process_sandbox_support::getFontFamilyForCharacters( - characters, - num_characters, - preferred_locale); + const std::string family_name = content::GetFontFamilyForCharacters( + characters, + num_characters, + preferred_locale); unicode_font_families_.insert(make_pair(key, family_name)); return WebString::fromUTF8(family_name); } void PpapiWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike( const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) { - child_process_sandbox_support::getRenderStyleForStrike(family, sizeAndStyle, - out); + content::GetRenderStyleForStrike(family, sizeAndStyle, out); } #endif |