Chromium Code Reviews

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

Issue 14576017: Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a typo in css-properties-as-js-properties-expected-expected.txt Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 114 matching lines...)
125 125
126 LengthSize m_pageSize; 126 LengthSize m_pageSize;
127 127
128 RefPtr<ExclusionShapeValue> m_shapeInside; 128 RefPtr<ExclusionShapeValue> m_shapeInside;
129 RefPtr<ExclusionShapeValue> m_shapeOutside; 129 RefPtr<ExclusionShapeValue> m_shapeOutside;
130 Length m_shapeMargin; 130 Length m_shapeMargin;
131 Length m_shapePadding; 131 Length m_shapePadding;
132 132
133 RefPtr<ClipPathOperation> m_clipPath; 133 RefPtr<ClipPathOperation> m_clipPath;
134 134
135 #if ENABLE(CSS3_TEXT)
136 Color m_textDecorationColor; 135 Color m_textDecorationColor;
137 Color m_visitedLinkTextDecorationColor; 136 Color m_visitedLinkTextDecorationColor;
138 #endif // CSS3_TEXT
139 Color m_visitedLinkBackgroundColor; 137 Color m_visitedLinkBackgroundColor;
140 Color m_visitedLinkOutlineColor; 138 Color m_visitedLinkOutlineColor;
141 Color m_visitedLinkBorderLeftColor; 139 Color m_visitedLinkBorderLeftColor;
142 Color m_visitedLinkBorderRightColor; 140 Color m_visitedLinkBorderRightColor;
143 Color m_visitedLinkBorderTopColor; 141 Color m_visitedLinkBorderTopColor;
144 Color m_visitedLinkBorderBottomColor; 142 Color m_visitedLinkBorderBottomColor;
145 143
146 int m_order; 144 int m_order;
147 145
148 AtomicString m_flowThread; 146 AtomicString m_flowThread;
(...skipping 14 matching lines...)
163 unsigned m_justifyContent : 3; // EJustifyContent 161 unsigned m_justifyContent : 3; // EJustifyContent
164 162
165 unsigned userDrag : 2; // EUserDrag 163 unsigned userDrag : 2; // EUserDrag
166 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." 164 unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
167 unsigned marginBeforeCollapse : 2; // EMarginCollapse 165 unsigned marginBeforeCollapse : 2; // EMarginCollapse
168 unsigned marginAfterCollapse : 2; // EMarginCollapse 166 unsigned marginAfterCollapse : 2; // EMarginCollapse
169 unsigned m_appearance : 6; // EAppearance 167 unsigned m_appearance : 6; // EAppearance
170 unsigned m_borderFit : 1; // EBorderFit 168 unsigned m_borderFit : 1; // EBorderFit
171 unsigned m_textCombine : 1; // CSS3 text-combine properties 169 unsigned m_textCombine : 1; // CSS3 text-combine properties
172 170
173 #if ENABLE(CSS3_TEXT)
174 unsigned m_textDecorationStyle : 3; // TextDecorationStyle 171 unsigned m_textDecorationStyle : 3; // TextDecorationStyle
175 #endif // CSS3_TEXT
176 unsigned m_wrapFlow: 3; // WrapFlow 172 unsigned m_wrapFlow: 3; // WrapFlow
177 unsigned m_wrapThrough: 1; // WrapThrough 173 unsigned m_wrapThrough: 1; // WrapThrough
178 174
179 unsigned m_runningAcceleratedAnimation : 1; 175 unsigned m_runningAcceleratedAnimation : 1;
180 176
181 unsigned m_hasAspectRatio : 1; // Whether or not an aspect ratio has been sp ecified. 177 unsigned m_hasAspectRatio : 1; // Whether or not an aspect ratio has been sp ecified.
182 178
183 unsigned m_effectiveBlendMode: 5; // EBlendMode 179 unsigned m_effectiveBlendMode: 5; // EBlendMode
184 180
185 private: 181 private:
186 StyleRareNonInheritedData(); 182 StyleRareNonInheritedData();
187 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 183 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
188 }; 184 };
189 185
190 } // namespace WebCore 186 } // namespace WebCore
191 187
192 #endif // StyleRareNonInheritedData_h 188 #endif // StyleRareNonInheritedData_h
OLDNEW

Powered by Google App Engine