third_party/WebKit/Source/core/css/FontFace.cpp - Issue 1373433002: Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1373433002: Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_string

Patch Set: Created 5 years, 3 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

« third_party/WebKit/Source/core/css/CSSStringValues.cpp ('K') | « third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | third_party/WebKit/Source/core/css/RuleFeature.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fbad4985ef46367990bd483750ed16b4bf8277b0..1dcd6ed1cd72fb3e489428d0fa882245e74e88e9 100644

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

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

@@ -40,7 +40,7 @@

#include "core/css/CSSFontFaceSrcValue.h"

#include "core/css/CSSFontSelector.h"

#include "core/css/CSSPrimitiveValue.h"

-#include "core/css/CSSStringValueBase.h"

+#include "core/css/CSSStringValues.h"

#include "core/css/CSSUnicodeRangeValue.h"

#include "core/css/CSSValueList.h"

#include "core/css/FontFaceDescriptors.h"

@@ -275,7 +275,7 @@ bool FontFace::setFamilyValue(CSSValue* familyValue)

{

AtomicString family;

if (familyValue->isCustomIdentValue()) {

- family = AtomicString(toCSSCustomIdentValue(familyValue)->value());

+ family = AtomicString(toCSSCustomIdentValue(familyValue)->string());

} 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.