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

Side by Side Diff: Source/core/css/LayoutStyleCSSValueMapping.cpp

Issue 943463002: Initial implementation of font-size-adjust (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 1539 matching lines...) Expand 10 before | Expand all | Expand 10 after
1550 case CSSPropertyFontFamily: { 1550 case CSSPropertyFontFamily: {
1551 RefPtrWillBeRawPtr<CSSValueList> fontFamilyList = valueForFontFamily(sty le); 1551 RefPtrWillBeRawPtr<CSSValueList> fontFamilyList = valueForFontFamily(sty le);
1552 // If there's only a single family, return that as a CSSPrimitiveValue. 1552 // If there's only a single family, return that as a CSSPrimitiveValue.
1553 // NOTE: Gecko always returns this as a comma-separated CSSPrimitiveValu e string. 1553 // NOTE: Gecko always returns this as a comma-separated CSSPrimitiveValu e string.
1554 if (fontFamilyList->length() == 1) 1554 if (fontFamilyList->length() == 1)
1555 return fontFamilyList->item(0); 1555 return fontFamilyList->item(0);
1556 return fontFamilyList.release(); 1556 return fontFamilyList.release();
1557 } 1557 }
1558 case CSSPropertyFontSize: 1558 case CSSPropertyFontSize:
1559 return valueForFontSize(style); 1559 return valueForFontSize(style);
1560 case CSSPropertyFontSizeAdjust:
1561 return cssValuePool().createValue(style.fontDescription().sizeAdjust(), CSSPrimitiveValue::CSS_NUMBER);
rune 2015/02/19 20:28:27 Need to handle 'none'.
1560 case CSSPropertyFontStretch: 1562 case CSSPropertyFontStretch:
1561 return valueForFontStretch(style); 1563 return valueForFontStretch(style);
1562 case CSSPropertyFontStyle: 1564 case CSSPropertyFontStyle:
1563 return valueForFontStyle(style); 1565 return valueForFontStyle(style);
1564 case CSSPropertyFontVariant: 1566 case CSSPropertyFontVariant:
1565 return valueForFontVariant(style); 1567 return valueForFontVariant(style);
1566 case CSSPropertyFontWeight: 1568 case CSSPropertyFontWeight:
1567 return valueForFontWeight(style); 1569 return valueForFontWeight(style);
1568 case CSSPropertyWebkitFontFeatureSettings: { 1570 case CSSPropertyWebkitFontFeatureSettings: {
1569 const FontFeatureSettings* featureSettings = style.fontDescription().fea tureSettings(); 1571 const FontFeatureSettings* featureSettings = style.fontDescription().fea tureSettings();
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
2562 return nullptr; 2564 return nullptr;
2563 2565
2564 case CSSPropertyAll: 2566 case CSSPropertyAll:
2565 return nullptr; 2567 return nullptr;
2566 } 2568 }
2567 ASSERT_NOT_REACHED(); 2569 ASSERT_NOT_REACHED();
2568 return nullptr; 2570 return nullptr;
2569 } 2571 }
2570 2572
2571 } 2573 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698