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 795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
806 result.append(value); | 806 result.append(value); |
807 } | 807 } |
808 if (isInitialOrInherit(commonValue)) | 808 if (isInitialOrInherit(commonValue)) |
809 return commonValue; | 809 return commonValue; |
810 return result.isEmpty() ? String() : result.toString(); | 810 return result.isEmpty() ? String() : result.toString(); |
811 } | 811 } |
812 | 812 |
813 static void appendBackgroundRepeatValue(StringBuilder& builder, const CSSValue&
repeatXCSSValue, const CSSValue& repeatYCSSValue) | 813 static void appendBackgroundRepeatValue(StringBuilder& builder, const CSSValue&
repeatXCSSValue, const CSSValue& repeatYCSSValue) |
814 { | 814 { |
815 // FIXME: Ensure initial values do not appear in CSS_VALUE_LISTS. | 815 // FIXME: Ensure initial values do not appear in CSS_VALUE_LISTS. |
816 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(CSSPrimitiveValue, initialRepeatValue,
(CSSPrimitiveValue::create(CSSValueRepeat))); | 816 DEFINE_STATIC_REF(CSSPrimitiveValue, initialRepeatValue, (CSSPrimitiveValue:
:create(CSSValueRepeat))); |
817 const CSSPrimitiveValue& repeatX = repeatXCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatXCSSValue); | 817 const CSSPrimitiveValue& repeatX = repeatXCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatXCSSValue); |
818 const CSSPrimitiveValue& repeatY = repeatYCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatYCSSValue); | 818 const CSSPrimitiveValue& repeatY = repeatYCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatYCSSValue); |
819 CSSValueID repeatXValueId = repeatX.getValueID(); | 819 CSSValueID repeatXValueId = repeatX.getValueID(); |
820 CSSValueID repeatYValueId = repeatY.getValueID(); | 820 CSSValueID repeatYValueId = repeatY.getValueID(); |
821 if (repeatXValueId == repeatYValueId) { | 821 if (repeatXValueId == repeatYValueId) { |
822 builder.append(repeatX.cssText()); | 822 builder.append(repeatX.cssText()); |
823 } else if (repeatXValueId == CSSValueNoRepeat && repeatYValueId == CSSValueR
epeat) { | 823 } else if (repeatXValueId == CSSValueNoRepeat && repeatYValueId == CSSValueR
epeat) { |
824 builder.appendLiteral("repeat-y"); | 824 builder.appendLiteral("repeat-y"); |
825 } else if (repeatXValueId == CSSValueRepeat && repeatYValueId == CSSValueNoR
epeat) { | 825 } else if (repeatXValueId == CSSValueRepeat && repeatYValueId == CSSValueNoR
epeat) { |
826 builder.appendLiteral("repeat-x"); | 826 builder.appendLiteral("repeat-x"); |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
969 isInitialValue = false; | 969 isInitialValue = false; |
970 if (!value->isInheritedValue()) | 970 if (!value->isInheritedValue()) |
971 isInheritedValue = false; | 971 isInheritedValue = false; |
972 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 972 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
973 return false; | 973 return false; |
974 } | 974 } |
975 return isInitialValue || isInheritedValue; | 975 return isInitialValue || isInheritedValue; |
976 } | 976 } |
977 | 977 |
978 } | 978 } |
OLD | NEW |