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 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1110 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyBackgroun dSize, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayers)); | 1110 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyBackgroun dSize, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayers)); |
1111 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitBac kgroundSize, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayer s)); | 1111 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitBac kgroundSize, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayer s)); |
1112 | 1112 |
1113 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas kPositionX, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); | 1113 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas kPositionX, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); |
1114 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas kPositionY, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); | 1114 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas kPositionY, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); |
1115 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas kSize, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); | 1115 gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMas kSize, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); |
1116 | 1116 |
1117 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyFontSize, | 1117 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyFontSize, |
1118 // Must pass a specified size to setFontSize if Text Autosizing is enabl ed, but a computed size | 1118 // Must pass a specified size to setFontSize if Text Autosizing is enabl ed, but a computed size |
1119 // if text zoom is enabled (if neither is enabled it's irrelevant as the y're probably the same). | 1119 // if text zoom is enabled (if neither is enabled it's irrelevant as the y're probably the same). |
1120 // FIXME: Find some way to assert that text zoom isn't activated when Te xt Autosizing is compiled in. | 1120 // FIXME: Find some way to assert that text zoom isn't activated when Te xt Autosizing is compiled in. |
johnme
2013/04/05 17:51:24
This one is interesting. Currently Chrome doesn't
| |
1121 #if ENABLE(TEXT_AUTOSIZING) | |
1122 &RenderStyle::specifiedFontSize, | 1121 &RenderStyle::specifiedFontSize, |
1123 #else | |
1124 &RenderStyle::computedFontSize, | |
1125 #endif | |
1126 &RenderStyle::setFontSize)); | 1122 &RenderStyle::setFontSize)); |
1127 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb kitColumnRuleWidth, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWi dth)); | 1123 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb kitColumnRuleWidth, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWi dth)); |
1128 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn Gap, &RenderStyle::columnGap, &RenderStyle::setColumnGap)); | 1124 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn Gap, &RenderStyle::columnGap, &RenderStyle::setColumnGap)); |
1129 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb kitColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount)); | 1125 gPropertyWrappers->append(new PropertyWrapper<unsigned short>(CSSPropertyWeb kitColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount)); |
1130 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn Width, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth)); | 1126 gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyWebkitColumn Width, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth)); |
1131 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder HorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHoriz ontalBorderSpacing)); | 1127 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder HorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHoriz ontalBorderSpacing)); |
1132 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder VerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalB orderSpacing)); | 1128 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWebkitBorder VerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalB orderSpacing)); |
1133 gPropertyWrappers->append(new PropertyWrapper<int>(CSSPropertyZIndex, &Rende rStyle::zIndex, &RenderStyle::setZIndex)); | 1129 gPropertyWrappers->append(new PropertyWrapper<int>(CSSPropertyZIndex, &Rende rStyle::zIndex, &RenderStyle::setZIndex)); |
1134 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyOrphans, &Re nderStyle::orphans, &RenderStyle::setOrphans)); | 1130 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyOrphans, &Re nderStyle::orphans, &RenderStyle::setOrphans)); |
1135 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWidows, &Ren derStyle::widows, &RenderStyle::setWidows)); | 1131 gPropertyWrappers->append(new PropertyWrapper<short>(CSSPropertyWidows, &Ren derStyle::widows, &RenderStyle::setWidows)); |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1320 } | 1316 } |
1321 | 1317 |
1322 int CSSPropertyAnimation::getNumProperties() | 1318 int CSSPropertyAnimation::getNumProperties() |
1323 { | 1319 { |
1324 ensurePropertyMap(); | 1320 ensurePropertyMap(); |
1325 | 1321 |
1326 return gPropertyWrappers->size(); | 1322 return gPropertyWrappers->size(); |
1327 } | 1323 } |
1328 | 1324 |
1329 } | 1325 } |
OLD | NEW |