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

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: Remove now unused segmentIsEmpty 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
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 CSSPropertyWebkitMaskImage, 291 CSSPropertyWebkitMaskImage,
292 CSSPropertyWebkitMaskOrigin, 292 CSSPropertyWebkitMaskOrigin,
293 CSSPropertyWebkitMaskPosition, 293 CSSPropertyWebkitMaskPosition,
294 CSSPropertyWebkitMaskRepeat, 294 CSSPropertyWebkitMaskRepeat,
295 CSSPropertyWebkitMaskSize, 295 CSSPropertyWebkitMaskSize,
296 CSSPropertyOrder, 296 CSSPropertyOrder,
297 CSSPropertyWebkitPerspective, 297 CSSPropertyWebkitPerspective,
298 CSSPropertyWebkitPerspectiveOrigin, 298 CSSPropertyWebkitPerspectiveOrigin,
299 CSSPropertyWebkitPrintColorAdjust, 299 CSSPropertyWebkitPrintColorAdjust,
300 CSSPropertyWebkitRtlOrdering, 300 CSSPropertyWebkitRtlOrdering,
301 CSSPropertyShapeInside,
302 CSSPropertyShapeOutside, 301 CSSPropertyShapeOutside,
303 CSSPropertyShapePadding, 302 CSSPropertyShapePadding,
304 CSSPropertyShapeImageThreshold, 303 CSSPropertyShapeImageThreshold,
305 CSSPropertyShapeMargin, 304 CSSPropertyShapeMargin,
306 CSSPropertyWebkitTapHighlightColor, 305 CSSPropertyWebkitTapHighlightColor,
307 CSSPropertyWebkitTextCombine, 306 CSSPropertyWebkitTextCombine,
308 CSSPropertyWebkitTextDecorationsInEffect, 307 CSSPropertyWebkitTextDecorationsInEffect,
309 CSSPropertyWebkitTextEmphasisColor, 308 CSSPropertyWebkitTextEmphasisColor,
310 CSSPropertyWebkitTextEmphasisPosition, 309 CSSPropertyWebkitTextEmphasisPosition,
311 CSSPropertyWebkitTextEmphasisStyle, 310 CSSPropertyWebkitTextEmphasisStyle,
(...skipping 2321 matching lines...) Expand 10 before | Expand all | Expand 10 after
2633 } 2632 }
2634 return cssValuePool().createIdentifierValue(CSSValueNone); 2633 return cssValuePool().createIdentifierValue(CSSValueNone);
2635 case CSSPropertyWebkitWrapFlow: 2634 case CSSPropertyWebkitWrapFlow:
2636 return cssValuePool().createValue(style->wrapFlow()); 2635 return cssValuePool().createValue(style->wrapFlow());
2637 case CSSPropertyShapeMargin: 2636 case CSSPropertyShapeMargin:
2638 return cssValuePool().createValue(style->shapeMargin()); 2637 return cssValuePool().createValue(style->shapeMargin());
2639 case CSSPropertyShapePadding: 2638 case CSSPropertyShapePadding:
2640 return cssValuePool().createValue(style->shapePadding()); 2639 return cssValuePool().createValue(style->shapePadding());
2641 case CSSPropertyShapeImageThreshold: 2640 case CSSPropertyShapeImageThreshold:
2642 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER); 2641 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER);
2643 case CSSPropertyShapeInside:
2644 return valueForShape(*style, style->shapeInside());
2645 case CSSPropertyShapeOutside: 2642 case CSSPropertyShapeOutside:
2646 return valueForShape(*style, style->shapeOutside()); 2643 return valueForShape(*style, style->shapeOutside());
2647 case CSSPropertyWebkitWrapThrough: 2644 case CSSPropertyWebkitWrapThrough:
2648 return cssValuePool().createValue(style->wrapThrough()); 2645 return cssValuePool().createValue(style->wrapThrough());
2649 case CSSPropertyWebkitFilter: 2646 case CSSPropertyWebkitFilter:
2650 return valueForFilter(renderer, *style); 2647 return valueForFilter(renderer, *style);
2651 case CSSPropertyMixBlendMode: 2648 case CSSPropertyMixBlendMode:
2652 return cssValuePool().createValue(style->blendMode()); 2649 return cssValuePool().createValue(style->blendMode());
2653 2650
2654 case CSSPropertyBackgroundBlendMode: { 2651 case CSSPropertyBackgroundBlendMode: {
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
3036 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3033 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3037 CSSPropertyB ackgroundClip }; 3034 CSSPropertyB ackgroundClip };
3038 3035
3039 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3036 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3040 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3037 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3041 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3038 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3042 return list.release(); 3039 return list.release();
3043 } 3040 }
3044 3041
3045 } // namespace WebCore 3042 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698