| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
| 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. 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 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 463 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { | 463 if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) { |
| 464 if (rareNonInheritedData->m_transformStyle3D != other->rareNonInheri
tedData->m_transformStyle3D | 464 if (rareNonInheritedData->m_transformStyle3D != other->rareNonInheri
tedData->m_transformStyle3D |
| 465 || rareNonInheritedData->m_backfaceVisibility != other->rareNonI
nheritedData->m_backfaceVisibility | 465 || rareNonInheritedData->m_backfaceVisibility != other->rareNonI
nheritedData->m_backfaceVisibility |
| 466 || rareNonInheritedData->m_perspective != other->rareNonInherite
dData->m_perspective | 466 || rareNonInheritedData->m_perspective != other->rareNonInherite
dData->m_perspective |
| 467 || rareNonInheritedData->m_perspectiveOriginX != other->rareNonI
nheritedData->m_perspectiveOriginX | 467 || rareNonInheritedData->m_perspectiveOriginX != other->rareNonI
nheritedData->m_perspectiveOriginX |
| 468 || rareNonInheritedData->m_perspectiveOriginY != other->rareNonI
nheritedData->m_perspectiveOriginY) | 468 || rareNonInheritedData->m_perspectiveOriginY != other->rareNonI
nheritedData->m_perspectiveOriginY) |
| 469 return StyleDifferenceLayout; | 469 return StyleDifferenceLayout; |
| 470 } | 470 } |
| 471 #endif | 471 #endif |
| 472 | 472 |
| 473 #if ENABLE(DASHBOARD_SUPPORT) | |
| 474 // If regions change, trigger a relayout to re-calc regions. | |
| 475 if (rareNonInheritedData->m_dashboardRegions != other->rareNonInheritedD
ata->m_dashboardRegions) | |
| 476 return StyleDifferenceLayout; | |
| 477 #endif | |
| 478 | |
| 479 #if ENABLE(CSS_EXCLUSIONS) | 473 #if ENABLE(CSS_EXCLUSIONS) |
| 480 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData->
m_shapeInside) | 474 if (rareNonInheritedData->m_shapeInside != other->rareNonInheritedData->
m_shapeInside) |
| 481 return StyleDifferenceLayout; | 475 return StyleDifferenceLayout; |
| 482 #endif | 476 #endif |
| 483 } | 477 } |
| 484 | 478 |
| 485 if (rareInheritedData.get() != other->rareInheritedData.get()) { | 479 if (rareInheritedData.get() != other->rareInheritedData.get()) { |
| 486 if (rareInheritedData->highlight != other->rareInheritedData->highlight | 480 if (rareInheritedData->highlight != other->rareInheritedData->highlight |
| 487 || rareInheritedData->indent != other->rareInheritedData->indent | 481 || rareInheritedData->indent != other->rareInheritedData->indent |
| 488 #if ENABLE(CSS3_TEXT) | 482 #if ENABLE(CSS3_TEXT) |
| (...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1132 } | 1126 } |
| 1133 case TextEmphasisMarkAuto: | 1127 case TextEmphasisMarkAuto: |
| 1134 ASSERT_NOT_REACHED(); | 1128 ASSERT_NOT_REACHED(); |
| 1135 return nullAtom; | 1129 return nullAtom; |
| 1136 } | 1130 } |
| 1137 | 1131 |
| 1138 ASSERT_NOT_REACHED(); | 1132 ASSERT_NOT_REACHED(); |
| 1139 return nullAtom; | 1133 return nullAtom; |
| 1140 } | 1134 } |
| 1141 | 1135 |
| 1142 #if ENABLE(DASHBOARD_SUPPORT) | |
| 1143 const Vector<StyleDashboardRegion>& RenderStyle::initialDashboardRegions() | |
| 1144 { | |
| 1145 DEFINE_STATIC_LOCAL(Vector<StyleDashboardRegion>, emptyList, ()); | |
| 1146 return emptyList; | |
| 1147 } | |
| 1148 | |
| 1149 const Vector<StyleDashboardRegion>& RenderStyle::noneDashboardRegions() | |
| 1150 { | |
| 1151 DEFINE_STATIC_LOCAL(Vector<StyleDashboardRegion>, noneList, ()); | |
| 1152 static bool noneListInitialized = false; | |
| 1153 | |
| 1154 if (!noneListInitialized) { | |
| 1155 StyleDashboardRegion region; | |
| 1156 region.label = ""; | |
| 1157 region.offset.m_top = Length(); | |
| 1158 region.offset.m_right = Length(); | |
| 1159 region.offset.m_bottom = Length(); | |
| 1160 region.offset.m_left = Length(); | |
| 1161 region.type = StyleDashboardRegion::None; | |
| 1162 noneList.append(region); | |
| 1163 noneListInitialized = true; | |
| 1164 } | |
| 1165 return noneList; | |
| 1166 } | |
| 1167 #endif | |
| 1168 | |
| 1169 void RenderStyle::adjustAnimations() | 1136 void RenderStyle::adjustAnimations() |
| 1170 { | 1137 { |
| 1171 AnimationList* animationList = rareNonInheritedData->m_animations.get(); | 1138 AnimationList* animationList = rareNonInheritedData->m_animations.get(); |
| 1172 if (!animationList) | 1139 if (!animationList) |
| 1173 return; | 1140 return; |
| 1174 | 1141 |
| 1175 // Get rid of empty animations and anything beyond them | 1142 // Get rid of empty animations and anything beyond them |
| 1176 for (size_t i = 0; i < animationList->size(); ++i) { | 1143 for (size_t i = 0; i < animationList->size(); ++i) { |
| 1177 if (animationList->animation(i)->isEmpty()) { | 1144 if (animationList->animation(i)->isEmpty()) { |
| 1178 animationList->resize(i); | 1145 animationList->resize(i); |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1688 info.addMember(inherited, "inherited"); | 1655 info.addMember(inherited, "inherited"); |
| 1689 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); | 1656 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); |
| 1690 #if ENABLE(SVG) | 1657 #if ENABLE(SVG) |
| 1691 info.addMember(m_svgStyle, "svgStyle"); | 1658 info.addMember(m_svgStyle, "svgStyle"); |
| 1692 #endif | 1659 #endif |
| 1693 info.addMember(inherited_flags, "inherited_flags"); | 1660 info.addMember(inherited_flags, "inherited_flags"); |
| 1694 info.addMember(noninherited_flags, "noninherited_flags"); | 1661 info.addMember(noninherited_flags, "noninherited_flags"); |
| 1695 } | 1662 } |
| 1696 | 1663 |
| 1697 } // namespace WebCore | 1664 } // namespace WebCore |
| OLD | NEW |