| Index: content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
|
| diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
|
| index 2beab8f1fa7f54a73c1c45c6bfe8a9ff51ce2241..cfbed44206871dc1537fbad21f2e23ecd7646d47 100644
|
| --- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
|
| +++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
|
| @@ -52,12 +52,6 @@ class PpapiWebKitPlatformSupportImpl::SandboxSupport
|
| // Empty class.
|
| #elif defined(OS_POSIX)
|
| SandboxSupport();
|
| - // TODO(dro): crbug.com/382411 Remove this function, once the blink side
|
| - // does not need it anymore.
|
| - virtual void getFontFamilyForCharacter(
|
| - WebUChar32 character,
|
| - const char* preferred_locale,
|
| - blink::WebFontFamily* family);
|
| virtual void getFallbackFontForCharacter(
|
| WebUChar32 character,
|
| const char* preferred_locale,
|
| @@ -112,31 +106,6 @@ PpapiWebKitPlatformSupportImpl::SandboxSupport::SandboxSupport()
|
| }
|
|
|
| void
|
| -PpapiWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacter(
|
| - WebUChar32 character,
|
| - const char* preferred_locale,
|
| - blink::WebFontFamily* family) {
|
| - ppapi::ProxyLock::AssertAcquired();
|
| - // For debugging crbug.com/312965
|
| - CHECK_EQ(creation_thread_, base::PlatformThread::CurrentId());
|
| - const std::map<int32_t, blink::WebFallbackFont>::const_iterator iter =
|
| - unicode_font_families_.find(character);
|
| - if (iter != unicode_font_families_.end()) {
|
| - family->name = iter->second.name;
|
| - family->isBold = iter->second.isBold;
|
| - family->isItalic = iter->second.isItalic;
|
| - return;
|
| - }
|
| -
|
| - blink::WebFallbackFont fallbackFont;
|
| - GetFallbackFontForCharacter(character, preferred_locale, &fallbackFont);
|
| - unicode_font_families_.insert(std::make_pair(character, fallbackFont));
|
| - family->name = fallbackFont.name;
|
| - family->isBold = fallbackFont.isBold;
|
| - family->isItalic = fallbackFont.isItalic;
|
| -}
|
| -
|
| -void
|
| PpapiWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter(
|
| WebUChar32 character,
|
| const char* preferred_locale,
|
|
|