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

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

Issue 2662573002: [css-align] Implement place-content alignment shorthand (Closed)
Patch Set: Created 3 years, 10 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 2268 matching lines...) Expand 10 before | Expand all | Expand 10 after
2279 return list; 2279 return list;
2280 } 2280 }
2281 return value; 2281 return value;
2282 } 2282 }
2283 case CSSPropertyDirection: 2283 case CSSPropertyDirection:
2284 return CSSIdentifierValue::create(style.direction()); 2284 return CSSIdentifierValue::create(style.direction());
2285 case CSSPropertyDisplay: 2285 case CSSPropertyDisplay:
2286 return CSSIdentifierValue::create(style.display()); 2286 return CSSIdentifierValue::create(style.display());
2287 case CSSPropertyEmptyCells: 2287 case CSSPropertyEmptyCells:
2288 return CSSIdentifierValue::create(style.emptyCells()); 2288 return CSSIdentifierValue::create(style.emptyCells());
2289 case CSSPropertyPlaceContent: {
2290 // TODO (jfernandez): The spec states that we should return the specific
2291 // value.
svillar 2017/02/02 09:11:19 You mean "specified" value? Also in the tests you
jfernandez 2017/02/06 15:17:17 Yes.
2292 return valuesForShorthandProperty(placeContentShorthand(), style,
2293 layoutObject, styledNode,
2294 allowVisitedStyle);
2295 }
2289 case CSSPropertyAlignContent: 2296 case CSSPropertyAlignContent:
2290 return valueForContentPositionAndDistributionWithOverflowAlignment( 2297 return valueForContentPositionAndDistributionWithOverflowAlignment(
2291 style.alignContent(), CSSValueStretch); 2298 style.alignContent(), CSSValueStretch);
2292 case CSSPropertyAlignItems: 2299 case CSSPropertyAlignItems:
2293 return valueForItemPositionWithOverflowAlignment(style.alignItems()); 2300 return valueForItemPositionWithOverflowAlignment(style.alignItems());
2294 case CSSPropertyAlignSelf: 2301 case CSSPropertyAlignSelf:
2295 return valueForItemPositionWithOverflowAlignment(style.alignSelf()); 2302 return valueForItemPositionWithOverflowAlignment(style.alignSelf());
2296 case CSSPropertyFlex: 2303 case CSSPropertyFlex:
2297 return valuesForShorthandProperty(flexShorthand(), style, layoutObject, 2304 return valuesForShorthandProperty(flexShorthand(), style, layoutObject,
2298 styledNode, allowVisitedStyle); 2305 styledNode, allowVisitedStyle);
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
3642 case CSSPropertyAll: 3649 case CSSPropertyAll:
3643 return nullptr; 3650 return nullptr;
3644 default: 3651 default:
3645 break; 3652 break;
3646 } 3653 }
3647 ASSERT_NOT_REACHED(); 3654 ASSERT_NOT_REACHED();
3648 return nullptr; 3655 return nullptr;
3649 } 3656 }
3650 3657
3651 } // namespace blink 3658 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698