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

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

Issue 2737843003: [css-align] Implement place-items alignment shorthand (Closed)
Patch Set: Created 3 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
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 2305 matching lines...) Expand 10 before | Expand all | Expand 10 after
2316 return CSSIdentifierValue::create(style.display()); 2316 return CSSIdentifierValue::create(style.display());
2317 case CSSPropertyEmptyCells: 2317 case CSSPropertyEmptyCells:
2318 return CSSIdentifierValue::create(style.emptyCells()); 2318 return CSSIdentifierValue::create(style.emptyCells());
2319 case CSSPropertyPlaceContent: { 2319 case CSSPropertyPlaceContent: {
2320 // TODO (jfernandez): The spec states that we should return the specified 2320 // TODO (jfernandez): The spec states that we should return the specified
2321 // value. 2321 // value.
2322 return valuesForShorthandProperty(placeContentShorthand(), style, 2322 return valuesForShorthandProperty(placeContentShorthand(), style,
2323 layoutObject, styledNode, 2323 layoutObject, styledNode,
2324 allowVisitedStyle); 2324 allowVisitedStyle);
2325 } 2325 }
2326 case CSSPropertyPlaceItems: {
2327 // TODO (jfernandez): The spec states that we should return the specified
2328 // value.
2329 return valuesForShorthandProperty(placeItemsShorthand(), style,
2330 layoutObject, styledNode,
2331 allowVisitedStyle);
2332 }
2326 case CSSPropertyAlignContent: 2333 case CSSPropertyAlignContent:
2327 return valueForContentPositionAndDistributionWithOverflowAlignment( 2334 return valueForContentPositionAndDistributionWithOverflowAlignment(
2328 style.alignContent(), CSSValueStretch); 2335 style.alignContent(), CSSValueStretch);
2329 case CSSPropertyAlignItems: 2336 case CSSPropertyAlignItems:
2330 return valueForItemPositionWithOverflowAlignment(style.alignItems()); 2337 return valueForItemPositionWithOverflowAlignment(style.alignItems());
2331 case CSSPropertyAlignSelf: 2338 case CSSPropertyAlignSelf:
2332 return valueForItemPositionWithOverflowAlignment(style.alignSelf()); 2339 return valueForItemPositionWithOverflowAlignment(style.alignSelf());
2333 case CSSPropertyFlex: 2340 case CSSPropertyFlex:
2334 return valuesForShorthandProperty(flexShorthand(), style, layoutObject, 2341 return valuesForShorthandProperty(flexShorthand(), style, layoutObject,
2335 styledNode, allowVisitedStyle); 2342 styledNode, allowVisitedStyle);
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
3673 case CSSPropertyAll: 3680 case CSSPropertyAll:
3674 return nullptr; 3681 return nullptr;
3675 default: 3682 default:
3676 break; 3683 break;
3677 } 3684 }
3678 ASSERT_NOT_REACHED(); 3685 ASSERT_NOT_REACHED();
3679 return nullptr; 3686 return nullptr;
3680 } 3687 }
3681 3688
3682 } // namespace blink 3689 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698