| 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 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 698 result.append(value); | 698 result.append(value); |
| 699 } | 699 } |
| 700 if (isInitialOrInherit(commonValue)) | 700 if (isInitialOrInherit(commonValue)) |
| 701 return commonValue; | 701 return commonValue; |
| 702 return result.isEmpty() ? String() : result.toString(); | 702 return result.isEmpty() ? String() : result.toString(); |
| 703 } | 703 } |
| 704 | 704 |
| 705 static void appendBackgroundRepeatValue(StringBuilder& builder, const CSSValue&
repeatXCSSValue, const CSSValue& repeatYCSSValue) | 705 static void appendBackgroundRepeatValue(StringBuilder& builder, const CSSValue&
repeatXCSSValue, const CSSValue& repeatYCSSValue) |
| 706 { | 706 { |
| 707 // FIXME: Ensure initial values do not appear in CSS_VALUE_LISTS. | 707 // FIXME: Ensure initial values do not appear in CSS_VALUE_LISTS. |
| 708 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(CSSPrimitiveValue, initialRepeatValue,
CSSPrimitiveValue::create(CSSValueRepeat)); | 708 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(CSSPrimitiveValue, initialRepeatValue,
(CSSPrimitiveValue::create(CSSValueRepeat))); |
| 709 const CSSPrimitiveValue& repeatX = repeatXCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatXCSSValue); | 709 const CSSPrimitiveValue& repeatX = repeatXCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatXCSSValue); |
| 710 const CSSPrimitiveValue& repeatY = repeatYCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatYCSSValue); | 710 const CSSPrimitiveValue& repeatY = repeatYCSSValue.isInitialValue() ? *initi
alRepeatValue : toCSSPrimitiveValue(repeatYCSSValue); |
| 711 CSSValueID repeatXValueId = repeatX.getValueID(); | 711 CSSValueID repeatXValueId = repeatX.getValueID(); |
| 712 CSSValueID repeatYValueId = repeatY.getValueID(); | 712 CSSValueID repeatYValueId = repeatY.getValueID(); |
| 713 if (repeatXValueId == repeatYValueId) { | 713 if (repeatXValueId == repeatYValueId) { |
| 714 builder.append(repeatX.cssText()); | 714 builder.append(repeatX.cssText()); |
| 715 } else if (repeatXValueId == CSSValueNoRepeat && repeatYValueId == CSSValueR
epeat) { | 715 } else if (repeatXValueId == CSSValueNoRepeat && repeatYValueId == CSSValueR
epeat) { |
| 716 builder.append("repeat-y"); | 716 builder.append("repeat-y"); |
| 717 } else if (repeatXValueId == CSSValueRepeat && repeatYValueId == CSSValueNoR
epeat) { | 717 } else if (repeatXValueId == CSSValueRepeat && repeatYValueId == CSSValueNoR
epeat) { |
| 718 builder.append("repeat-x"); | 718 builder.append("repeat-x"); |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 isInitialValue = false; | 864 isInitialValue = false; |
| 865 if (!value->isInheritedValue()) | 865 if (!value->isInheritedValue()) |
| 866 isInheritedValue = false; | 866 isInheritedValue = false; |
| 867 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 867 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
| 868 return false; | 868 return false; |
| 869 } | 869 } |
| 870 return isInitialValue || isInheritedValue; | 870 return isInitialValue || isInheritedValue; |
| 871 } | 871 } |
| 872 | 872 |
| 873 } | 873 } |
| OLD | NEW |