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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 1915343003: Add CSS hyphens property behind the test flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split histograms.xml to a separate CL Created 4 years, 7 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 1800 matching lines...) Expand 10 before | Expand all | Expand 10 after
1811 // the "height" property does not apply for non-atomic inline elemen ts. 1811 // the "height" property does not apply for non-atomic inline elemen ts.
1812 if (!layoutObject->isAtomicInlineLevel() && layoutObject->isInline() ) 1812 if (!layoutObject->isAtomicInlineLevel() && layoutObject->isInline() )
1813 return cssValuePool().createIdentifierValue(CSSValueAuto); 1813 return cssValuePool().createIdentifierValue(CSSValueAuto);
1814 return zoomAdjustedPixelValue(sizingBox(layoutObject).height(), styl e); 1814 return zoomAdjustedPixelValue(sizingBox(layoutObject).height(), styl e);
1815 } 1815 }
1816 return zoomAdjustedPixelValueForLength(style.height(), style); 1816 return zoomAdjustedPixelValueForLength(style.height(), style);
1817 case CSSPropertyWebkitHighlight: 1817 case CSSPropertyWebkitHighlight:
1818 if (style.highlight() == nullAtom) 1818 if (style.highlight() == nullAtom)
1819 return cssValuePool().createIdentifierValue(CSSValueNone); 1819 return cssValuePool().createIdentifierValue(CSSValueNone);
1820 return CSSStringValue::create(style.highlight()); 1820 return CSSStringValue::create(style.highlight());
1821 case CSSPropertyHyphens:
1822 return cssValuePool().createValue(style.getHyphens());
1821 case CSSPropertyWebkitHyphenateCharacter: 1823 case CSSPropertyWebkitHyphenateCharacter:
1822 if (style.hyphenationString().isNull()) 1824 if (style.hyphenationString().isNull())
1823 return cssValuePool().createIdentifierValue(CSSValueAuto); 1825 return cssValuePool().createIdentifierValue(CSSValueAuto);
1824 return CSSStringValue::create(style.hyphenationString()); 1826 return CSSStringValue::create(style.hyphenationString());
1825 case CSSPropertyImageRendering: 1827 case CSSPropertyImageRendering:
1826 return CSSPrimitiveValue::create(style.imageRendering()); 1828 return CSSPrimitiveValue::create(style.imageRendering());
1827 case CSSPropertyImageOrientation: 1829 case CSSPropertyImageOrientation:
1828 if (style.respectImageOrientation() == RespectImageOrientation) 1830 if (style.respectImageOrientation() == RespectImageOrientation)
1829 return cssValuePool().createIdentifierValue(CSSValueFromImage); 1831 return cssValuePool().createIdentifierValue(CSSValueFromImage);
1830 return cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Degree s); 1832 return cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Degree s);
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
2835 case CSSPropertyAll: 2837 case CSSPropertyAll:
2836 return nullptr; 2838 return nullptr;
2837 default: 2839 default:
2838 break; 2840 break;
2839 } 2841 }
2840 ASSERT_NOT_REACHED(); 2842 ASSERT_NOT_REACHED();
2841 return nullptr; 2843 return nullptr;
2842 } 2844 }
2843 2845
2844 } // namespace blink 2846 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698