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

Side by Side Diff: sky/engine/core/css/parser/CSSPropertyParser.cpp

Issue 1061163002: Remove all uses of display:block and display:inline-block. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: update one more usage 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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 4239 matching lines...) Expand 10 before | Expand all | Expand 10 after
4250 } 4250 }
4251 4251
4252 return nullptr; 4252 return nullptr;
4253 } 4253 }
4254 4254
4255 static bool isFlexBasisMiddleArg(double flexGrow, double flexShrink, double unse tValue, int argSize) 4255 static bool isFlexBasisMiddleArg(double flexGrow, double flexShrink, double unse tValue, int argSize)
4256 { 4256 {
4257 return flexGrow != unsetValue && flexShrink == unsetValue && argSize == 3; 4257 return flexGrow != unsetValue && flexShrink == unsetValue && argSize == 3;
4258 } 4258 }
4259 4259
4260 // TODO(ojan): Make this have reasonable defaults.
4260 bool CSSPropertyParser::parseFlex(CSSParserValueList* args) 4261 bool CSSPropertyParser::parseFlex(CSSParserValueList* args)
4261 { 4262 {
4262 if (!args || !args->size() || args->size() > 3) 4263 if (!args || !args->size() || args->size() > 3)
4263 return false; 4264 return false;
4264 static const double unsetValue = -1; 4265 static const double unsetValue = -1;
4265 double flexGrow = unsetValue; 4266 double flexGrow = unsetValue;
4266 double flexShrink = unsetValue; 4267 double flexShrink = unsetValue;
4267 RefPtr<CSSPrimitiveValue> flexBasis = nullptr; 4268 RefPtr<CSSPrimitiveValue> flexBasis = nullptr;
4268 4269
4269 while (CSSParserValue* arg = args->current()) { 4270 while (CSSParserValue* arg = args->current()) {
(...skipping 1761 matching lines...) Expand 10 before | Expand all | Expand 10 after
6031 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 6032 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
6032 } 6033 }
6033 6034
6034 bool CSSPropertyParser::isSystemColor(int id) 6035 bool CSSPropertyParser::isSystemColor(int id)
6035 { 6036 {
6036 // FIXME(sky): remove 6037 // FIXME(sky): remove
6037 return false; 6038 return false;
6038 } 6039 }
6039 6040
6040 } // namespace blink 6041 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('j') | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698