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

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

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix more (all?) tests Created 6 years, 9 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 CSSPropertyWebkitMaskImage, 293 CSSPropertyWebkitMaskImage,
294 CSSPropertyWebkitMaskOrigin, 294 CSSPropertyWebkitMaskOrigin,
295 CSSPropertyWebkitMaskPosition, 295 CSSPropertyWebkitMaskPosition,
296 CSSPropertyWebkitMaskRepeat, 296 CSSPropertyWebkitMaskRepeat,
297 CSSPropertyWebkitMaskSize, 297 CSSPropertyWebkitMaskSize,
298 CSSPropertyOrder, 298 CSSPropertyOrder,
299 CSSPropertyWebkitPerspective, 299 CSSPropertyWebkitPerspective,
300 CSSPropertyWebkitPerspectiveOrigin, 300 CSSPropertyWebkitPerspectiveOrigin,
301 CSSPropertyWebkitPrintColorAdjust, 301 CSSPropertyWebkitPrintColorAdjust,
302 CSSPropertyWebkitRtlOrdering, 302 CSSPropertyWebkitRtlOrdering,
303 CSSPropertyShapeInside,
304 CSSPropertyShapeOutside, 303 CSSPropertyShapeOutside,
305 CSSPropertyShapePadding, 304 CSSPropertyShapePadding,
306 CSSPropertyShapeImageThreshold, 305 CSSPropertyShapeImageThreshold,
307 CSSPropertyShapeMargin, 306 CSSPropertyShapeMargin,
308 CSSPropertyWebkitTapHighlightColor, 307 CSSPropertyWebkitTapHighlightColor,
309 CSSPropertyWebkitTextCombine, 308 CSSPropertyWebkitTextCombine,
310 CSSPropertyWebkitTextDecorationsInEffect, 309 CSSPropertyWebkitTextDecorationsInEffect,
311 CSSPropertyWebkitTextEmphasisColor, 310 CSSPropertyWebkitTextEmphasisColor,
312 CSSPropertyWebkitTextEmphasisPosition, 311 CSSPropertyWebkitTextEmphasisPosition,
313 CSSPropertyWebkitTextEmphasisStyle, 312 CSSPropertyWebkitTextEmphasisStyle,
(...skipping 2325 matching lines...) Expand 10 before | Expand all | Expand 10 after
2639 } 2638 }
2640 return cssValuePool().createIdentifierValue(CSSValueNone); 2639 return cssValuePool().createIdentifierValue(CSSValueNone);
2641 case CSSPropertyWebkitWrapFlow: 2640 case CSSPropertyWebkitWrapFlow:
2642 return cssValuePool().createValue(style->wrapFlow()); 2641 return cssValuePool().createValue(style->wrapFlow());
2643 case CSSPropertyShapeMargin: 2642 case CSSPropertyShapeMargin:
2644 return cssValuePool().createValue(style->shapeMargin()); 2643 return cssValuePool().createValue(style->shapeMargin());
2645 case CSSPropertyShapePadding: 2644 case CSSPropertyShapePadding:
2646 return cssValuePool().createValue(style->shapePadding()); 2645 return cssValuePool().createValue(style->shapePadding());
2647 case CSSPropertyShapeImageThreshold: 2646 case CSSPropertyShapeImageThreshold:
2648 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER); 2647 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER);
2649 case CSSPropertyShapeInside:
2650 return valueForShape(*style, style->shapeInside());
2651 case CSSPropertyShapeOutside: 2648 case CSSPropertyShapeOutside:
2652 return valueForShape(*style, style->shapeOutside()); 2649 return valueForShape(*style, style->shapeOutside());
2653 case CSSPropertyWebkitWrapThrough: 2650 case CSSPropertyWebkitWrapThrough:
2654 return cssValuePool().createValue(style->wrapThrough()); 2651 return cssValuePool().createValue(style->wrapThrough());
2655 case CSSPropertyWebkitFilter: 2652 case CSSPropertyWebkitFilter:
2656 return valueForFilter(renderer, *style); 2653 return valueForFilter(renderer, *style);
2657 case CSSPropertyMixBlendMode: 2654 case CSSPropertyMixBlendMode:
2658 return cssValuePool().createValue(style->blendMode()); 2655 return cssValuePool().createValue(style->blendMode());
2659 2656
2660 case CSSPropertyBackgroundBlendMode: { 2657 case CSSPropertyBackgroundBlendMode: {
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3039 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3043 CSSPropertyB ackgroundClip }; 3040 CSSPropertyB ackgroundClip };
3044 3041
3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3042 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3043 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3044 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3048 return list.release(); 3045 return list.release();
3049 } 3046 }
3050 3047
3051 } // namespace WebCore 3048 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698