Skip to content

Commit

Permalink
Complete Chromium side rename of WebFontFamily to WebFallbackFont
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dominik.rottsches@intel.com committed Jun 17, 2014
1 parent bf57960 commit 8845f0f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 61 deletions.
31 changes: 0 additions & 31 deletions content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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<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,
Expand Down
30 changes: 0 additions & 30 deletions content/renderer/renderer_webkitplatformsupport_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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<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
RendererWebKitPlatformSupportImpl::SandboxSupport::getFallbackFontForCharacter(
blink::WebUChar32 character,
Expand Down

0 comments on commit 8845f0f

Please sign in to comment.