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

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

Issue 1067293003: Fix Android build. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 | « no previous file | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | 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) 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 bool operator!=(const InheritedFlags& other) const { return !(*this == o ther); } 145 bool operator!=(const InheritedFlags& other) const { return !(*this == o ther); }
146 146
147 unsigned _empty_cells : 1; // EEmptyCell 147 unsigned _empty_cells : 1; // EEmptyCell
148 unsigned _caption_side : 2; // ECaptionSide 148 unsigned _caption_side : 2; // ECaptionSide
149 unsigned _visibility : 2; // EVisibility 149 unsigned _visibility : 2; // EVisibility
150 unsigned _text_align : 4; // ETextAlign 150 unsigned _text_align : 4; // ETextAlign
151 unsigned m_textUnderline : 1; 151 unsigned m_textUnderline : 1;
152 unsigned _direction : 1; // TextDirection 152 unsigned _direction : 1; // TextDirection
153 unsigned _white_space : 3; // EWhiteSpace 153 unsigned _white_space : 3; // EWhiteSpace
154 // 32 bits
155 154
156 // non CSS2 inherited 155 // non CSS2 inherited
157 unsigned m_rtlOrdering : 1; // Order 156 unsigned m_rtlOrdering : 1; // Order
158 unsigned _pointerEvents : 4; // EPointerEvents 157 unsigned _pointerEvents : 4; // EPointerEvents
158
159 // 19 bits
159 } inherited_flags; 160 } inherited_flags;
160 161
161 // don't inherit 162 // don't inherit
162 struct NonInheritedFlags { 163 struct NonInheritedFlags {
163 bool operator==(const NonInheritedFlags& other) const 164 bool operator==(const NonInheritedFlags& other) const
164 { 165 {
165 return effectiveDisplay == other.effectiveDisplay 166 return effectiveDisplay == other.effectiveDisplay
166 && originalDisplay == other.originalDisplay 167 && originalDisplay == other.originalDisplay
167 && overflowX == other.overflowX 168 && overflowX == other.overflowX
168 && overflowY == other.overflowY 169 && overflowY == other.overflowY
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 1274
1274 rareInheritedData.access()->m_textOrientation = textOrientation; 1275 rareInheritedData.access()->m_textOrientation = textOrientation;
1275 return true; 1276 return true;
1276 } 1277 }
1277 1278
1278 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1279 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1279 1280
1280 } // namespace blink 1281 } // namespace blink
1281 1282
1282 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_ 1283 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698