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

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

Issue 2737843003: [css-align] Implement place-items alignment shorthand (Closed)
Patch Set: More layout tests fixes. 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 2333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2344 return CSSIdentifierValue::create(style.display()); 2344 return CSSIdentifierValue::create(style.display());
2345 case CSSPropertyEmptyCells: 2345 case CSSPropertyEmptyCells:
2346 return CSSIdentifierValue::create(style.emptyCells()); 2346 return CSSIdentifierValue::create(style.emptyCells());
2347 case CSSPropertyPlaceContent: { 2347 case CSSPropertyPlaceContent: {
2348 // TODO (jfernandez): The spec states that we should return the specified 2348 // TODO (jfernandez): The spec states that we should return the specified
2349 // value. 2349 // value.
2350 return valuesForShorthandProperty(placeContentShorthand(), style, 2350 return valuesForShorthandProperty(placeContentShorthand(), style,
2351 layoutObject, styledNode, 2351 layoutObject, styledNode,
2352 allowVisitedStyle); 2352 allowVisitedStyle);
2353 } 2353 }
2354 case CSSPropertyPlaceItems: {
2355 // TODO (jfernandez): The spec states that we should return the specified
2356 // value.
2357 return valuesForShorthandProperty(placeItemsShorthand(), style,
2358 layoutObject, styledNode,
2359 allowVisitedStyle);
2360 }
2354 case CSSPropertyAlignContent: 2361 case CSSPropertyAlignContent:
2355 return valueForContentPositionAndDistributionWithOverflowAlignment( 2362 return valueForContentPositionAndDistributionWithOverflowAlignment(
2356 style.alignContent(), CSSValueStretch); 2363 style.alignContent(), CSSValueStretch);
2357 case CSSPropertyAlignItems: 2364 case CSSPropertyAlignItems:
2358 return valueForItemPositionWithOverflowAlignment(style.alignItems()); 2365 return valueForItemPositionWithOverflowAlignment(style.alignItems());
2359 case CSSPropertyAlignSelf: 2366 case CSSPropertyAlignSelf:
2360 return valueForItemPositionWithOverflowAlignment(style.alignSelf()); 2367 return valueForItemPositionWithOverflowAlignment(style.alignSelf());
2361 case CSSPropertyFlex: 2368 case CSSPropertyFlex:
2362 return valuesForShorthandProperty(flexShorthand(), style, layoutObject, 2369 return valuesForShorthandProperty(flexShorthand(), style, layoutObject,
2363 styledNode, allowVisitedStyle); 2370 styledNode, allowVisitedStyle);
(...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after
3691 case CSSPropertyAll: 3698 case CSSPropertyAll:
3692 return nullptr; 3699 return nullptr;
3693 default: 3700 default:
3694 break; 3701 break;
3695 } 3702 }
3696 ASSERT_NOT_REACHED(); 3703 ASSERT_NOT_REACHED();
3697 return nullptr; 3704 return nullptr;
3698 } 3705 }
3699 3706
3700 } // namespace blink 3707 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.json5 ('k') | third_party/WebKit/Source/core/css/StylePropertySerializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698