From 8845f0f108f5ab3e9544107eb7f439d12ca8c6c9 Mon Sep 17 00:00:00 2001 From: "dominik.rottsches@intel.com" Date: Tue, 17 Jun 2014 12:35:54 +0000 Subject: [PATCH] Complete Chromium side rename of WebFontFamily to WebFallbackFont Removing old functions which are not used by Blink anymore, step 4 of the rename. Depends on Blink side change in r176207. BUG=382411 R=eae,behdad,piman Review URL: https://codereview.chromium.org/327643002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277744 0039d316-1c4b-4281-b951-d872f2087c98 --- .../ppapi_webkitplatformsupport_impl.cc | 31 ------------------- .../renderer_webkitplatformsupport_impl.cc | 30 ------------------ 2 files changed, 61 deletions(-) diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc index 2beab8f1fa7f..cfbed4420687 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, @@ -111,31 +105,6 @@ PpapiWebKitPlatformSupportImpl::SandboxSupport::SandboxSupport() : creation_thread_(base::PlatformThread::CurrentId()) { } -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::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, diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 2eafa90a7d01..fd130728426f 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -205,12 +205,6 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport CGFontRef* container, uint32* font_id); #elif defined(OS_POSIX) - // TODO(dro): crbug.com/382411 Remove this function, once the blink side - // does not need it anymore. - virtual void getFontFamilyForCharacter( - blink::WebUChar32 character, - const char* preferred_locale, - blink::WebFontFamily* family); virtual void getFallbackFontForCharacter( blink::WebUChar32 character, const char* preferred_locale, @@ -604,30 +598,6 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont( #elif defined(OS_POSIX) -void -RendererWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacter( - blink::WebUChar32 character, - const char* preferred_locale, - blink::WebFontFamily* family) { - base::AutoLock lock(unicode_font_families_mutex_); - const std::map::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 RendererWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter( blink::WebUChar32 character,