Complete Chromium side rename of WebFontFamily to WebFallbackFont

content/ppapi_plugin/ppapi_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/ppapi_plugin/ppapi_webkitplatformsupport_impl.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 34 matching lines @@
 
 #if defined(OS_WIN)
   virtual bool ensureFontLoaded(HFONT);
 #elif defined(OS_MACOSX)
   virtual bool loadFont(
       NSFont* srcFont, CGFontRef* out, uint32_t* fontID);
 #elif defined(OS_ANDROID)
   // 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,
       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 34 matching lines @@
 
 // Empty class.
 
 #elif defined(OS_POSIX)
 
 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,
     const char* preferred_locale,
     blink::WebFallbackFont* fallbackFont) {
   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()) {
@@ skipping 132 matching lines @@
   NOTREACHED();
 }
 
 int PpapiWebKitPlatformSupportImpl::databaseDeleteFile(
     const blink::WebString& vfs_file_name, bool sync_dir) {
   NOTREACHED();
   return 0;
 }
 
 }  // namespace content