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

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

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) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 && rareInheritedData.get() == other->rareInheritedData.get(); 227 && rareInheritedData.get() == other->rareInheritedData.get();
228 } 228 }
229 229
230 bool RenderStyle::requiresOnlyBlockChildren() 230 bool RenderStyle::requiresOnlyBlockChildren()
231 { 231 {
232 switch (display()) { 232 switch (display()) {
233 case PARAGRAPH: 233 case PARAGRAPH:
234 case INLINE: 234 case INLINE:
235 return false; 235 return false;
236 236
237 case BLOCK:
238 case FLEX: 237 case FLEX:
239 case INLINE_FLEX: 238 case INLINE_FLEX:
240 case INLINE_BLOCK:
241 return true; 239 return true;
242 240
243 case NONE: 241 case NONE:
244 ASSERT_NOT_REACHED(); 242 ASSERT_NOT_REACHED();
245 return false; 243 return false;
246 } 244 }
247 245
248 ASSERT_NOT_REACHED(); 246 ASSERT_NOT_REACHED();
249 return false; 247 return false;
250 } 248 }
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 // right 1186 // right
1189 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1187 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1190 if (radiiSum > rect.height()) 1188 if (radiiSum > rect.height())
1191 factor = std::min(rect.height() / radiiSum, factor); 1189 factor = std::min(rect.height() / radiiSum, factor);
1192 1190
1193 ASSERT(factor <= 1); 1191 ASSERT(factor <= 1);
1194 return factor; 1192 return factor;
1195 } 1193 }
1196 1194
1197 } // namespace blink 1195 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698