CSS font-display: expose display property on FontFace

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

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "platform/FontFamilyNames.h"
 #include "platform/Histogram.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/SharedBuffer.h"
 #include "platform/WebTaskRunner.h"
 
 namespace blink {
 
 static const CSSValue* parseCSSValue(const Document* document,
                                      const String& value,
                                      CSSPropertyID propertyID) {
   CSSParserContext* context =
       CSSParserContext::create(*document, UseCounter::getFrom(document));
@@ skipping 94 matching lines @@
   setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle);
   setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight);
   setPropertyFromString(document, descriptors.stretch(),
                         CSSPropertyFontStretch);
   setPropertyFromString(document, descriptors.unicodeRange(),
                         CSSPropertyUnicodeRange);
   setPropertyFromString(document, descriptors.variant(),
                         CSSPropertyFontVariant);
   setPropertyFromString(document, descriptors.featureSettings(),
                         CSSPropertyFontFeatureSettings);
+  if (RuntimeEnabledFeatures::cssFontDisplayEnabled()) {
+    setPropertyFromString(document, descriptors.display(),
+                          CSSPropertyFontDisplay);
+  }
 }
 
 FontFace::~FontFace() {}
 
 String FontFace::style() const {
   return m_style ? m_style->cssText() : "normal";
 }
 
 String FontFace::weight() const {
   return m_weight ? m_weight->cssText() : "normal";
 }
 
 String FontFace::stretch() const {
   return m_stretch ? m_stretch->cssText() : "normal";
 }
 
 String FontFace::unicodeRange() const {
   return m_unicodeRange ? m_unicodeRange->cssText() : "U+0-10FFFF";
 }
 
 String FontFace::variant() const {
   return m_variant ? m_variant->cssText() : "normal";
 }
 
 String FontFace::featureSettings() const {
   return m_featureSettings ? m_featureSettings->cssText() : "normal";
 }
 
+String FontFace::display() const {
+  return m_display ? m_display->cssText() : "auto";
+}
+
 void FontFace::setStyle(ExecutionContext* context,
                         const String& s,
                         ExceptionState& exceptionState) {
   setPropertyFromString(toDocument(context), s, CSSPropertyFontStyle,
                         &exceptionState);
 }
 
 void FontFace::setWeight(ExecutionContext* context,
                          const String& s,
                          ExceptionState& exceptionState) {
@@ skipping 22 matching lines @@
                         &exceptionState);
 }
 
 void FontFace::setFeatureSettings(ExecutionContext* context,
                                   const String& s,
                                   ExceptionState& exceptionState) {
   setPropertyFromString(toDocument(context), s, CSSPropertyFontFeatureSettings,
                         &exceptionState);
 }
 
+void FontFace::setDisplay(ExecutionContext* context,
+                          const String& s,
+                          ExceptionState& exceptionState) {
+  setPropertyFromString(toDocument(context), s, CSSPropertyFontDisplay,
+                        &exceptionState);
+}
+
 void FontFace::setPropertyFromString(const Document* document,
                                      const String& s,
                                      CSSPropertyID propertyID,
                                      ExceptionState* exceptionState) {
   const CSSValue* value = parseCSSValue(document, s, propertyID);
   if (value && setPropertyValue(value, propertyID))
     return;
 
   String message = "Failed to set '" + s + "' as a property value.";
   if (exceptionState)
@@ skipping 399 matching lines @@
 
 bool FontFace::hadBlankText() const {
   return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const {
   return m_status == Loading && getExecutionContext();
 }
 
 }  // namespace blink