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

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

Issue 846933002: Handle null in value list in getLayeredShorthandValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix more tests Created 5 years, 11 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
« no previous file with comments | « LayoutTests/fast/dom/background-shorthand-csstext-expected.txt ('k') | no next file » | 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 switch (propertyID) { 394 switch (propertyID) {
395 case CSSPropertyAnimation: 395 case CSSPropertyAnimation:
396 return getLayeredShorthandValue(animationShorthand(), true); 396 return getLayeredShorthandValue(animationShorthand(), true);
397 case CSSPropertyBorderSpacing: 397 case CSSPropertyBorderSpacing:
398 return borderSpacingValue(borderSpacingShorthand()); 398 return borderSpacingValue(borderSpacingShorthand());
399 case CSSPropertyBackgroundPosition: 399 case CSSPropertyBackgroundPosition:
400 return getLayeredShorthandValue(backgroundPositionShorthand()); 400 return getLayeredShorthandValue(backgroundPositionShorthand());
401 case CSSPropertyBackgroundRepeat: 401 case CSSPropertyBackgroundRepeat:
402 return backgroundRepeatPropertyValue(); 402 return backgroundRepeatPropertyValue();
403 case CSSPropertyBackground: 403 case CSSPropertyBackground:
404 return getLayeredShorthandValue(backgroundShorthand()); 404 return getLayeredShorthandValue(backgroundShorthand(), true);
405 case CSSPropertyBorder: 405 case CSSPropertyBorder:
406 return borderPropertyValue(OmitUncommonValues); 406 return borderPropertyValue(OmitUncommonValues);
407 case CSSPropertyBorderTop: 407 case CSSPropertyBorderTop:
408 return getShorthandValue(borderTopShorthand()); 408 return getShorthandValue(borderTopShorthand());
409 case CSSPropertyBorderRight: 409 case CSSPropertyBorderRight:
410 return getShorthandValue(borderRightShorthand()); 410 return getShorthandValue(borderRightShorthand());
411 case CSSPropertyBorderBottom: 411 case CSSPropertyBorderBottom:
412 return getShorthandValue(borderBottomShorthand()); 412 return getShorthandValue(borderBottomShorthand());
413 case CSSPropertyBorderLeft: 413 case CSSPropertyBorderLeft:
414 return getShorthandValue(borderLeftShorthand()); 414 return getShorthandValue(borderLeftShorthand());
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 isInitialValue = false; 1010 isInitialValue = false;
1011 if (!value->isInheritedValue()) 1011 if (!value->isInheritedValue())
1012 isInheritedValue = false; 1012 isInheritedValue = false;
1013 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie s()[i])) 1013 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie s()[i]))
1014 return false; 1014 return false;
1015 } 1015 }
1016 return isInitialValue || isInheritedValue; 1016 return isInitialValue || isInheritedValue;
1017 } 1017 }
1018 1018
1019 } 1019 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/background-shorthand-csstext-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698