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

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

Issue 226323002: [CSS Shapes] Remove outside-shape CSS value (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 return cssValuePool().createIdentifierValue(CSSValue900); 1431 return cssValuePool().createIdentifierValue(CSSValue900);
1432 } 1432 }
1433 ASSERT_NOT_REACHED(); 1433 ASSERT_NOT_REACHED();
1434 return cssValuePool().createIdentifierValue(CSSValueNormal); 1434 return cssValuePool().createIdentifierValue(CSSValueNormal);
1435 } 1435 }
1436 1436
1437 static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const RenderStyle& style, ShapeValue* shapeValue) 1437 static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const RenderStyle& style, ShapeValue* shapeValue)
1438 { 1438 {
1439 if (!shapeValue) 1439 if (!shapeValue)
1440 return cssValuePool().createIdentifierValue(CSSValueNone); 1440 return cssValuePool().createIdentifierValue(CSSValueNone);
1441 if (shapeValue->type() == ShapeValue::Outside)
1442 return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
1443 if (shapeValue->type() == ShapeValue::Box) 1441 if (shapeValue->type() == ShapeValue::Box)
1444 return cssValuePool().createValue(shapeValue->cssBox()); 1442 return cssValuePool().createValue(shapeValue->cssBox());
1445 if (shapeValue->type() == ShapeValue::Image) { 1443 if (shapeValue->type() == ShapeValue::Image) {
1446 if (shapeValue->image()) 1444 if (shapeValue->image())
1447 return shapeValue->image()->cssValue(); 1445 return shapeValue->image()->cssValue();
1448 return cssValuePool().createIdentifierValue(CSSValueNone); 1446 return cssValuePool().createIdentifierValue(CSSValueNone);
1449 } 1447 }
1450 1448
1451 ASSERT(shapeValue->type() == ShapeValue::Shape); 1449 ASSERT(shapeValue->type() == ShapeValue::Shape);
1452 1450
(...skipping 1594 matching lines...) Expand 10 before | Expand all | Expand 10 after
3047 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3045 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3048 CSSPropertyB ackgroundClip }; 3046 CSSPropertyB ackgroundClip };
3049 3047
3050 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3048 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3051 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3049 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3052 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3050 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3053 return list.release(); 3051 return list.release();
3054 } 3052 }
3055 3053
3056 } // namespace WebCore 3054 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('k') | Source/core/css/CSSValueKeywords.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698