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

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

Issue 252113004: [CSS Shapes] complex calc values for shape-margin return null for computed style (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix expected result Created 6 years, 7 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 | « LayoutTests/fast/shapes/parsing/parsing-shape-margin-expected.txt ('k') | no next file » | 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 2638 matching lines...) Expand 10 before | Expand all | Expand 10 after
2649 if (ClipPathOperation* operation = style->clipPath()) { 2649 if (ClipPathOperation* operation = style->clipPath()) {
2650 if (operation->type() == ClipPathOperation::SHAPE) 2650 if (operation->type() == ClipPathOperation::SHAPE)
2651 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape()); 2651 return valueForBasicShape(*style, toShapeClipPathOperation(o peration)->basicShape());
2652 if (operation->type() == ClipPathOperation::REFERENCE) 2652 if (operation->type() == ClipPathOperation::REFERENCE)
2653 return CSSPrimitiveValue::create(toReferenceClipPathOperatio n(operation)->url(), CSSPrimitiveValue::CSS_URI); 2653 return CSSPrimitiveValue::create(toReferenceClipPathOperatio n(operation)->url(), CSSPrimitiveValue::CSS_URI);
2654 } 2654 }
2655 return cssValuePool().createIdentifierValue(CSSValueNone); 2655 return cssValuePool().createIdentifierValue(CSSValueNone);
2656 case CSSPropertyWebkitWrapFlow: 2656 case CSSPropertyWebkitWrapFlow:
2657 return cssValuePool().createValue(style->wrapFlow()); 2657 return cssValuePool().createValue(style->wrapFlow());
2658 case CSSPropertyShapeMargin: 2658 case CSSPropertyShapeMargin:
2659 return cssValuePool().createValue(style->shapeMargin()); 2659 return cssValuePool().createValue(style->shapeMargin(), *style);
2660 case CSSPropertyShapeImageThreshold: 2660 case CSSPropertyShapeImageThreshold:
2661 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER); 2661 return cssValuePool().createValue(style->shapeImageThreshold(), CSSP rimitiveValue::CSS_NUMBER);
2662 case CSSPropertyShapeOutside: 2662 case CSSPropertyShapeOutside:
2663 return valueForShape(*style, style->shapeOutside()); 2663 return valueForShape(*style, style->shapeOutside());
2664 case CSSPropertyWebkitWrapThrough: 2664 case CSSPropertyWebkitWrapThrough:
2665 return cssValuePool().createValue(style->wrapThrough()); 2665 return cssValuePool().createValue(style->wrapThrough());
2666 case CSSPropertyWebkitFilter: 2666 case CSSPropertyWebkitFilter:
2667 return valueForFilter(renderer, *style); 2667 return valueForFilter(renderer, *style);
2668 case CSSPropertyMixBlendMode: 2668 case CSSPropertyMixBlendMode:
2669 return cssValuePool().createValue(style->blendMode()); 2669 return cssValuePool().createValue(style->blendMode());
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
3051 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3051 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3052 CSSPropertyB ackgroundClip }; 3052 CSSPropertyB ackgroundClip };
3053 3053
3054 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3054 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3055 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3055 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3056 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3056 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3057 return list.release(); 3057 return list.release();
3058 } 3058 }
3059 3059
3060 } // namespace WebCore 3060 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/shapes/parsing/parsing-shape-margin-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698