1 files changed, 12 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/core/css/font_face.h b/chromium/third_party/blink/renderer/core/css/font_face.h
index 05ec831413d..6669a2e5d40 100644
--- a/chromium/third_party/blink/renderer/core/css/font_face.h
+++ b/chromium/third_party/blink/renderer/core/css/font_face.h
@@ -36,6 +36,7 @@
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_property.h"
 #include "third_party/blink/renderer/core/css/css_value.h"
+#include "third_party/blink/renderer/core/css/font_display.h"
 #include "third_party/blink/renderer/core/css/parser/at_rule_descriptors.h"
 #include "third_party/blink/renderer/core/dom/context_lifecycle_observer.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
@@ -68,9 +69,13 @@ class CORE_EXPORT FontFace : public ScriptWrappable,
   static FontFace* Create(ExecutionContext*,
                           const AtomicString& family,
                           StringOrArrayBufferOrArrayBufferView&,
-                          const FontFaceDescriptors&);
+                          const FontFaceDescriptors*);
   static FontFace* Create(Document*, const StyleRuleFontFace*);
 
+  explicit FontFace(ExecutionContext*);
+  FontFace(ExecutionContext*,
+           const AtomicString& family,
+           const FontFaceDescriptors*);
   ~FontFace() override;
 
   const AtomicString& family() const { return family_; }
@@ -108,6 +113,9 @@ class CORE_EXPORT FontFace : public ScriptWrappable,
   FontSelectionCapabilities GetFontSelectionCapabilities() const;
   CSSFontFace* CssFontFace() { return css_font_face_.Get(); }
   size_t ApproximateBlankCharacterCount() const;
+  // Return FontDisplay using the default from @font-feature-values if not
+  // specified on this FontFace.
+  FontDisplay GetFontDisplayWithFallback() const;
 
   void Trace(blink::Visitor*) override;
 
@@ -130,20 +138,15 @@ class CORE_EXPORT FontFace : public ScriptWrappable,
   static FontFace* Create(ExecutionContext*,
                           const AtomicString& family,
                           DOMArrayBuffer* source,
-                          const FontFaceDescriptors&);
+                          const FontFaceDescriptors*);
   static FontFace* Create(ExecutionContext*,
                           const AtomicString& family,
                           DOMArrayBufferView*,
-                          const FontFaceDescriptors&);
+                          const FontFaceDescriptors*);
   static FontFace* Create(ExecutionContext*,
                           const AtomicString& family,
                           const String& source,
-                          const FontFaceDescriptors&);
-
-  explicit FontFace(ExecutionContext*);
-  FontFace(ExecutionContext*,
-           const AtomicString& family,
-           const FontFaceDescriptors&);
+                          const FontFaceDescriptors*);
 
   void InitCSSFontFace(ExecutionContext*, const CSSValue& src);
   void InitCSSFontFace(const unsigned char* data, size_t);