OLD | NEW |
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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 } | 222 } |
223 | 223 |
224 if (!value.isNull()) { | 224 if (!value.isNull()) { |
225 if (shorthandPropertyID) { | 225 if (shorthandPropertyID) { |
226 propertyID = shorthandPropertyID; | 226 propertyID = shorthandPropertyID; |
227 shorthandPropertyUsed.set(shortPropertyIndex); | 227 shorthandPropertyUsed.set(shortPropertyIndex); |
228 } | 228 } |
229 } else | 229 } else |
230 value = property.value()->cssText(); | 230 value = property.value()->cssText(); |
231 | 231 |
232 if (value == "initial" && !CSSProperty::isInheritedProperty(propertyID)) | 232 if (value == "initial" && !CSSPropertyMetadata::isInheritedProperty(prop
ertyID)) |
233 continue; | 233 continue; |
234 | 234 |
235 result.append(getPropertyText(propertyID, value, property.isImportant(),
numDecls++)); | 235 result.append(getPropertyText(propertyID, value, property.isImportant(),
numDecls++)); |
236 } | 236 } |
237 | 237 |
238 if (shorthandPropertyAppeared.get(CSSPropertyBackground - firstCSSProperty)) | 238 if (shorthandPropertyAppeared.get(CSSPropertyBackground - firstCSSProperty)) |
239 appendBackgroundPropertyAsText(result, numDecls); | 239 appendBackgroundPropertyAsText(result, numDecls); |
240 | 240 |
241 ASSERT(!numDecls ^ !result.isEmpty()); | 241 ASSERT(!numDecls ^ !result.isEmpty()); |
242 return result.toString(); | 242 return result.toString(); |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
866 isInitialValue = false; | 866 isInitialValue = false; |
867 if (!value->isInheritedValue()) | 867 if (!value->isInheritedValue()) |
868 isInheritedValue = false; | 868 isInheritedValue = false; |
869 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 869 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
870 return false; | 870 return false; |
871 } | 871 } |
872 return isInitialValue || isInheritedValue; | 872 return isInitialValue || isInheritedValue; |
873 } | 873 } |
874 | 874 |
875 } | 875 } |
OLD | NEW |