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

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

Issue 1078943002: remove 'widows' property because paged media support is gone so this does nothing now (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 CSSPropertyTop, 171 CSSPropertyTop,
172 CSSPropertyTouchAction, 172 CSSPropertyTouchAction,
173 CSSPropertyTouchActionDelay, 173 CSSPropertyTouchActionDelay,
174 CSSPropertyTransitionDelay, 174 CSSPropertyTransitionDelay,
175 CSSPropertyTransitionDuration, 175 CSSPropertyTransitionDuration,
176 CSSPropertyTransitionProperty, 176 CSSPropertyTransitionProperty,
177 CSSPropertyTransitionTimingFunction, 177 CSSPropertyTransitionTimingFunction,
178 CSSPropertyUnicodeBidi, 178 CSSPropertyUnicodeBidi,
179 CSSPropertyVerticalAlign, 179 CSSPropertyVerticalAlign,
180 CSSPropertyWhiteSpace, 180 CSSPropertyWhiteSpace,
181 CSSPropertyWidows,
182 CSSPropertyWidth, 181 CSSPropertyWidth,
183 CSSPropertyWillChange, 182 CSSPropertyWillChange,
184 CSSPropertyWordBreak, 183 CSSPropertyWordBreak,
185 CSSPropertyWordSpacing, 184 CSSPropertyWordSpacing,
186 CSSPropertyWordWrap, 185 CSSPropertyWordWrap,
187 CSSPropertyZIndex, 186 CSSPropertyZIndex,
188 187
189 CSSPropertyBackfaceVisibility, 188 CSSPropertyBackfaceVisibility,
190 CSSPropertyWebkitBackfaceVisibility, 189 CSSPropertyWebkitBackfaceVisibility,
191 CSSPropertyWebkitBackgroundClip, 190 CSSPropertyWebkitBackgroundClip,
(...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after
1700 return cssValuePool().createIdentifierValue(CSSValueBottom); 1699 return cssValuePool().createIdentifierValue(CSSValueBottom);
1701 case BASELINE_MIDDLE: 1700 case BASELINE_MIDDLE:
1702 return cssValuePool().createIdentifierValue(CSSValueWebkitBa selineMiddle); 1701 return cssValuePool().createIdentifierValue(CSSValueWebkitBa selineMiddle);
1703 case LENGTH: 1702 case LENGTH:
1704 return pixelValueForLength(style->verticalAlignLength(), *st yle); 1703 return pixelValueForLength(style->verticalAlignLength(), *st yle);
1705 } 1704 }
1706 ASSERT_NOT_REACHED(); 1705 ASSERT_NOT_REACHED();
1707 return nullptr; 1706 return nullptr;
1708 case CSSPropertyWhiteSpace: 1707 case CSSPropertyWhiteSpace:
1709 return cssValuePool().createValue(style->whiteSpace()); 1708 return cssValuePool().createValue(style->whiteSpace());
1710 case CSSPropertyWidows:
1711 if (style->hasAutoWidows())
1712 return cssValuePool().createIdentifierValue(CSSValueAuto);
1713 return cssValuePool().createValue(style->widows(), CSSPrimitiveValue ::CSS_NUMBER);
1714 case CSSPropertyWidth: 1709 case CSSPropertyWidth:
1715 if (renderer) { 1710 if (renderer) {
1716 // According to http://www.w3.org/TR/CSS2/visudet.html#the-width -property, 1711 // According to http://www.w3.org/TR/CSS2/visudet.html#the-width -property,
1717 // the "width" property does not apply for non-replaced inline e lements. 1712 // the "width" property does not apply for non-replaced inline e lements.
1718 if (!renderer->isReplaced() && renderer->isInline()) 1713 if (!renderer->isReplaced() && renderer->isInline())
1719 return cssValuePool().createIdentifierValue(CSSValueAuto); 1714 return cssValuePool().createIdentifierValue(CSSValueAuto);
1720 return pixelValue(sizingBox(renderer).width(), *style); 1715 return pixelValue(sizingBox(renderer).width(), *style);
1721 } 1716 }
1722 return pixelValueForLength(style->width(), *style); 1717 return pixelValueForLength(style->width(), *style);
1723 case CSSPropertyWillChange: 1718 case CSSPropertyWillChange:
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
2268 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2263 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2269 CSSPropertyB ackgroundClip }; 2264 CSSPropertyB ackgroundClip };
2270 2265
2271 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2266 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2272 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 2267 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
2273 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 2268 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
2274 return list.release(); 2269 return list.release();
2275 } 2270 }
2276 2271
2277 } // namespace blink 2272 } // 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