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

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

Issue 15758002: Unprefix Flexbox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tests 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
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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 break; 163 break;
164 case CSSPropertyWebkitAnimationName: 164 case CSSPropertyWebkitAnimationName:
165 case CSSPropertyWebkitAnimationDuration: 165 case CSSPropertyWebkitAnimationDuration:
166 case CSSPropertyWebkitAnimationTimingFunction: 166 case CSSPropertyWebkitAnimationTimingFunction:
167 case CSSPropertyWebkitAnimationDelay: 167 case CSSPropertyWebkitAnimationDelay:
168 case CSSPropertyWebkitAnimationIterationCount: 168 case CSSPropertyWebkitAnimationIterationCount:
169 case CSSPropertyWebkitAnimationDirection: 169 case CSSPropertyWebkitAnimationDirection:
170 case CSSPropertyWebkitAnimationFillMode: 170 case CSSPropertyWebkitAnimationFillMode:
171 shorthandPropertyID = CSSPropertyWebkitAnimation; 171 shorthandPropertyID = CSSPropertyWebkitAnimation;
172 break; 172 break;
173 case CSSPropertyWebkitFlexDirection: 173 case CSSPropertyFlexDirection:
174 case CSSPropertyWebkitFlexWrap: 174 case CSSPropertyFlexWrap:
175 shorthandPropertyID = CSSPropertyWebkitFlexFlow; 175 shorthandPropertyID = CSSPropertyFlexFlow;
176 break; 176 break;
177 case CSSPropertyWebkitFlexBasis: 177 case CSSPropertyFlexBasis:
178 case CSSPropertyWebkitFlexGrow: 178 case CSSPropertyFlexGrow:
179 case CSSPropertyWebkitFlexShrink: 179 case CSSPropertyFlexShrink:
180 shorthandPropertyID = CSSPropertyWebkitFlex; 180 shorthandPropertyID = CSSPropertyFlex;
181 break; 181 break;
182 case CSSPropertyWebkitMaskPositionX: 182 case CSSPropertyWebkitMaskPositionX:
183 case CSSPropertyWebkitMaskPositionY: 183 case CSSPropertyWebkitMaskPositionY:
184 case CSSPropertyWebkitMaskRepeatX: 184 case CSSPropertyWebkitMaskRepeatX:
185 case CSSPropertyWebkitMaskRepeatY: 185 case CSSPropertyWebkitMaskRepeatY:
186 case CSSPropertyWebkitMaskImage: 186 case CSSPropertyWebkitMaskImage:
187 case CSSPropertyWebkitMaskRepeat: 187 case CSSPropertyWebkitMaskRepeat:
188 case CSSPropertyWebkitMaskPosition: 188 case CSSPropertyWebkitMaskPosition:
189 case CSSPropertyWebkitMaskClip: 189 case CSSPropertyWebkitMaskClip:
190 case CSSPropertyWebkitMaskOrigin: 190 case CSSPropertyWebkitMaskOrigin:
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 case CSSPropertyBorderColor: 329 case CSSPropertyBorderColor:
330 return get4Values(borderColorShorthand()); 330 return get4Values(borderColorShorthand());
331 case CSSPropertyBorderWidth: 331 case CSSPropertyBorderWidth:
332 return get4Values(borderWidthShorthand()); 332 return get4Values(borderWidthShorthand());
333 case CSSPropertyBorderStyle: 333 case CSSPropertyBorderStyle:
334 return get4Values(borderStyleShorthand()); 334 return get4Values(borderStyleShorthand());
335 case CSSPropertyWebkitColumnRule: 335 case CSSPropertyWebkitColumnRule:
336 return getShorthandValue(webkitColumnRuleShorthand()); 336 return getShorthandValue(webkitColumnRuleShorthand());
337 case CSSPropertyWebkitColumns: 337 case CSSPropertyWebkitColumns:
338 return getShorthandValue(webkitColumnsShorthand()); 338 return getShorthandValue(webkitColumnsShorthand());
339 case CSSPropertyWebkitFlex: 339 case CSSPropertyFlex:
340 return getShorthandValue(webkitFlexShorthand()); 340 return getShorthandValue(flexShorthand());
341 case CSSPropertyWebkitFlexFlow: 341 case CSSPropertyFlexFlow:
342 return getShorthandValue(webkitFlexFlowShorthand()); 342 return getShorthandValue(flexFlowShorthand());
343 case CSSPropertyGridColumn: 343 case CSSPropertyGridColumn:
344 return getShorthandValue(gridColumnShorthand()); 344 return getShorthandValue(gridColumnShorthand());
345 case CSSPropertyGridRow: 345 case CSSPropertyGridRow:
346 return getShorthandValue(gridRowShorthand()); 346 return getShorthandValue(gridRowShorthand());
347 case CSSPropertyGridArea: 347 case CSSPropertyGridArea:
348 return getShorthandValue(gridAreaShorthand()); 348 return getShorthandValue(gridAreaShorthand());
349 case CSSPropertyFont: 349 case CSSPropertyFont:
350 return fontValue(); 350 return fontValue();
351 case CSSPropertyMargin: 351 case CSSPropertyMargin:
352 return get4Values(marginShorthand()); 352 return get4Values(marginShorthand());
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 if (!result.isEmpty()) 747 if (!result.isEmpty())
748 result.append(' '); 748 result.append(' ');
749 result.append(value); 749 result.append(value);
750 } 750 }
751 if (isInitialOrInherit(commonValue)) 751 if (isInitialOrInherit(commonValue))
752 return commonValue; 752 return commonValue;
753 return result.isEmpty() ? String() : result.toString(); 753 return result.isEmpty() ? String() : result.toString();
754 } 754 }
755 755
756 } 756 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698