Adds FontCache to OffscreenFontSelector

Also makes FontFaceInvalidated a virtual on FontSelector.

Bug: 722511
Change-Id: I6144965b1d559bb418d2b823b4d6486e5769d8bc
Reviewed-on: https://chromium-review.googlesource.com/702684
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Reviewed-by: Justin Novosad <junov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506898}

third_party/WebKit/Source/core/css/CSSFontSelector.h

@@ -62,7 +62,7 @@ class CORE_EXPORT CSSFontSelector : public FontSelector {
   bool IsPlatformFamilyMatchAvailable(const FontDescription&,
                                       const AtomicString& family);
 
-  void FontFaceInvalidated();
+  void FontFaceInvalidated() override;
 
   // FontCacheClient implementation
   void FontCacheInvalidated() override;

third_party/WebKit/Source/core/css/OffscreenFontSelector.cpp

@@ -19,7 +19,9 @@
 
 namespace blink {
 
-OffscreenFontSelector::OffscreenFontSelector() {}
+OffscreenFontSelector::OffscreenFontSelector() {
+  FontCache::GetFontCache()->AddClient(this);
+}
 
 OffscreenFontSelector::~OffscreenFontSelector() {}
 
@@ -37,6 +39,11 @@ void OffscreenFontSelector::UnregisterForInvalidationCallbacks(
 RefPtr<FontData> OffscreenFontSelector::GetFontData(
     const FontDescription& font_description,
     const AtomicString& family_name) {
+  if (CSSSegmentedFontFace* face =
+          font_face_cache_.Get(font_description, family_name)) {
+    return face->GetFontData(font_description);
+  }
+
   AtomicString settings_family_name = FamilyNameFromSettings(
       generic_font_family_settings_, font_description, family_name);
   if (settings_family_name.IsEmpty())
@@ -49,18 +56,44 @@ RefPtr<FontData> OffscreenFontSelector::GetFontData(
 void OffscreenFontSelector::WillUseFontData(
     const FontDescription& font_description,
     const AtomicString& family,
-    const String& text) {}
+    const String& text) {
+  CSSSegmentedFontFace* face = font_face_cache_.Get(font_description, family);
+  if (face)
+    face->WillUseFontData(font_description, text);
+}
 
 void OffscreenFontSelector::WillUseRange(
     const FontDescription& font_description,
     const AtomicString& family,
-    const FontDataForRangeSet& range_set) {}
+    const FontDataForRangeSet& range_set) {
+  CSSSegmentedFontFace* face = font_face_cache_.Get(font_description, family);
+  if (face)
+    face->WillUseRange(font_description, range_set);
+}
+
+bool OffscreenFontSelector::IsPlatformFamilyMatchAvailable(
+    const FontDescription& font_description,
+    const AtomicString& passed_family) {
+  AtomicString family = FamilyNameFromSettings(generic_font_family_settings_,
+                                               font_description, passed_family);
+  if (family.IsEmpty())
+    family = passed_family;
+  return FontCache::GetFontCache()->IsPlatformFamilyMatchAvailable(
+      font_description, family);
+}
 
 void OffscreenFontSelector::ReportNotDefGlyph() const {}
 
-void OffscreenFontSelector::FontCacheInvalidated() {}
+void OffscreenFontSelector::FontCacheInvalidated() {
+  font_face_cache_.IncrementVersion();
+}
+
+void OffscreenFontSelector::FontFaceInvalidated() {
+  FontCacheInvalidated();
+}
 
 DEFINE_TRACE(OffscreenFontSelector) {
+  visitor->Trace(font_face_cache_);
   FontSelector::Trace(visitor);
 }
 

third_party/WebKit/Source/core/css/OffscreenFontSelector.h

@@ -44,9 +44,15 @@ class CORE_EXPORT OffscreenFontSelector : public FontSelector {
   }
 
   void FontCacheInvalidated() override;
+  void FontFaceInvalidated() override;
 
   void UpdateGenericFontFamilySettings(const GenericFontFamilySettings&);
 
+  FontFaceCache* GetFontFaceCache() { return &font_face_cache_; }
+
+  bool IsPlatformFamilyMatchAvailable(const FontDescription&,
+                                      const AtomicString& passed_family);
+
   DECLARE_VIRTUAL_TRACE();
 
  protected:
@@ -56,6 +62,8 @@ class CORE_EXPORT OffscreenFontSelector : public FontSelector {
 
  private:
   GenericFontFamilySettings generic_font_family_settings_;
+
+  FontFaceCache font_face_cache_;
 };
 
 }  // namespace blink

third_party/WebKit/Source/platform/fonts/FontCache.cpp

@@ -380,6 +380,7 @@ void FontCache::AddClient(FontCacheClient* client) {
   CHECK(client);
   if (!font_cache_clients_) {
     font_cache_clients_ = new HeapHashSet<WeakMember<FontCacheClient>>();
+    font_cache_clients_.RegisterAsStaticReference();
   }
   DCHECK(!font_cache_clients_->Contains(client));
   font_cache_clients_->insert(client);

third_party/WebKit/Source/platform/fonts/FontSelector.h

@@ -62,6 +62,8 @@ class PLATFORM_EXPORT FontSelector : public FontCacheClient {
   virtual void RegisterForInvalidationCallbacks(FontSelectorClient*) = 0;
   virtual void UnregisterForInvalidationCallbacks(FontSelectorClient*) = 0;
 
+  virtual void FontFaceInvalidated(){};
+
  protected:
   static AtomicString FamilyNameFromSettings(
       const GenericFontFamilySettings&,