| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 3 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas
kSize, &RenderStyle::maskLayers)); | 493 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas
kSize, &RenderStyle::maskLayers)); |
| 494 | 494 |
| 495 gPropertyWrappers->append(new PropertyWrapper<LengthPoint>(CSSPropertyObject
Position, &RenderStyle::objectPosition)); | 495 gPropertyWrappers->append(new PropertyWrapper<LengthPoint>(CSSPropertyObject
Position, &RenderStyle::objectPosition)); |
| 496 | 496 |
| 497 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyFontSize, | 497 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyFontSize, |
| 498 // Must pass a specified size to setFontSize if Text Autosizing is enabl
ed, but a computed size | 498 // Must pass a specified size to setFontSize if Text Autosizing is enabl
ed, but a computed size |
| 499 // if text zoom is enabled (if neither is enabled it's irrelevant as the
y're probably the same). | 499 // if text zoom is enabled (if neither is enabled it's irrelevant as the
y're probably the same). |
| 500 // FIXME: Should we introduce an option to pass the computed font size h
ere, allowing consumers to | 500 // FIXME: Should we introduce an option to pass the computed font size h
ere, allowing consumers to |
| 501 // enable text zoom rather than Text Autosizing? See http://crbug.com/22
7545. | 501 // enable text zoom rather than Text Autosizing? See http://crbug.com/22
7545. |
| 502 &RenderStyle::specifiedFontSize)); | 502 &RenderStyle::specifiedFontSize)); |
| 503 gPropertyWrappers->append(new PropertyWrapper<FontWeight>(CSSPropertyFontWei
ght, &RenderStyle::fontWeight)); |
| 503 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb
kitColumnRuleWidth, &RenderStyle::columnRuleWidth)); | 504 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb
kitColumnRuleWidth, &RenderStyle::columnRuleWidth)); |
| 504 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn
Gap, &RenderStyle::columnGap)); | 505 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn
Gap, &RenderStyle::columnGap)); |
| 505 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb
kitColumnCount, &RenderStyle::columnCount)); | 506 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb
kitColumnCount, &RenderStyle::columnCount)); |
| 506 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn
Width, &RenderStyle::columnWidth)); | 507 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn
Width, &RenderStyle::columnWidth)); |
| 507 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder
HorizontalSpacing, &RenderStyle::horizontalBorderSpacing)); | 508 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder
HorizontalSpacing, &RenderStyle::horizontalBorderSpacing)); |
| 508 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder
VerticalSpacing, &RenderStyle::verticalBorderSpacing)); | 509 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder
VerticalSpacing, &RenderStyle::verticalBorderSpacing)); |
| 509 gPropertyWrappers->append(new PropertyWrapper<int>(CSSPropertyZIndex, &Rende
rStyle::zIndex)); | 510 gPropertyWrappers->append(new PropertyWrapper<int>(CSSPropertyZIndex, &Rende
rStyle::zIndex)); |
| 510 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyOrphans, &Re
nderStyle::orphans)); | 511 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyOrphans, &Re
nderStyle::orphans)); |
| 511 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWidows, &Ren
derStyle::widows)); | 512 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWidows, &Ren
derStyle::widows)); |
| 512 gPropertyWrappers->append(new PropertyWrapper<Length>(CSSPropertyLineHeight,
&RenderStyle::specifiedLineHeight)); | 513 gPropertyWrappers->append(new PropertyWrapper<Length>(CSSPropertyLineHeight,
&RenderStyle::specifiedLineHeight)); |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 // FIXME: transitions of text-decoration-color are broken | 602 // FIXME: transitions of text-decoration-color are broken |
| 602 if (prop == CSSPropertyTextDecorationColor) | 603 if (prop == CSSPropertyTextDecorationColor) |
| 603 return true; | 604 return true; |
| 604 | 605 |
| 605 ensurePropertyMap(); | 606 ensurePropertyMap(); |
| 606 return wrapperForProperty(prop)->equals(a, b); | 607 return wrapperForProperty(prop)->equals(a, b); |
| 607 } | 608 } |
| 608 | 609 |
| 609 | 610 |
| 610 } | 611 } |
| OLD | NEW |