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

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

Issue 1070313003: Remove page-break properties and captions (Closed) Base URL: git@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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 CSSPropertyBorderRightStyle, 100 CSSPropertyBorderRightStyle,
101 CSSPropertyBorderRightWidth, 101 CSSPropertyBorderRightWidth,
102 CSSPropertyBorderTopColor, 102 CSSPropertyBorderTopColor,
103 CSSPropertyBorderTopLeftRadius, 103 CSSPropertyBorderTopLeftRadius,
104 CSSPropertyBorderTopRightRadius, 104 CSSPropertyBorderTopRightRadius,
105 CSSPropertyBorderTopStyle, 105 CSSPropertyBorderTopStyle,
106 CSSPropertyBorderTopWidth, 106 CSSPropertyBorderTopWidth,
107 CSSPropertyBottom, 107 CSSPropertyBottom,
108 CSSPropertyBoxShadow, 108 CSSPropertyBoxShadow,
109 CSSPropertyBoxSizing, 109 CSSPropertyBoxSizing,
110 CSSPropertyCaptionSide,
111 CSSPropertyClip, 110 CSSPropertyClip,
112 CSSPropertyColor, 111 CSSPropertyColor,
113 CSSPropertyDirection, 112 CSSPropertyDirection,
114 CSSPropertyDisplay, 113 CSSPropertyDisplay,
115 CSSPropertyEmptyCells, 114 CSSPropertyEmptyCells,
116 CSSPropertyFontFamily, 115 CSSPropertyFontFamily,
117 CSSPropertyFontKerning, 116 CSSPropertyFontKerning,
118 CSSPropertyFontSize, 117 CSSPropertyFontSize,
119 CSSPropertyFontStretch, 118 CSSPropertyFontStretch,
120 CSSPropertyFontStyle, 119 CSSPropertyFontStyle,
(...skipping 20 matching lines...) Expand all
141 CSSPropertyOutlineOffset, 140 CSSPropertyOutlineOffset,
142 CSSPropertyOutlineStyle, 141 CSSPropertyOutlineStyle,
143 CSSPropertyOutlineWidth, 142 CSSPropertyOutlineWidth,
144 CSSPropertyOverflowWrap, 143 CSSPropertyOverflowWrap,
145 CSSPropertyOverflowX, 144 CSSPropertyOverflowX,
146 CSSPropertyOverflowY, 145 CSSPropertyOverflowY,
147 CSSPropertyPaddingBottom, 146 CSSPropertyPaddingBottom,
148 CSSPropertyPaddingLeft, 147 CSSPropertyPaddingLeft,
149 CSSPropertyPaddingRight, 148 CSSPropertyPaddingRight,
150 CSSPropertyPaddingTop, 149 CSSPropertyPaddingTop,
151 CSSPropertyPageBreakAfter,
152 CSSPropertyPageBreakBefore,
153 CSSPropertyPageBreakInside,
154 CSSPropertyPointerEvents, 150 CSSPropertyPointerEvents,
155 CSSPropertyPosition, 151 CSSPropertyPosition,
156 CSSPropertyRight, 152 CSSPropertyRight,
157 CSSPropertyTableLayout, 153 CSSPropertyTableLayout,
158 CSSPropertyTabSize, 154 CSSPropertyTabSize,
159 CSSPropertyTextAlign, 155 CSSPropertyTextAlign,
160 CSSPropertyTextAlignLast, 156 CSSPropertyTextAlignLast,
161 CSSPropertyTextDecoration, 157 CSSPropertyTextDecoration,
162 CSSPropertyTextDecorationLine, 158 CSSPropertyTextDecorationLine,
163 CSSPropertyTextDecorationStyle, 159 CSSPropertyTextDecorationStyle,
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 return pixelValue(style->borderLeftWidth(), *style); 1351 return pixelValue(style->borderLeftWidth(), *style);
1356 case CSSPropertyBottom: 1352 case CSSPropertyBottom:
1357 return valueForPositionOffset(*style, CSSPropertyBottom, renderer); 1353 return valueForPositionOffset(*style, CSSPropertyBottom, renderer);
1358 case CSSPropertyWebkitBoxDecorationBreak: 1354 case CSSPropertyWebkitBoxDecorationBreak:
1359 if (style->boxDecorationBreak() == DSLICE) 1355 if (style->boxDecorationBreak() == DSLICE)
1360 return cssValuePool().createIdentifierValue(CSSValueSlice); 1356 return cssValuePool().createIdentifierValue(CSSValueSlice);
1361 return cssValuePool().createIdentifierValue(CSSValueClone); 1357 return cssValuePool().createIdentifierValue(CSSValueClone);
1362 case CSSPropertyBoxShadow: 1358 case CSSPropertyBoxShadow:
1363 case CSSPropertyWebkitBoxShadow: 1359 case CSSPropertyWebkitBoxShadow:
1364 return valueForShadowList(style->boxShadow(), *style, true); 1360 return valueForShadowList(style->boxShadow(), *style, true);
1365 case CSSPropertyCaptionSide:
1366 return cssValuePool().createValue(style->captionSide());
1367 case CSSPropertyColor: 1361 case CSSPropertyColor:
1368 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> colorIncludingFallback(CSSPropertyColor).rgb() : style->color().rgb()); 1362 return cssValuePool().createColorValue(m_allowVisitedStyle ? style-> colorIncludingFallback(CSSPropertyColor).rgb() : style->color().rgb());
1369 case CSSPropertyTabSize: 1363 case CSSPropertyTabSize:
1370 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER); 1364 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER);
1371 case CSSPropertyDirection: 1365 case CSSPropertyDirection:
1372 return cssValuePool().createValue(style->direction()); 1366 return cssValuePool().createValue(style->direction());
1373 case CSSPropertyDisplay: 1367 case CSSPropertyDisplay:
1374 return cssValuePool().createValue(style->display()); 1368 return cssValuePool().createValue(style->display());
1375 case CSSPropertyEmptyCells: 1369 case CSSPropertyEmptyCells:
1376 return cssValuePool().createValue(style->emptyCells()); 1370 return cssValuePool().createValue(style->emptyCells());
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 if (paddingBottom.isFixed() || !renderer || !renderer->isBox()) 1567 if (paddingBottom.isFixed() || !renderer || !renderer->isBox())
1574 return pixelValueForLength(paddingBottom, *style); 1568 return pixelValueForLength(paddingBottom, *style);
1575 return pixelValue(toRenderBox(renderer)->computedCSSPaddingBottom(), *style); 1569 return pixelValue(toRenderBox(renderer)->computedCSSPaddingBottom(), *style);
1576 } 1570 }
1577 case CSSPropertyPaddingLeft: { 1571 case CSSPropertyPaddingLeft: {
1578 Length paddingLeft = style->paddingLeft(); 1572 Length paddingLeft = style->paddingLeft();
1579 if (paddingLeft.isFixed() || !renderer || !renderer->isBox()) 1573 if (paddingLeft.isFixed() || !renderer || !renderer->isBox())
1580 return pixelValueForLength(paddingLeft, *style); 1574 return pixelValueForLength(paddingLeft, *style);
1581 return pixelValue(toRenderBox(renderer)->computedCSSPaddingLeft(), * style); 1575 return pixelValue(toRenderBox(renderer)->computedCSSPaddingLeft(), * style);
1582 } 1576 }
1583 case CSSPropertyPageBreakAfter:
1584 return cssValuePool().createValue(style->pageBreakAfter());
1585 case CSSPropertyPageBreakBefore:
1586 return cssValuePool().createValue(style->pageBreakBefore());
1587 case CSSPropertyPageBreakInside: {
1588 EPageBreak pageBreak = style->pageBreakInside();
1589 ASSERT(pageBreak != PBALWAYS);
1590 if (pageBreak == PBALWAYS)
1591 return nullptr;
1592 return cssValuePool().createValue(style->pageBreakInside());
1593 }
1594 case CSSPropertyPosition: 1577 case CSSPropertyPosition:
1595 return cssValuePool().createValue(style->position()); 1578 return cssValuePool().createValue(style->position());
1596 case CSSPropertyRight: 1579 case CSSPropertyRight:
1597 return valueForPositionOffset(*style, CSSPropertyRight, renderer); 1580 return valueForPositionOffset(*style, CSSPropertyRight, renderer);
1598 case CSSPropertyTableLayout: 1581 case CSSPropertyTableLayout:
1599 return cssValuePool().createValue(style->tableLayout()); 1582 return cssValuePool().createValue(style->tableLayout());
1600 case CSSPropertyTextAlign: 1583 case CSSPropertyTextAlign:
1601 return cssValuePool().createValue(style->textAlign()); 1584 return cssValuePool().createValue(style->textAlign());
1602 case CSSPropertyTextAlignLast: 1585 case CSSPropertyTextAlignLast:
1603 return cssValuePool().createValue(style->textAlignLast()); 1586 return cssValuePool().createValue(style->textAlignLast());
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
2267 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2250 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2268 CSSPropertyB ackgroundClip }; 2251 CSSPropertyB ackgroundClip };
2269 2252
2270 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2253 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2271 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 2254 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
2272 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 2255 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
2273 return list.release(); 2256 return list.release();
2274 } 2257 }
2275 2258
2276 } // namespace blink 2259 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/animation/DeferredLegacyStyleInterpolationTest.cpp ('k') | sky/engine/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698