Revert of Move the FontFaceCache stored in CSSFontSelector to be stored in Document.

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 31 matching lines @@
 // method
 #ifdef check
 #undef check
 #endif
 
 namespace blink {
 
 class CSSFontSelector;
 class ExceptionState;
 class Font;
+class FontFaceCache;
 class ExecutionContext;
 
 using FontFaceSetIterable = PairIterable<Member<FontFace>, Member<FontFace>>;
 
 class FontFaceSet final : public EventTargetWithInlineData,
                           public Supplement<Document>,
                           public SuspendableObject,
                           public FontFaceSetIterable,
                           public FontFace::LoadFontCallback {
   USING_GARBAGE_COLLECTED_MIXIN(FontFaceSet);
@@ skipping 37 matching lines @@
   void suspend() override;
   void resume() override;
   void contextDestroyed(ExecutionContext*) override;
 
   static FontFaceSet* from(Document&);
   static void didLayout(Document&);
   static size_t approximateBlankCharacterCount(Document&);
 
   static const char* supplementName() { return "FontFaceSet"; }
 
-  void addFontFacesToFontFaceCache(CSSFontSelector*);
+  void addFontFacesToFontFaceCache(FontFaceCache*, CSSFontSelector*);
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   static FontFaceSet* create(Document& document) {
     return new FontFaceSet(document);
   }
 
   FontFaceSetIterable::IterationSource* startIteration(
       ScriptState*,
@@ skipping 61 matching lines @@
   HeapListHashSet<Member<FontFace>> m_nonCSSConnectedFaces;
 
   Member<AsyncMethodRunner<FontFaceSet>> m_asyncRunner;
 
   FontLoadHistogram m_histogram;
 };
 
 }  // namespace blink
 
 #endif  // FontFaceSet_h