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

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: Add some tests which need a rebaseline to TestExpectation Created 5 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
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 case CSSPropertyFontFamily: { 1548 case CSSPropertyFontFamily: {
1549 RefPtrWillBeRawPtr<CSSValueList> fontFamilyList = valueForFontFamily(sty le); 1549 RefPtrWillBeRawPtr<CSSValueList> fontFamilyList = valueForFontFamily(sty le);
1550 // If there's only a single family, return that as a CSSPrimitiveValue. 1550 // If there's only a single family, return that as a CSSPrimitiveValue.
1551 // NOTE: Gecko always returns this as a comma-separated CSSPrimitiveValu e string. 1551 // NOTE: Gecko always returns this as a comma-separated CSSPrimitiveValu e string.
1552 if (fontFamilyList->length() == 1) 1552 if (fontFamilyList->length() == 1)
1553 return fontFamilyList->item(0); 1553 return fontFamilyList->item(0);
1554 return fontFamilyList.release(); 1554 return fontFamilyList.release();
1555 } 1555 }
1556 case CSSPropertyFontSize: 1556 case CSSPropertyFontSize:
1557 return valueForFontSize(style); 1557 return valueForFontSize(style);
1558 case CSSPropertyFontSizeAdjust:
1559 if (style.hasFontSizeAdjust())
1560 return cssValuePool().createValue(style.fontSizeAdjust(), CSSPrimiti veValue::CSS_NUMBER);
1561 return cssValuePool().createIdentifierValue(CSSValueNone);
1558 case CSSPropertyFontStretch: 1562 case CSSPropertyFontStretch:
1559 return valueForFontStretch(style); 1563 return valueForFontStretch(style);
1560 case CSSPropertyFontStyle: 1564 case CSSPropertyFontStyle:
1561 return valueForFontStyle(style); 1565 return valueForFontStyle(style);
1562 case CSSPropertyFontVariant: 1566 case CSSPropertyFontVariant:
1563 return valueForFontVariant(style); 1567 return valueForFontVariant(style);
1564 case CSSPropertyFontWeight: 1568 case CSSPropertyFontWeight:
1565 return valueForFontWeight(style); 1569 return valueForFontWeight(style);
1566 case CSSPropertyWebkitFontFeatureSettings: { 1570 case CSSPropertyWebkitFontFeatureSettings: {
1567 const FontFeatureSettings* featureSettings = style.fontDescription().fea tureSettings(); 1571 const FontFeatureSettings* featureSettings = style.fontDescription().fea tureSettings();
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
2566 return zoomAdjustedPixelValueForLength(svgStyle.ry(), style); 2570 return zoomAdjustedPixelValueForLength(svgStyle.ry(), style);
2567 2571
2568 case CSSPropertyAll: 2572 case CSSPropertyAll:
2569 return nullptr; 2573 return nullptr;
2570 } 2574 }
2571 ASSERT_NOT_REACHED(); 2575 ASSERT_NOT_REACHED();
2572 return nullptr; 2576 return nullptr;
2573 } 2577 }
2574 2578
2575 } 2579 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698