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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 16 matching lines @@
  *
  */
 
 #ifndef Document_h
 #define Document_h
 
 #include "bindings/core/v8/ExceptionState.h"
 #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"
 #include "core/dom/DocumentLifecycle.h"
 #include "core/dom/DocumentTiming.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/MutationObserver.h"
 #include "core/dom/StyleReattachData.h"
 #include "core/dom/SynchronousMutationNotifier.h"
 #include "core/dom/SynchronousMutationObserver.h"
@@ skipping 1202 matching lines @@
   bool isSecureContext(
       String& errorMessage,
       const SecureContextCheck = StandardSecureContextCheck) const override;
   bool isSecureContext(
       const SecureContextCheck = StandardSecureContextCheck) const override;
 
   ClientHintsPreferences& clientHintsPreferences() {
     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
   // controlling parsing and chunking precisely.
   static void setThreadedParsingEnabledForTesting(bool);
   static bool threadedParsingEnabledForTesting();
 
   void incrementNodeCount() { m_nodeCount++; }
   void decrementNodeCount() {
     DCHECK_GT(m_nodeCount, 0);
@@ skipping 376 matching lines @@
   DOMTimerCoordinator m_timers;
 
   bool m_hasViewportUnits;
 
   ParserSynchronizationPolicy m_parserSyncPolicy;
 
   HostsUsingFeatures::Value m_hostsUsingFeaturesValue;
 
   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;
   Member<ResizeObserverController> m_resizeObserverController;
 
   int m_nodeCount;
 
   bool m_mayContainV0Shadow = false;
 
   Member<SnapCoordinator> m_snapCoordinator;
@@ skipping 54 matching lines @@
 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
 
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 CORE_EXPORT void showLiveDocumentInstances();
 #endif
 
 #endif  // Document_h