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

Side by Side Diff: sky/engine/core/css/CSSComputedStyleDeclaration.cpp

Issue 1068073002: drop 'orphan' property (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix ojan's comments Created 5 years, 8 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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 CSSPropertyMarginLeft, 134 CSSPropertyMarginLeft,
135 CSSPropertyMarginRight, 135 CSSPropertyMarginRight,
136 CSSPropertyMarginTop, 136 CSSPropertyMarginTop,
137 CSSPropertyMaxHeight, 137 CSSPropertyMaxHeight,
138 CSSPropertyMaxWidth, 138 CSSPropertyMaxWidth,
139 CSSPropertyMinHeight, 139 CSSPropertyMinHeight,
140 CSSPropertyMinWidth, 140 CSSPropertyMinWidth,
141 CSSPropertyObjectFit, 141 CSSPropertyObjectFit,
142 CSSPropertyObjectPosition, 142 CSSPropertyObjectPosition,
143 CSSPropertyOpacity, 143 CSSPropertyOpacity,
144 CSSPropertyOrphans,
145 CSSPropertyOutlineColor, 144 CSSPropertyOutlineColor,
146 CSSPropertyOutlineOffset, 145 CSSPropertyOutlineOffset,
147 CSSPropertyOutlineStyle, 146 CSSPropertyOutlineStyle,
148 CSSPropertyOutlineWidth, 147 CSSPropertyOutlineWidth,
149 CSSPropertyOverflowWrap, 148 CSSPropertyOverflowWrap,
150 CSSPropertyOverflowX, 149 CSSPropertyOverflowX,
151 CSSPropertyOverflowY, 150 CSSPropertyOverflowY,
152 CSSPropertyPaddingBottom, 151 CSSPropertyPaddingBottom,
153 CSSPropertyPaddingLeft, 152 CSSPropertyPaddingLeft,
154 CSSPropertyPaddingRight, 153 CSSPropertyPaddingRight,
(...skipping 1406 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 case CSSPropertyObjectFit: 1560 case CSSPropertyObjectFit:
1562 return cssValuePool().createValue(style->objectFit()); 1561 return cssValuePool().createValue(style->objectFit());
1563 case CSSPropertyObjectPosition: 1562 case CSSPropertyObjectPosition:
1564 return cssValuePool().createValue( 1563 return cssValuePool().createValue(
1565 Pair::create( 1564 Pair::create(
1566 pixelValueForLength(style->objectPosition().x(), *style), 1565 pixelValueForLength(style->objectPosition().x(), *style),
1567 pixelValueForLength(style->objectPosition().y(), *style), 1566 pixelValueForLength(style->objectPosition().y(), *style),
1568 Pair::KeepIdenticalValues)); 1567 Pair::KeepIdenticalValues));
1569 case CSSPropertyOpacity: 1568 case CSSPropertyOpacity:
1570 return cssValuePool().createValue(style->opacity(), CSSPrimitiveValu e::CSS_NUMBER); 1569 return cssValuePool().createValue(style->opacity(), CSSPrimitiveValu e::CSS_NUMBER);
1571 case CSSPropertyOrphans:
1572 if (style->hasAutoOrphans())
1573 return cssValuePool().createIdentifierValue(CSSValueAuto);
1574 return cssValuePool().createValue(style->orphans(), CSSPrimitiveValu e::CSS_NUMBER);
1575 case CSSPropertyOutlineColor: 1570 case CSSPropertyOutlineColor:
1576 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> colorIncludingFallback(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColo r(*style, style->outlineColor()); 1571 return m_allowVisitedStyle ? cssValuePool().createColorValue(style-> colorIncludingFallback(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColo r(*style, style->outlineColor());
1577 case CSSPropertyOutlineOffset: 1572 case CSSPropertyOutlineOffset:
1578 return pixelValue(style->outlineOffset(), *style); 1573 return pixelValue(style->outlineOffset(), *style);
1579 case CSSPropertyOutlineStyle: 1574 case CSSPropertyOutlineStyle:
1580 if (style->outlineStyleIsAuto()) 1575 if (style->outlineStyleIsAuto())
1581 return cssValuePool().createIdentifierValue(CSSValueAuto); 1576 return cssValuePool().createIdentifierValue(CSSValueAuto);
1582 return cssValuePool().createValue(style->outlineStyle()); 1577 return cssValuePool().createValue(style->outlineStyle());
1583 case CSSPropertyOutlineWidth: 1578 case CSSPropertyOutlineWidth:
1584 return pixelValue(style->outlineWidth(), *style); 1579 return pixelValue(style->outlineWidth(), *style);
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
2309 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2304 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2310 CSSPropertyB ackgroundClip }; 2305 CSSPropertyB ackgroundClip };
2311 2306
2312 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2307 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2313 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 2308 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
2314 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 2309 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
2315 return list.release(); 2310 return list.release();
2316 } 2311 }
2317 2312
2318 } // namespace blink 2313 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/animation/css/CSSPropertyEquality.cpp ('k') | sky/engine/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698