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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 216793009: Remove shape-padding (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove m_padding Created 6 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 CSSPropertyWebkitMaskRepeat, 296 CSSPropertyWebkitMaskRepeat,
297 CSSPropertyWebkitMaskSize, 297 CSSPropertyWebkitMaskSize,
298 CSSPropertyOrder, 298 CSSPropertyOrder,
299 CSSPropertyPerspective, 299 CSSPropertyPerspective,
300 CSSPropertyWebkitPerspective, 300 CSSPropertyWebkitPerspective,
301 CSSPropertyPerspectiveOrigin, 301 CSSPropertyPerspectiveOrigin,
302 CSSPropertyWebkitPerspectiveOrigin, 302 CSSPropertyWebkitPerspectiveOrigin,
303 CSSPropertyWebkitPrintColorAdjust, 303 CSSPropertyWebkitPrintColorAdjust,
304 CSSPropertyWebkitRtlOrdering, 304 CSSPropertyWebkitRtlOrdering,
305 CSSPropertyShapeOutside, 305 CSSPropertyShapeOutside,
306 CSSPropertyShapePadding,
307 CSSPropertyShapeImageThreshold, 306 CSSPropertyShapeImageThreshold,
308 CSSPropertyShapeMargin, 307 CSSPropertyShapeMargin,
309 CSSPropertyWebkitTapHighlightColor, 308 CSSPropertyWebkitTapHighlightColor,
310 CSSPropertyWebkitTextCombine, 309 CSSPropertyWebkitTextCombine,
311 CSSPropertyWebkitTextDecorationsInEffect, 310 CSSPropertyWebkitTextDecorationsInEffect,
312 CSSPropertyWebkitTextEmphasisColor, 311 CSSPropertyWebkitTextEmphasisColor,
313 CSSPropertyWebkitTextEmphasisPosition, 312 CSSPropertyWebkitTextEmphasisPosition,
314 CSSPropertyWebkitTextEmphasisStyle, 313 CSSPropertyWebkitTextEmphasisStyle,
315 CSSPropertyWebkitTextFillColor, 314 CSSPropertyWebkitTextFillColor,
316 CSSPropertyWebkitTextOrientation, 315 CSSPropertyWebkitTextOrientation,
(...skipping 2328 matching lines...) Expand 10 before | Expand all | Expand 10 after
2645 if (operation->type() == ClipPathOperation::SHAPE) 2644 if (operation->type() == ClipPathOperation::SHAPE)
2646 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape()); 2645 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape());
2647 if (operation->type() == ClipPathOperation::REFERENCE) 2646 if (operation->type() == ClipPathOperation::REFERENCE)
2648 return CSSPrimitiveValue::create(toReferenceClipPathOperatio n(operation)->url(), CSSPrimitiveValue::CSS_URI); 2647 return CSSPrimitiveValue::create(toReferenceClipPathOperatio n(operation)->url(), CSSPrimitiveValue::CSS_URI);
2649 } 2648 }
2650 return cssValuePool().createIdentifierValue(CSSValueNone); 2649 return cssValuePool().createIdentifierValue(CSSValueNone);
2651 case CSSPropertyWebkitWrapFlow: 2650 case CSSPropertyWebkitWrapFlow:
2652 return cssValuePool().createValue(style->wrapFlow()); 2651 return cssValuePool().createValue(style->wrapFlow());
2653 case CSSPropertyShapeMargin: 2652 case CSSPropertyShapeMargin:
2654 return cssValuePool().createValue(style->shapeMargin()); 2653 return cssValuePool().createValue(style->shapeMargin());
2655 case CSSPropertyShapePadding:
2656 return cssValuePool().createValue(style->shapePadding());
2657 case CSSPropertyShapeImageThreshold: 2654 case CSSPropertyShapeImageThreshold:
2658 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER); 2655 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER);
2659 case CSSPropertyShapeOutside: 2656 case CSSPropertyShapeOutside:
2660 return valueForShape(*style, style->shapeOutside()); 2657 return valueForShape(*style, style->shapeOutside());
2661 case CSSPropertyWebkitWrapThrough: 2658 case CSSPropertyWebkitWrapThrough:
2662 return cssValuePool().createValue(style->wrapThrough()); 2659 return cssValuePool().createValue(style->wrapThrough());
2663 case CSSPropertyWebkitFilter: 2660 case CSSPropertyWebkitFilter:
2664 return valueForFilter(renderer, *style); 2661 return valueForFilter(renderer, *style);
2665 case CSSPropertyMixBlendMode: 2662 case CSSPropertyMixBlendMode:
2666 return cssValuePool().createValue(style->blendMode()); 2663 return cssValuePool().createValue(style->blendMode());
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
3050 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3047 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3051 CSSPropertyB ackgroundClip }; 3048 CSSPropertyB ackgroundClip };
3052 3049
3053 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3050 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3054 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3051 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3055 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3052 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3056 return list.release(); 3053 return list.release();
3057 } 3054 }
3058 3055
3059 } // namespace WebCore 3056 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/webexposed/nonstable-css-properties-expected.txt ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698