Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: third_party/WebKit/Source/core/css/FontFace.cpp

Issue 1778743003: Make <custom-ident> not insert quotes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix win_chromium_rel_ng Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/FontFace.cpp
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp
index 32f009aa06d556fa8223d34b37b8eff81a724594..2eab1566e3c55e7c3df3e148788cbf761647d72c 100644
--- a/third_party/WebKit/Source/core/css/FontFace.cpp
+++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -35,9 +35,9 @@
#include "bindings/core/v8/UnionTypesCore.h"
#include "core/CSSValueKeywords.h"
#include "core/css/BinaryDataFontFaceSource.h"
-#include "core/css/CSSCustomIdentValue.h"
#include "core/css/CSSFontFace.h"
#include "core/css/CSSFontFaceSrcValue.h"
+#include "core/css/CSSFontFamilyValue.h"
#include "core/css/CSSFontSelector.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSUnicodeRangeValue.h"
@@ -113,7 +113,7 @@ PassRefPtrWillBeRawPtr<FontFace> FontFace::create(Document* document, const Styl
// Obtain the font-family property and the src property. Both must be defined.
RefPtrWillBeRawPtr<CSSValue> family = properties.getPropertyCSSValue(CSSPropertyFontFamily);
- if (!family || (!family->isCustomIdentValue() && !family->isPrimitiveValue()))
+ if (!family || (!family->isFontFamilyValue() && !family->isPrimitiveValue()))
return nullptr;
RefPtrWillBeRawPtr<CSSValue> src = properties.getPropertyCSSValue(CSSPropertySrc);
if (!src || !src->isValueList())
@@ -278,8 +278,8 @@ bool FontFace::setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue> value, CSSPrope
bool FontFace::setFamilyValue(const CSSValue& familyValue)
{
AtomicString family;
- if (familyValue.isCustomIdentValue()) {
- family = AtomicString(toCSSCustomIdentValue(familyValue).value());
+ if (familyValue.isFontFamilyValue()) {
+ family = AtomicString(toCSSFontFamilyValue(familyValue).value());
} else if (toCSSPrimitiveValue(familyValue).isValueID()) {
// We need to use the raw text for all the generic family types, since @font-face is a way of actually
// defining what font to use for those types.

Powered by Google App Engine
This is Rietveld 408576698