Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Side by Side Diff: Source/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed updated on text-underline-position for now (to be discussed & re-added later) Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 , m_alignItems(RenderStyle::initialAlignItems()) 68 , m_alignItems(RenderStyle::initialAlignItems())
69 , m_alignSelf(RenderStyle::initialAlignSelf()) 69 , m_alignSelf(RenderStyle::initialAlignSelf())
70 , m_justifyContent(RenderStyle::initialJustifyContent()) 70 , m_justifyContent(RenderStyle::initialJustifyContent())
71 , userDrag(RenderStyle::initialUserDrag()) 71 , userDrag(RenderStyle::initialUserDrag())
72 , textOverflow(RenderStyle::initialTextOverflow()) 72 , textOverflow(RenderStyle::initialTextOverflow())
73 , marginBeforeCollapse(MCOLLAPSE) 73 , marginBeforeCollapse(MCOLLAPSE)
74 , marginAfterCollapse(MCOLLAPSE) 74 , marginAfterCollapse(MCOLLAPSE)
75 , m_appearance(RenderStyle::initialAppearance()) 75 , m_appearance(RenderStyle::initialAppearance())
76 , m_borderFit(RenderStyle::initialBorderFit()) 76 , m_borderFit(RenderStyle::initialBorderFit())
77 , m_textCombine(RenderStyle::initialTextCombine()) 77 , m_textCombine(RenderStyle::initialTextCombine())
78 #if ENABLE(CSS3_TEXT)
79 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 78 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
80 #endif // CSS3_TEXT
81 , m_wrapFlow(RenderStyle::initialWrapFlow()) 79 , m_wrapFlow(RenderStyle::initialWrapFlow())
82 , m_wrapThrough(RenderStyle::initialWrapThrough()) 80 , m_wrapThrough(RenderStyle::initialWrapThrough())
83 , m_runningAcceleratedAnimation(false) 81 , m_runningAcceleratedAnimation(false)
84 , m_hasAspectRatio(false) 82 , m_hasAspectRatio(false)
85 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) 83 , m_effectiveBlendMode(RenderStyle::initialBlendMode())
86 { 84 {
87 m_maskBoxImage.setMaskDefaults(); 85 m_maskBoxImage.setMaskDefaults();
88 } 86 }
89 87
90 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 88 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
(...skipping 21 matching lines...) Expand all
112 , m_animations(o.m_animations ? adoptPtr(new CSSAnimationDataList(*o.m_anima tions)) : nullptr) 110 , m_animations(o.m_animations ? adoptPtr(new CSSAnimationDataList(*o.m_anima tions)) : nullptr)
113 , m_transitions(o.m_transitions ? adoptPtr(new CSSAnimationDataList(*o.m_tra nsitions)) : nullptr) 111 , m_transitions(o.m_transitions ? adoptPtr(new CSSAnimationDataList(*o.m_tra nsitions)) : nullptr)
114 , m_mask(o.m_mask) 112 , m_mask(o.m_mask)
115 , m_maskBoxImage(o.m_maskBoxImage) 113 , m_maskBoxImage(o.m_maskBoxImage)
116 , m_pageSize(o.m_pageSize) 114 , m_pageSize(o.m_pageSize)
117 , m_shapeInside(o.m_shapeInside) 115 , m_shapeInside(o.m_shapeInside)
118 , m_shapeOutside(o.m_shapeOutside) 116 , m_shapeOutside(o.m_shapeOutside)
119 , m_shapeMargin(o.m_shapeMargin) 117 , m_shapeMargin(o.m_shapeMargin)
120 , m_shapePadding(o.m_shapePadding) 118 , m_shapePadding(o.m_shapePadding)
121 , m_clipPath(o.m_clipPath) 119 , m_clipPath(o.m_clipPath)
122 #if ENABLE(CSS3_TEXT)
123 , m_textDecorationColor(o.m_textDecorationColor) 120 , m_textDecorationColor(o.m_textDecorationColor)
124 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor) 121 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
125 #endif // CSS3_TEXT
126 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) 122 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
127 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor) 123 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
128 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor) 124 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
129 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor) 125 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor)
130 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor) 126 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
131 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor) 127 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
132 , m_order(o.m_order) 128 , m_order(o.m_order)
133 , m_flowThread(o.m_flowThread) 129 , m_flowThread(o.m_flowThread)
134 , m_regionThread(o.m_regionThread) 130 , m_regionThread(o.m_regionThread)
135 , m_regionOverflow(o.m_regionOverflow) 131 , m_regionOverflow(o.m_regionOverflow)
136 , m_regionBreakAfter(o.m_regionBreakAfter) 132 , m_regionBreakAfter(o.m_regionBreakAfter)
137 , m_regionBreakBefore(o.m_regionBreakBefore) 133 , m_regionBreakBefore(o.m_regionBreakBefore)
138 , m_regionBreakInside(o.m_regionBreakInside) 134 , m_regionBreakInside(o.m_regionBreakInside)
139 , m_pageSizeType(o.m_pageSizeType) 135 , m_pageSizeType(o.m_pageSizeType)
140 , m_transformStyle3D(o.m_transformStyle3D) 136 , m_transformStyle3D(o.m_transformStyle3D)
141 , m_backfaceVisibility(o.m_backfaceVisibility) 137 , m_backfaceVisibility(o.m_backfaceVisibility)
142 , m_alignContent(o.m_alignContent) 138 , m_alignContent(o.m_alignContent)
143 , m_alignItems(o.m_alignItems) 139 , m_alignItems(o.m_alignItems)
144 , m_alignSelf(o.m_alignSelf) 140 , m_alignSelf(o.m_alignSelf)
145 , m_justifyContent(o.m_justifyContent) 141 , m_justifyContent(o.m_justifyContent)
146 , userDrag(o.userDrag) 142 , userDrag(o.userDrag)
147 , textOverflow(o.textOverflow) 143 , textOverflow(o.textOverflow)
148 , marginBeforeCollapse(o.marginBeforeCollapse) 144 , marginBeforeCollapse(o.marginBeforeCollapse)
149 , marginAfterCollapse(o.marginAfterCollapse) 145 , marginAfterCollapse(o.marginAfterCollapse)
150 , m_appearance(o.m_appearance) 146 , m_appearance(o.m_appearance)
151 , m_borderFit(o.m_borderFit) 147 , m_borderFit(o.m_borderFit)
152 , m_textCombine(o.m_textCombine) 148 , m_textCombine(o.m_textCombine)
153 #if ENABLE(CSS3_TEXT)
154 , m_textDecorationStyle(o.m_textDecorationStyle) 149 , m_textDecorationStyle(o.m_textDecorationStyle)
155 #endif // CSS3_TEXT
156 , m_wrapFlow(o.m_wrapFlow) 150 , m_wrapFlow(o.m_wrapFlow)
157 , m_wrapThrough(o.m_wrapThrough) 151 , m_wrapThrough(o.m_wrapThrough)
158 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) 152 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
159 , m_hasAspectRatio(o.m_hasAspectRatio) 153 , m_hasAspectRatio(o.m_hasAspectRatio)
160 , m_effectiveBlendMode(o.m_effectiveBlendMode) 154 , m_effectiveBlendMode(o.m_effectiveBlendMode)
161 { 155 {
162 } 156 }
163 157
164 StyleRareNonInheritedData::~StyleRareNonInheritedData() 158 StyleRareNonInheritedData::~StyleRareNonInheritedData()
165 { 159 {
(...skipping 24 matching lines...) Expand all
190 && animationDataEquivalent(o) 184 && animationDataEquivalent(o)
191 && transitionDataEquivalent(o) 185 && transitionDataEquivalent(o)
192 && m_mask == o.m_mask 186 && m_mask == o.m_mask
193 && m_maskBoxImage == o.m_maskBoxImage 187 && m_maskBoxImage == o.m_maskBoxImage
194 && m_pageSize == o.m_pageSize 188 && m_pageSize == o.m_pageSize
195 && m_shapeInside == o.m_shapeInside 189 && m_shapeInside == o.m_shapeInside
196 && m_shapeOutside == o.m_shapeOutside 190 && m_shapeOutside == o.m_shapeOutside
197 && m_shapeMargin == o.m_shapeMargin 191 && m_shapeMargin == o.m_shapeMargin
198 && m_shapePadding == o.m_shapePadding 192 && m_shapePadding == o.m_shapePadding
199 && m_clipPath == o.m_clipPath 193 && m_clipPath == o.m_clipPath
200 #if ENABLE(CSS3_TEXT)
201 && m_textDecorationColor == o.m_textDecorationColor 194 && m_textDecorationColor == o.m_textDecorationColor
202 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r 195 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r
203 #endif // CSS3_TEXT
204 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor 196 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
205 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor 197 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
206 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor 198 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
207 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor 199 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor
208 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor 200 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
209 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor 201 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
210 && m_order == o.m_order 202 && m_order == o.m_order
211 && m_flowThread == o.m_flowThread 203 && m_flowThread == o.m_flowThread
212 && m_regionThread == o.m_regionThread 204 && m_regionThread == o.m_regionThread
213 && m_regionOverflow == o.m_regionOverflow 205 && m_regionOverflow == o.m_regionOverflow
214 && m_regionBreakAfter == o.m_regionBreakAfter 206 && m_regionBreakAfter == o.m_regionBreakAfter
215 && m_regionBreakBefore == o.m_regionBreakBefore 207 && m_regionBreakBefore == o.m_regionBreakBefore
216 && m_regionBreakInside == o.m_regionBreakInside 208 && m_regionBreakInside == o.m_regionBreakInside
217 && m_pageSizeType == o.m_pageSizeType 209 && m_pageSizeType == o.m_pageSizeType
218 && m_transformStyle3D == o.m_transformStyle3D 210 && m_transformStyle3D == o.m_transformStyle3D
219 && m_backfaceVisibility == o.m_backfaceVisibility 211 && m_backfaceVisibility == o.m_backfaceVisibility
220 && m_alignContent == o.m_alignContent 212 && m_alignContent == o.m_alignContent
221 && m_alignItems == o.m_alignItems 213 && m_alignItems == o.m_alignItems
222 && m_alignSelf == o.m_alignSelf 214 && m_alignSelf == o.m_alignSelf
223 && m_justifyContent == o.m_justifyContent 215 && m_justifyContent == o.m_justifyContent
224 && userDrag == o.userDrag 216 && userDrag == o.userDrag
225 && textOverflow == o.textOverflow 217 && textOverflow == o.textOverflow
226 && marginBeforeCollapse == o.marginBeforeCollapse 218 && marginBeforeCollapse == o.marginBeforeCollapse
227 && marginAfterCollapse == o.marginAfterCollapse 219 && marginAfterCollapse == o.marginAfterCollapse
228 && m_appearance == o.m_appearance 220 && m_appearance == o.m_appearance
229 && m_borderFit == o.m_borderFit 221 && m_borderFit == o.m_borderFit
230 && m_textCombine == o.m_textCombine 222 && m_textCombine == o.m_textCombine
231 #if ENABLE(CSS3_TEXT)
232 && m_textDecorationStyle == o.m_textDecorationStyle 223 && m_textDecorationStyle == o.m_textDecorationStyle
233 #endif // CSS3_TEXT
234 && m_wrapFlow == o.m_wrapFlow 224 && m_wrapFlow == o.m_wrapFlow
235 && m_wrapThrough == o.m_wrapThrough 225 && m_wrapThrough == o.m_wrapThrough
236 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation 226 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
237 && m_effectiveBlendMode == o.m_effectiveBlendMode 227 && m_effectiveBlendMode == o.m_effectiveBlendMode
238 && m_hasAspectRatio == o.m_hasAspectRatio; 228 && m_hasAspectRatio == o.m_hasAspectRatio;
239 } 229 }
240 230
241 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 231 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
242 { 232 {
243 ContentData* a = m_content.get(); 233 ContentData* a = m_content.get();
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 info.addMember(m_regionThread, "regionThread"); 313 info.addMember(m_regionThread, "regionThread");
324 314
325 info.ignoreMember(m_perspectiveOriginX); 315 info.ignoreMember(m_perspectiveOriginX);
326 info.ignoreMember(m_perspectiveOriginY); 316 info.ignoreMember(m_perspectiveOriginY);
327 info.ignoreMember(m_pageSize); 317 info.ignoreMember(m_pageSize);
328 info.ignoreMember(m_shapeMargin); 318 info.ignoreMember(m_shapeMargin);
329 info.ignoreMember(m_shapePadding); 319 info.ignoreMember(m_shapePadding);
330 } 320 }
331 321
332 } // namespace WebCore 322 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698