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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 762473003: Remove webkit-print-color-adjust (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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
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, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 && (_caption_side == other._caption_side) 136 && (_caption_side == other._caption_side)
137 && (_list_style_type == other._list_style_type) 137 && (_list_style_type == other._list_style_type)
138 && (_list_style_position == other._list_style_position) 138 && (_list_style_position == other._list_style_position)
139 && (_visibility == other._visibility) 139 && (_visibility == other._visibility)
140 && (_text_align == other._text_align) 140 && (_text_align == other._text_align)
141 && (m_textUnderline == other.m_textUnderline) 141 && (m_textUnderline == other.m_textUnderline)
142 && (_cursor_style == other._cursor_style) 142 && (_cursor_style == other._cursor_style)
143 && (_direction == other._direction) 143 && (_direction == other._direction)
144 && (_white_space == other._white_space) 144 && (_white_space == other._white_space)
145 && (m_rtlOrdering == other.m_rtlOrdering) 145 && (m_rtlOrdering == other.m_rtlOrdering)
146 && (m_printColorAdjust == other.m_printColorAdjust)
147 && (_pointerEvents == other._pointerEvents); 146 && (_pointerEvents == other._pointerEvents);
148 } 147 }
149 148
150 bool operator!=(const InheritedFlags& other) const { return !(*this == o ther); } 149 bool operator!=(const InheritedFlags& other) const { return !(*this == o ther); }
151 150
152 unsigned _empty_cells : 1; // EEmptyCell 151 unsigned _empty_cells : 1; // EEmptyCell
153 unsigned _caption_side : 2; // ECaptionSide 152 unsigned _caption_side : 2; // ECaptionSide
154 unsigned _list_style_type : 7; // EListStyleType 153 unsigned _list_style_type : 7; // EListStyleType
155 unsigned _list_style_position : 1; // EListStylePosition 154 unsigned _list_style_position : 1; // EListStylePosition
156 unsigned _visibility : 2; // EVisibility 155 unsigned _visibility : 2; // EVisibility
157 unsigned _text_align : 4; // ETextAlign 156 unsigned _text_align : 4; // ETextAlign
158 unsigned m_textUnderline : 1; 157 unsigned m_textUnderline : 1;
159 unsigned _cursor_style : 6; // ECursor 158 unsigned _cursor_style : 6; // ECursor
160 unsigned _direction : 1; // TextDirection 159 unsigned _direction : 1; // TextDirection
161 unsigned _white_space : 3; // EWhiteSpace 160 unsigned _white_space : 3; // EWhiteSpace
162 // 32 bits 161 // 32 bits
163 162
164 // non CSS2 inherited 163 // non CSS2 inherited
165 unsigned m_rtlOrdering : 1; // Order 164 unsigned m_rtlOrdering : 1; // Order
166 unsigned m_printColorAdjust : PrintColorAdjustBits;
167 unsigned _pointerEvents : 4; // EPointerEvents 165 unsigned _pointerEvents : 4; // EPointerEvents
168 } inherited_flags; 166 } inherited_flags;
169 167
170 // don't inherit 168 // don't inherit
171 struct NonInheritedFlags { 169 struct NonInheritedFlags {
172 bool operator==(const NonInheritedFlags& other) const 170 bool operator==(const NonInheritedFlags& other) const
173 { 171 {
174 return effectiveDisplay == other.effectiveDisplay 172 return effectiveDisplay == other.effectiveDisplay
175 && originalDisplay == other.originalDisplay 173 && originalDisplay == other.originalDisplay
176 && overflowX == other.overflowX 174 && overflowX == other.overflowX
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 inherited_flags._caption_side = initialCaptionSide(); 241 inherited_flags._caption_side = initialCaptionSide();
244 inherited_flags._list_style_type = initialListStyleType(); 242 inherited_flags._list_style_type = initialListStyleType();
245 inherited_flags._list_style_position = initialListStylePosition(); 243 inherited_flags._list_style_position = initialListStylePosition();
246 inherited_flags._visibility = initialVisibility(); 244 inherited_flags._visibility = initialVisibility();
247 inherited_flags._text_align = initialTextAlign(); 245 inherited_flags._text_align = initialTextAlign();
248 inherited_flags.m_textUnderline = false; 246 inherited_flags.m_textUnderline = false;
249 inherited_flags._cursor_style = initialCursor(); 247 inherited_flags._cursor_style = initialCursor();
250 inherited_flags._direction = initialDirection(); 248 inherited_flags._direction = initialDirection();
251 inherited_flags._white_space = initialWhiteSpace(); 249 inherited_flags._white_space = initialWhiteSpace();
252 inherited_flags.m_rtlOrdering = initialRTLOrdering(); 250 inherited_flags.m_rtlOrdering = initialRTLOrdering();
253 inherited_flags.m_printColorAdjust = initialPrintColorAdjust();
254 inherited_flags._pointerEvents = initialPointerEvents(); 251 inherited_flags._pointerEvents = initialPointerEvents();
255 252
256 noninherited_flags.effectiveDisplay = noninherited_flags.originalDisplay = initialDisplay(); 253 noninherited_flags.effectiveDisplay = noninherited_flags.originalDisplay = initialDisplay();
257 noninherited_flags.overflowX = initialOverflowX(); 254 noninherited_flags.overflowX = initialOverflowX();
258 noninherited_flags.overflowY = initialOverflowY(); 255 noninherited_flags.overflowY = initialOverflowY();
259 noninherited_flags.verticalAlign = initialVerticalAlign(); 256 noninherited_flags.verticalAlign = initialVerticalAlign();
260 noninherited_flags.position = initialPosition(); 257 noninherited_flags.position = initialPosition();
261 noninherited_flags.tableLayout = initialTableLayout(); 258 noninherited_flags.tableLayout = initialTableLayout();
262 noninherited_flags.unicodeBidi = initialUnicodeBidi(); 259 noninherited_flags.unicodeBidi = initialUnicodeBidi();
263 noninherited_flags.pageBreakBefore = initialPageBreak(); 260 noninherited_flags.pageBreakBefore = initialPageBreak();
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 void setPaddingLeft(const Length& v) { SET_VAR(surround, padding.m_left, v); } 1013 void setPaddingLeft(const Length& v) { SET_VAR(surround, padding.m_left, v); }
1017 void setPaddingRight(const Length& v) { SET_VAR(surround, padding.m_right, v ); } 1014 void setPaddingRight(const Length& v) { SET_VAR(surround, padding.m_right, v ); }
1018 1015
1019 void setCursor(ECursor c) { inherited_flags._cursor_style = c; } 1016 void setCursor(ECursor c) { inherited_flags._cursor_style = c; }
1020 void addCursor(PassRefPtr<StyleImage>, const IntPoint& hotSpot = IntPoint()) ; 1017 void addCursor(PassRefPtr<StyleImage>, const IntPoint& hotSpot = IntPoint()) ;
1021 void setCursorList(PassRefPtr<CursorList>); 1018 void setCursorList(PassRefPtr<CursorList>);
1022 void clearCursorList(); 1019 void clearCursorList();
1023 1020
1024 void setIsLink(bool b) { noninherited_flags.isLink = b; } 1021 void setIsLink(bool b) { noninherited_flags.isLink = b; }
1025 1022
1026 PrintColorAdjust printColorAdjust() const { return static_cast<PrintColorAdj ust>(inherited_flags.m_printColorAdjust); }
1027 void setPrintColorAdjust(PrintColorAdjust value) { inherited_flags.m_printCo lorAdjust = value; }
1028
1029 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); } 1023 bool hasAutoZIndex() const { return m_box->hasAutoZIndex(); }
1030 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); } 1024 void setHasAutoZIndex() { SET_VAR(m_box, m_hasAutoZIndex, true); SET_VAR(m_b ox, m_zIndex, 0); }
1031 int zIndex() const { return m_box->zIndex(); } 1025 int zIndex() const { return m_box->zIndex(); }
1032 void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_bo x, m_zIndex, v); } 1026 void setZIndex(int v) { SET_VAR(m_box, m_hasAutoZIndex, false); SET_VAR(m_bo x, m_zIndex, v); }
1033 1027
1034 void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); } 1028 void setHasAutoWidows() { SET_VAR(rareInheritedData, m_hasAutoWidows, true); SET_VAR(rareInheritedData, widows, initialWidows()); }
1035 void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false) ; SET_VAR(rareInheritedData, widows, w); } 1029 void setWidows(short w) { SET_VAR(rareInheritedData, m_hasAutoWidows, false) ; SET_VAR(rareInheritedData, widows, w); }
1036 1030
1037 void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true ); SET_VAR(rareInheritedData, orphans, initialOrphans()); } 1031 void setHasAutoOrphans() { SET_VAR(rareInheritedData, m_hasAutoOrphans, true ); SET_VAR(rareInheritedData, orphans, initialOrphans()); }
1038 void setOrphans(short o) { SET_VAR(rareInheritedData, m_hasAutoOrphans, fals e); SET_VAR(rareInheritedData, orphans, o); } 1032 void setOrphans(short o) { SET_VAR(rareInheritedData, m_hasAutoOrphans, fals e); SET_VAR(rareInheritedData, orphans, o); }
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 static const AtomicString& initialTextEmphasisCustomMark() { return nullAtom ; } 1312 static const AtomicString& initialTextEmphasisCustomMark() { return nullAtom ; }
1319 static TextEmphasisPosition initialTextEmphasisPosition() { return TextEmpha sisPositionOver; } 1313 static TextEmphasisPosition initialTextEmphasisPosition() { return TextEmpha sisPositionOver; }
1320 static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; } 1314 static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; }
1321 static ImageOrientationEnum initialImageOrientation() { return OriginTopLeft ; } 1315 static ImageOrientationEnum initialImageOrientation() { return OriginTopLeft ; }
1322 static EImageRendering initialImageRendering() { return ImageRenderingAuto; } 1316 static EImageRendering initialImageRendering() { return ImageRenderingAuto; }
1323 static ImageResolutionSource initialImageResolutionSource() { return ImageRe solutionSpecified; } 1317 static ImageResolutionSource initialImageResolutionSource() { return ImageRe solutionSpecified; }
1324 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu tionNoSnap; } 1318 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu tionNoSnap; }
1325 static float initialImageResolution() { return 1; } 1319 static float initialImageResolution() { return 1; }
1326 static StyleImage* initialBorderImageSource() { return 0; } 1320 static StyleImage* initialBorderImageSource() { return 0; }
1327 static StyleImage* initialMaskBoxImageSource() { return 0; } 1321 static StyleImage* initialMaskBoxImageSource() { return 0; }
1328 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE conomy; }
1329 static TouchAction initialTouchAction() { return TouchActionAuto; } 1322 static TouchAction initialTouchAction() { return TouchActionAuto; }
1330 static TouchActionDelay initialTouchActionDelay() { return TouchActionDelayS cript; } 1323 static TouchActionDelay initialTouchActionDelay() { return TouchActionDelayS cript; }
1331 static ShadowList* initialBoxShadow() { return 0; } 1324 static ShadowList* initialBoxShadow() { return 0; }
1332 static ShadowList* initialTextShadow() { return 0; } 1325 static ShadowList* initialTextShadow() { return 0; }
1333 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; } 1326 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; }
1334 1327
1335 static unsigned initialTabSize() { return 8; } 1328 static unsigned initialTabSize() { return 8; }
1336 1329
1337 static WrapFlow initialWrapFlow() { return WrapFlowAuto; } 1330 static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
1338 static WrapThrough initialWrapThrough() { return WrapThroughWrap; } 1331 static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1412 1405
1413 rareInheritedData.access()->m_textOrientation = textOrientation; 1406 rareInheritedData.access()->m_textOrientation = textOrientation;
1414 return true; 1407 return true;
1415 } 1408 }
1416 1409
1417 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1410 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1418 1411
1419 } // namespace blink 1412 } // namespace blink
1420 1413
1421 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_ 1414 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/BisonCSSParser-in.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698