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

Side by Side Diff: third_party/WebKit/Source/core/css/StylePropertySerializer.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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
4 * rights reserved. 4 * rights reserved.
5 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 5 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
6 * Copyright (C) 2013 Intel Corporation. All rights reserved. 6 * Copyright (C) 2013 Intel Corporation. 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 Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 case CSSPropertyGridRow: 459 case CSSPropertyGridRow:
460 return getShorthandValue(gridRowShorthand(), " / "); 460 return getShorthandValue(gridRowShorthand(), " / ");
461 case CSSPropertyGridArea: 461 case CSSPropertyGridArea:
462 return getShorthandValue(gridAreaShorthand(), " / "); 462 return getShorthandValue(gridAreaShorthand(), " / ");
463 case CSSPropertyGridGap: 463 case CSSPropertyGridGap:
464 return getShorthandValue(gridGapShorthand()); 464 return getShorthandValue(gridGapShorthand());
465 case CSSPropertyPlaceContent: 465 case CSSPropertyPlaceContent:
466 return getAlignmentShorthandValue(placeContentShorthand()); 466 return getAlignmentShorthandValue(placeContentShorthand());
467 case CSSPropertyPlaceItems: 467 case CSSPropertyPlaceItems:
468 return getAlignmentShorthandValue(placeItemsShorthand()); 468 return getAlignmentShorthandValue(placeItemsShorthand());
469 case CSSPropertyPlaceSelf:
470 return getAlignmentShorthandValue(placeSelfShorthand());
469 case CSSPropertyFont: 471 case CSSPropertyFont:
470 return fontValue(); 472 return fontValue();
471 case CSSPropertyFontVariant: 473 case CSSPropertyFontVariant:
472 return fontVariantValue(); 474 return fontVariantValue();
473 case CSSPropertyMargin: 475 case CSSPropertyMargin:
474 return get4Values(marginShorthand()); 476 return get4Values(marginShorthand());
475 case CSSPropertyMotion: 477 case CSSPropertyMotion:
476 return getShorthandValue(motionShorthand()); 478 return getShorthandValue(motionShorthand());
477 case CSSPropertyOffset: 479 case CSSPropertyOffset:
478 return getShorthandValue(offsetShorthand()); 480 return getShorthandValue(offsetShorthand());
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 const CSSValue& xValue = 949 const CSSValue& xValue =
948 repeatXList ? repeatXList->item(i % repeatXList->length()) : repeatX; 950 repeatXList ? repeatXList->item(i % repeatXList->length()) : repeatX;
949 const CSSValue& yValue = 951 const CSSValue& yValue =
950 repeatYList ? repeatYList->item(i % repeatYList->length()) : repeatY; 952 repeatYList ? repeatYList->item(i % repeatYList->length()) : repeatY;
951 appendBackgroundRepeatValue(builder, xValue, yValue); 953 appendBackgroundRepeatValue(builder, xValue, yValue);
952 } 954 }
953 return builder.toString(); 955 return builder.toString();
954 } 956 }
955 957
956 } // namespace blink 958 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698