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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 return CSSValueSansSerif; 482 return CSSValueSansSerif;
483 if (family == FontFamilyNames::webkit_serif) 483 if (family == FontFamilyNames::webkit_serif)
484 return CSSValueSerif; 484 return CSSValueSerif;
485 return CSSValueInvalid; 485 return CSSValueInvalid;
486 } 486 }
487 487
488 static PassRefPtrWillBeRawPtr<CSSValue> valueForFamily(const AtomicString& famil y) 488 static PassRefPtrWillBeRawPtr<CSSValue> valueForFamily(const AtomicString& famil y)
489 { 489 {
490 if (CSSValueID familyIdentifier = identifierForFamily(family)) 490 if (CSSValueID familyIdentifier = identifierForFamily(family))
491 return cssValuePool().createIdentifierValue(familyIdentifier); 491 return cssValuePool().createIdentifierValue(familyIdentifier);
492 return CSSCustomIdentValue::create(family.string()); 492 return cssValuePool().createFontFamilyValue(family.string());
493 } 493 }
494 494
495 static PassRefPtrWillBeRawPtr<CSSValueList> valueForFontFamily(const ComputedSty le& style) 495 static PassRefPtrWillBeRawPtr<CSSValueList> valueForFontFamily(const ComputedSty le& style)
496 { 496 {
497 const FontFamily& firstFamily = style.getFontDescription().family(); 497 const FontFamily& firstFamily = style.getFontDescription().family();
498 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ; 498 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ;
499 for (const FontFamily* family = &firstFamily; family; family = family->next( )) 499 for (const FontFamily* family = &firstFamily; family; family = family->next( ))
500 list->append(valueForFamily(family->family())); 500 list->append(valueForFamily(family->family()));
501 return list.release(); 501 return list.release();
502 } 502 }
(...skipping 2251 matching lines...) Expand 10 before | Expand all | Expand 10 after
2754 case CSSPropertyAll: 2754 case CSSPropertyAll:
2755 return nullptr; 2755 return nullptr;
2756 default: 2756 default:
2757 break; 2757 break;
2758 } 2758 }
2759 ASSERT_NOT_REACHED(); 2759 ASSERT_NOT_REACHED();
2760 return nullptr; 2760 return nullptr;
2761 } 2761 }
2762 2762
2763 } // namespace blink 2763 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValuePool.cpp ('k') | third_party/WebKit/Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698