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

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

Issue 1150313002: *** NOT FOR LANDING *** Unprefix multicol behind a flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 case CSSPropertyBorderLeft: 401 case CSSPropertyBorderLeft:
402 return getShorthandValue(borderLeftShorthand()); 402 return getShorthandValue(borderLeftShorthand());
403 case CSSPropertyOutline: 403 case CSSPropertyOutline:
404 return getShorthandValue(outlineShorthand()); 404 return getShorthandValue(outlineShorthand());
405 case CSSPropertyBorderColor: 405 case CSSPropertyBorderColor:
406 return get4Values(borderColorShorthand()); 406 return get4Values(borderColorShorthand());
407 case CSSPropertyBorderWidth: 407 case CSSPropertyBorderWidth:
408 return get4Values(borderWidthShorthand()); 408 return get4Values(borderWidthShorthand());
409 case CSSPropertyBorderStyle: 409 case CSSPropertyBorderStyle:
410 return get4Values(borderStyleShorthand()); 410 return get4Values(borderStyleShorthand());
411 case CSSPropertyWebkitColumnRule: 411 case CSSPropertyColumnRule:
412 return getShorthandValue(webkitColumnRuleShorthand()); 412 return getShorthandValue(columnRuleShorthand());
413 case CSSPropertyWebkitColumns: 413 case CSSPropertyColumns:
414 return getShorthandValue(webkitColumnsShorthand()); 414 return getShorthandValue(columnsShorthand());
415 case CSSPropertyFlex: 415 case CSSPropertyFlex:
416 return getShorthandValue(flexShorthand()); 416 return getShorthandValue(flexShorthand());
417 case CSSPropertyFlexFlow: 417 case CSSPropertyFlexFlow:
418 return getShorthandValue(flexFlowShorthand()); 418 return getShorthandValue(flexFlowShorthand());
419 case CSSPropertyGridColumn: 419 case CSSPropertyGridColumn:
420 return getShorthandValue(gridColumnShorthand(), " / "); 420 return getShorthandValue(gridColumnShorthand(), " / ");
421 case CSSPropertyGridRow: 421 case CSSPropertyGridRow:
422 return getShorthandValue(gridRowShorthand(), " / "); 422 return getShorthandValue(gridRowShorthand(), " / ");
423 case CSSPropertyGridArea: 423 case CSSPropertyGridArea:
424 return getShorthandValue(gridAreaShorthand(), " / "); 424 return getShorthandValue(gridAreaShorthand(), " / ");
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 isInitialValue = false; 993 isInitialValue = false;
994 if (!value->isInheritedValue()) 994 if (!value->isInheritedValue())
995 isInheritedValue = false; 995 isInheritedValue = false;
996 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie s()[i])) 996 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie s()[i]))
997 return false; 997 return false;
998 } 998 }
999 return isInitialValue || isInheritedValue; 999 return isInitialValue || isInheritedValue;
1000 } 1000 }
1001 1001
1002 } 1002 }
OLDNEW
« no previous file with comments | « Source/core/css/PropertySetCSSStyleDeclaration.cpp ('k') | Source/core/css/StylePropertySet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698