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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 2804623002: [css-align] Implement place-self alignment shorthand (Closed)
Patch Set: Added a regression test. Created 3 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. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2349 matching lines...) Expand 10 before | Expand all | Expand 10 after
2360 layoutObject, styledNode, 2360 layoutObject, styledNode,
2361 allowVisitedStyle); 2361 allowVisitedStyle);
2362 } 2362 }
2363 case CSSPropertyPlaceItems: { 2363 case CSSPropertyPlaceItems: {
2364 // TODO (jfernandez): The spec states that we should return the specified 2364 // TODO (jfernandez): The spec states that we should return the specified
2365 // value. 2365 // value.
2366 return valuesForShorthandProperty(placeItemsShorthand(), style, 2366 return valuesForShorthandProperty(placeItemsShorthand(), style,
2367 layoutObject, styledNode, 2367 layoutObject, styledNode,
2368 allowVisitedStyle); 2368 allowVisitedStyle);
2369 } 2369 }
2370 case CSSPropertyPlaceSelf: {
2371 // TODO (jfernandez): The spec states that we should return the specified
2372 // value.
2373 return valuesForShorthandProperty(placeSelfShorthand(), style,
2374 layoutObject, styledNode,
2375 allowVisitedStyle);
2376 }
2370 case CSSPropertyAlignContent: 2377 case CSSPropertyAlignContent:
2371 return valueForContentPositionAndDistributionWithOverflowAlignment( 2378 return valueForContentPositionAndDistributionWithOverflowAlignment(
2372 style.alignContent(), CSSValueStretch); 2379 style.alignContent(), CSSValueStretch);
2373 case CSSPropertyAlignItems: 2380 case CSSPropertyAlignItems:
2374 return valueForItemPositionWithOverflowAlignment(style.alignItems()); 2381 return valueForItemPositionWithOverflowAlignment(style.alignItems());
2375 case CSSPropertyAlignSelf: 2382 case CSSPropertyAlignSelf:
2376 return valueForItemPositionWithOverflowAlignment(style.alignSelf()); 2383 return valueForItemPositionWithOverflowAlignment(style.alignSelf());
2377 case CSSPropertyFlex: 2384 case CSSPropertyFlex:
2378 return valuesForShorthandProperty(flexShorthand(), style, layoutObject, 2385 return valuesForShorthandProperty(flexShorthand(), style, layoutObject,
2379 styledNode, allowVisitedStyle); 2386 styledNode, allowVisitedStyle);
(...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after
3704 case CSSPropertyAll: 3711 case CSSPropertyAll:
3705 return nullptr; 3712 return nullptr;
3706 default: 3713 default:
3707 break; 3714 break;
3708 } 3715 }
3709 NOTREACHED(); 3716 NOTREACHED();
3710 return nullptr; 3717 return nullptr;
3711 } 3718 }
3712 3719
3713 } // namespace blink 3720 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.json5 ('k') | third_party/WebKit/Source/core/css/StylePropertySerializer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698