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

third_party/WebKit/Source/core/dom/Document.h

Index: third_party/WebKit/Source/core/dom/Document.h
diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
index 2199e569be68ce6fe2e41e9e3397b15ae9f4a548..f0e7da0a6822dae21f0c518f971533beebbbefe0 100644
--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
@@ -34,6 +34,7 @@
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/TraceWrapperMember.h"
 #include "core/CoreExport.h"
+#include "core/css/FontFaceCache.h"
 #include "core/dom/ContainerNode.h"
 #include "core/dom/DocumentEncodingData.h"
 #include "core/dom/DocumentInit.h"
@@ -1256,6 +1257,8 @@ class CORE_EXPORT Document : public ContainerNode,
     return m_clientHintsPreferences;
   }
 
+  FontFaceCache* fontFaceCache() { return &m_fontFaceCache; }
+  void incrementFontFaceVersion() { m_fontFaceCache.incrementVersion(); }
   CanvasFontCache* canvasFontCache();
 
   // Used by unit tests so that all parsing will be main thread for
@@ -1652,6 +1655,7 @@ class CORE_EXPORT Document : public ContainerNode,
 
   ClientHintsPreferences m_clientHintsPreferences;
 
+  FontFaceCache m_fontFaceCache;

[sashab, 2017/01/11 04:20:35]

What is FontFaceCache? Should this be a Member<>

[meade_UTC10, 2017/01/11 05:15:49]

FontFaceCache is essentially a map of StyleRuleFontFace to FontFace, plus some
metadata. It's tagged as DISALLOW_NEW, and it isn't oilpanned, so it can't be a
Member<>.

   Member<CanvasFontCache> m_canvasFontCache;
 
   Member<IntersectionObserverController> m_intersectionObserverController;