| 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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 | 475 |
| 476 // BUG 49055: make sure the value was not reset in the layer che
ck just above. | 476 // BUG 49055: make sure the value was not reset in the layer che
ck just above. |
| 477 if (j < size - 1 && shorthand.properties()[j + 1] == CSSProperty
BackgroundRepeatY && value) { | 477 if (j < size - 1 && shorthand.properties()[j + 1] == CSSProperty
BackgroundRepeatY && value) { |
| 478 RefPtr<CSSValue> yValue = nullptr; | 478 RefPtr<CSSValue> yValue = nullptr; |
| 479 RefPtr<CSSValue> nextValue = values[j + 1]; | 479 RefPtr<CSSValue> nextValue = values[j + 1]; |
| 480 if (nextValue->isValueList()) | 480 if (nextValue->isValueList()) |
| 481 yValue = toCSSValueList(nextValue.get())->item(i); | 481 yValue = toCSSValueList(nextValue.get())->item(i); |
| 482 else | 482 else |
| 483 yValue = nextValue; | 483 yValue = nextValue; |
| 484 | 484 |
| 485 // background-repeat-x(y) or mask-repeat-x(y) may be like th
is : "initial, repeat". We can omit the implicit initial values | 485 // background-repeat-x(y) may be like this : "initial, repea
t". We can omit the implicit initial values |
| 486 // before starting to compare their values. | 486 // before starting to compare their values. |
| 487 if (value->isImplicitInitialValue() || yValue->isImplicitIni
tialValue()) | 487 if (value->isImplicitInitialValue() || yValue->isImplicitIni
tialValue()) |
| 488 continue; | 488 continue; |
| 489 | 489 |
| 490 // FIXME: At some point we need to fix this code to avoid re
turning an invalid shorthand, | 490 // FIXME: At some point we need to fix this code to avoid re
turning an invalid shorthand, |
| 491 // since some longhand combinations are not serializable int
o a single shorthand. | 491 // since some longhand combinations are not serializable int
o a single shorthand. |
| 492 if (!value->isPrimitiveValue() || !yValue->isPrimitiveValue(
)) | 492 if (!value->isPrimitiveValue() || !yValue->isPrimitiveValue(
)) |
| 493 continue; | 493 continue; |
| 494 | 494 |
| 495 CSSValueID xId = toCSSPrimitiveValue(value.get())->getValueI
D(); | 495 CSSValueID xId = toCSSPrimitiveValue(value.get())->getValueI
D(); |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 return false; | 790 return false; |
| 791 if (!value->isInitialValue()) | 791 if (!value->isInitialValue()) |
| 792 isInitialValue = false; | 792 isInitialValue = false; |
| 793 if (!value->isInheritedValue()) | 793 if (!value->isInheritedValue()) |
| 794 isInheritedValue = false; | 794 isInheritedValue = false; |
| 795 } | 795 } |
| 796 return isInitialValue || isInheritedValue; | 796 return isInitialValue || isInheritedValue; |
| 797 } | 797 } |
| 798 | 798 |
| 799 } | 799 } |
| OLD | NEW |