Complete Chromium side rename of WebFontFamily to WebFallbackFont

content/renderer/renderer_webkitplatformsupport_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/shared_memory.h"
@@ skipping 189 matching lines @@
   virtual ~SandboxSupport() {}
 
 #if defined(OS_WIN)
   virtual bool ensureFontLoaded(HFONT);
 #elif defined(OS_MACOSX)
   virtual bool loadFont(
       NSFont* src_font,
       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,
       blink::WebFallbackFont* fallbackFont);
   virtual void getRenderStyleForStrike(
       const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out);
 
  private:
   // WebKit likes to ask us for the correct font family to use for a set of
   // unicode code points. It needs this information frequently so we cache it
@@ skipping 381 matching lines @@
 
 #elif defined(OS_ANDROID)
 
 // WebKit doesn't use WebSandboxSupport on android so we don't need to
 // implement anything here. This is cleaner to support than excluding the
 // whole class for android.
 
 #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,
     blink::WebFallbackFont* fallbackFont) {
   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()) {
     fallbackFont->name = iter->second.name;
     fallbackFont->filename = iter->second.filename;
@@ skipping 599 matching lines @@
   battery_status_dispatcher_->SetListener(listener);
 }
 
 // static
 void RendererWebKitPlatformSupportImpl::MockBatteryStatusChangedForTesting(
     const blink::WebBatteryStatus& status) {
   g_test_battery_status_dispatcher.Get().PostBatteryStatusChange(status);
 }
 
 }  // namespace content