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

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

Issue 1060223002: Remove parsing for display:block/inline-block. (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
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 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 return getShadowVerticalExtent(shadow, logicalTop, logicalBottom); 1254 return getShadowVerticalExtent(shadow, logicalTop, logicalBottom);
1255 } 1255 }
1256 1256
1257 bool isDisplayFlexibleBox(EDisplay display) const 1257 bool isDisplayFlexibleBox(EDisplay display) const
1258 { 1258 {
1259 return display == FLEX || display == INLINE_FLEX; 1259 return display == FLEX || display == INLINE_FLEX;
1260 } 1260 }
1261 1261
1262 bool isDisplayReplacedType(EDisplay display) const 1262 bool isDisplayReplacedType(EDisplay display) const
1263 { 1263 {
1264 return display == INLINE_BLOCK || display == INLINE_FLEX; 1264 return display == INLINE_FLEX;
1265 } 1265 }
1266 1266
1267 bool isDisplayInlineType(EDisplay display) const 1267 bool isDisplayInlineType(EDisplay display) const
1268 { 1268 {
1269 return display == INLINE || isDisplayReplacedType(display); 1269 return display == INLINE || isDisplayReplacedType(display);
1270 } 1270 }
1271 1271
1272 // Color accessors are all private to make sure callers use colorIncludingFa llback instead to access them. 1272 // Color accessors are all private to make sure callers use colorIncludingFa llback instead to access them.
1273 StyleColor borderLeftColor() const { return surround->border.left().color(); } 1273 StyleColor borderLeftColor() const { return surround->border.left().color(); }
1274 StyleColor borderRightColor() const { return surround->border.right().color( ); } 1274 StyleColor borderRightColor() const { return surround->border.right().color( ); }
(...skipping 27 matching lines...) Expand all
1302 1302
1303 rareInheritedData.access()->m_textOrientation = textOrientation; 1303 rareInheritedData.access()->m_textOrientation = textOrientation;
1304 return true; 1304 return true;
1305 } 1305 }
1306 1306
1307 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1307 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1308 1308
1309 } // namespace blink 1309 } // namespace blink
1310 1310
1311 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_ 1311 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698