Chromium Code Reviews| 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 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 4 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 458 return webkitMaskPositionLonghands; | 458 return webkitMaskPositionLonghands; |
| 459 } | 459 } |
| 460 | 460 |
| 461 const StylePropertyShorthand& webkitMaskRepeatShorthand() | 461 const StylePropertyShorthand& webkitMaskRepeatShorthand() |
| 462 { | 462 { |
| 463 static const CSSPropertyID maskRepeatProperties[] = { CSSPropertyWebkitMaskR epeatX, CSSPropertyWebkitMaskRepeatY }; | 463 static const CSSPropertyID maskRepeatProperties[] = { CSSPropertyWebkitMaskR epeatX, CSSPropertyWebkitMaskRepeatY }; |
| 464 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitMaskRepeatLonghands, (CSSP ropertyWebkitMaskRepeat, maskRepeatProperties, WTF_ARRAY_LENGTH(maskRepeatProper ties))); | 464 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitMaskRepeatLonghands, (CSSP ropertyWebkitMaskRepeat, maskRepeatProperties, WTF_ARRAY_LENGTH(maskRepeatProper ties))); |
| 465 return webkitMaskRepeatLonghands; | 465 return webkitMaskRepeatLonghands; |
| 466 } | 466 } |
| 467 | 467 |
| 468 const StylePropertyShorthand& textDecorationShorthand() | |
| 469 { | |
| 470 static const CSSPropertyID textDecorationProperties[] = { | |
| 471 CSSPropertyTextDecorationLine, | |
| 472 CSSPropertyTextDecorationStyle, | |
| 473 CSSPropertyTextDecorationColor | |
| 474 }; | |
| 475 DEFINE_STATIC_LOCAL(StylePropertyShorthand, textDecorationLonghands, (CSSPro pertyTextDecoration, textDecorationProperties, WTF_ARRAY_LENGTH(textDecorationPr operties))); | |
| 476 return textDecorationLonghands; | |
|
darktears
2013/06/19 18:12:01
You also need to patch the bottom part of the file
| |
| 477 } | |
| 478 | |
| 468 const StylePropertyShorthand& webkitTextEmphasisShorthand() | 479 const StylePropertyShorthand& webkitTextEmphasisShorthand() |
| 469 { | 480 { |
| 470 static const CSSPropertyID textEmphasisProperties[] = { | 481 static const CSSPropertyID textEmphasisProperties[] = { |
| 471 CSSPropertyWebkitTextEmphasisStyle, | 482 CSSPropertyWebkitTextEmphasisStyle, |
| 472 CSSPropertyWebkitTextEmphasisColor | 483 CSSPropertyWebkitTextEmphasisColor |
| 473 }; | 484 }; |
| 474 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitTextEmphasisLonghands, (CS SPropertyWebkitTextEmphasis, textEmphasisProperties, WTF_ARRAY_LENGTH(textEmphas isProperties))); | 485 DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitTextEmphasisLonghands, (CS SPropertyWebkitTextEmphasis, textEmphasisProperties, WTF_ARRAY_LENGTH(textEmphas isProperties))); |
| 475 return webkitTextEmphasisLonghands; | 486 return webkitTextEmphasisLonghands; |
| 476 } | 487 } |
| 477 | 488 |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 945 { | 956 { |
| 946 for (unsigned i = 0; i < shorthands.size(); ++i) { | 957 for (unsigned i = 0; i < shorthands.size(); ++i) { |
| 947 if (shorthands.at(i).id() == shorthandID) | 958 if (shorthands.at(i).id() == shorthandID) |
| 948 return i; | 959 return i; |
| 949 } | 960 } |
| 950 ASSERT_NOT_REACHED(); | 961 ASSERT_NOT_REACHED(); |
| 951 return 0; | 962 return 0; |
| 952 } | 963 } |
| 953 | 964 |
| 954 } // namespace WebCore | 965 } // namespace WebCore |
| OLD | NEW |