Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3656)

Unified Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 327643002: Complete Chromium side rename of WebFontFamily to WebFallbackFont (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ren_step2
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_webkitplatformsupport_impl.cc
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 4ff3a3873778e5af11f4b94f329ac884f9ef1290..ee9b40daaf01355388a82a98645910ddcc98d254 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -207,12 +207,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,
@@ -614,30 +608,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,
const char* preferred_locale,
« no previous file with comments | « content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698