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

Side by Side Diff: Source/core/css/StylePropertySerializer.cpp

Issue 15758002: Unprefix Flexbox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/StylePropertyShorthand.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 r ights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * Copyright (C) 2013 Intel Corporation. All rights reserved. 5 * Copyright (C) 2013 Intel Corporation. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 break; 167 break;
168 case CSSPropertyWebkitAnimationName: 168 case CSSPropertyWebkitAnimationName:
169 case CSSPropertyWebkitAnimationDuration: 169 case CSSPropertyWebkitAnimationDuration:
170 case CSSPropertyWebkitAnimationTimingFunction: 170 case CSSPropertyWebkitAnimationTimingFunction:
171 case CSSPropertyWebkitAnimationDelay: 171 case CSSPropertyWebkitAnimationDelay:
172 case CSSPropertyWebkitAnimationIterationCount: 172 case CSSPropertyWebkitAnimationIterationCount:
173 case CSSPropertyWebkitAnimationDirection: 173 case CSSPropertyWebkitAnimationDirection:
174 case CSSPropertyWebkitAnimationFillMode: 174 case CSSPropertyWebkitAnimationFillMode:
175 shorthandPropertyID = CSSPropertyWebkitAnimation; 175 shorthandPropertyID = CSSPropertyWebkitAnimation;
176 break; 176 break;
177 case CSSPropertyWebkitFlexDirection: 177 case CSSPropertyFlexDirection:
178 case CSSPropertyWebkitFlexWrap: 178 case CSSPropertyFlexWrap:
179 shorthandPropertyID = CSSPropertyWebkitFlexFlow; 179 shorthandPropertyID = CSSPropertyFlexFlow;
180 break; 180 break;
181 case CSSPropertyWebkitFlexBasis: 181 case CSSPropertyFlexBasis:
182 case CSSPropertyWebkitFlexGrow: 182 case CSSPropertyFlexGrow:
183 case CSSPropertyWebkitFlexShrink: 183 case CSSPropertyFlexShrink:
184 shorthandPropertyID = CSSPropertyWebkitFlex; 184 shorthandPropertyID = CSSPropertyFlex;
185 break; 185 break;
186 case CSSPropertyWebkitMaskPositionX: 186 case CSSPropertyWebkitMaskPositionX:
187 case CSSPropertyWebkitMaskPositionY: 187 case CSSPropertyWebkitMaskPositionY:
188 case CSSPropertyWebkitMaskRepeatX: 188 case CSSPropertyWebkitMaskRepeatX:
189 case CSSPropertyWebkitMaskRepeatY: 189 case CSSPropertyWebkitMaskRepeatY:
190 case CSSPropertyWebkitMaskImage: 190 case CSSPropertyWebkitMaskImage:
191 case CSSPropertyWebkitMaskRepeat: 191 case CSSPropertyWebkitMaskRepeat:
192 case CSSPropertyWebkitMaskPosition: 192 case CSSPropertyWebkitMaskPosition:
193 case CSSPropertyWebkitMaskClip: 193 case CSSPropertyWebkitMaskClip:
194 case CSSPropertyWebkitMaskOrigin: 194 case CSSPropertyWebkitMaskOrigin:
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 case CSSPropertyBorderColor: 335 case CSSPropertyBorderColor:
336 return get4Values(borderColorShorthand()); 336 return get4Values(borderColorShorthand());
337 case CSSPropertyBorderWidth: 337 case CSSPropertyBorderWidth:
338 return get4Values(borderWidthShorthand()); 338 return get4Values(borderWidthShorthand());
339 case CSSPropertyBorderStyle: 339 case CSSPropertyBorderStyle:
340 return get4Values(borderStyleShorthand()); 340 return get4Values(borderStyleShorthand());
341 case CSSPropertyWebkitColumnRule: 341 case CSSPropertyWebkitColumnRule:
342 return getShorthandValue(webkitColumnRuleShorthand()); 342 return getShorthandValue(webkitColumnRuleShorthand());
343 case CSSPropertyWebkitColumns: 343 case CSSPropertyWebkitColumns:
344 return getShorthandValue(webkitColumnsShorthand()); 344 return getShorthandValue(webkitColumnsShorthand());
345 case CSSPropertyWebkitFlex: 345 case CSSPropertyFlex:
346 return getShorthandValue(webkitFlexShorthand()); 346 return getShorthandValue(flexShorthand());
347 case CSSPropertyWebkitFlexFlow: 347 case CSSPropertyFlexFlow:
348 return getShorthandValue(webkitFlexFlowShorthand()); 348 return getShorthandValue(flexFlowShorthand());
349 case CSSPropertyGridColumn: 349 case CSSPropertyGridColumn:
350 return getShorthandValue(gridColumnShorthand()); 350 return getShorthandValue(gridColumnShorthand());
351 case CSSPropertyGridRow: 351 case CSSPropertyGridRow:
352 return getShorthandValue(gridRowShorthand()); 352 return getShorthandValue(gridRowShorthand());
353 case CSSPropertyGridArea: 353 case CSSPropertyGridArea:
354 return getShorthandValue(gridAreaShorthand()); 354 return getShorthandValue(gridAreaShorthand());
355 case CSSPropertyFont: 355 case CSSPropertyFont:
356 return fontValue(); 356 return fontValue();
357 case CSSPropertyMargin: 357 case CSSPropertyMargin:
358 return get4Values(marginShorthand()); 358 return get4Values(marginShorthand());
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 if (!result.isEmpty()) 753 if (!result.isEmpty())
754 result.append(' '); 754 result.append(' ');
755 result.append(value); 755 result.append(value);
756 } 756 }
757 if (isInitialOrInherit(commonValue)) 757 if (isInitialOrInherit(commonValue))
758 return commonValue; 758 return commonValue;
759 return result.isEmpty() ? String() : result.toString(); 759 return result.isEmpty() ? String() : result.toString();
760 } 760 }
761 761
762 } 762 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/StylePropertyShorthand.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698