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

Side by Side Diff: Source/WebCore/css/CSSParser.cpp

Issue 10140014: Merge 114699 - REGRESSION(r112177): Numbered list item rendered bulleted (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 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 Apple Inc. All r ights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights 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 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 3642 matching lines...) Expand 10 before | Expand all | Expand 10 after
3653 3653
3654 // now get z 3654 // now get z
3655 if (m_valueList->current()) { 3655 if (m_valueList->current()) {
3656 if (validUnit(m_valueList->current(), FLength)) { 3656 if (validUnit(m_valueList->current(), FLength)) {
3657 value3 = createPrimitiveNumericValue(m_valueList->current()); 3657 value3 = createPrimitiveNumericValue(m_valueList->current());
3658 m_valueList->next(); 3658 m_valueList->next();
3659 return true; 3659 return true;
3660 } 3660 }
3661 return false; 3661 return false;
3662 } 3662 }
3663 value3 = cssValuePool().createImplicitInitialValue();
3663 return true; 3664 return true;
3664 } 3665 }
3665 3666
3666 bool CSSParser::parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, d ouble& result) 3667 bool CSSParser::parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, d ouble& result)
3667 { 3668 {
3668 CSSParserValue* v = args->current(); 3669 CSSParserValue* v = args->current();
3669 if (!validUnit(v, FNumber)) 3670 if (!validUnit(v, FNumber))
3670 return false; 3671 return false;
3671 result = v->fValue; 3672 result = v->fValue;
3672 v = args->next(); 3673 v = args->next();
(...skipping 5914 matching lines...) Expand 10 before | Expand all | Expand 10 after
9587 { 9588 {
9588 // The tokenizer checks for the construct of an+b. 9589 // The tokenizer checks for the construct of an+b.
9589 // However, since the {ident} rule precedes the {nth} rule, some of those 9590 // However, since the {ident} rule precedes the {nth} rule, some of those
9590 // tokens are identified as string literal. Furthermore we need to accept 9591 // tokens are identified as string literal. Furthermore we need to accept
9591 // "odd" and "even" which does not match to an+b. 9592 // "odd" and "even" which does not match to an+b.
9592 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 9593 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
9593 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 9594 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
9594 } 9595 }
9595 9596
9596 } 9597 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/css-dom-read-2-expected.txt ('k') | Source/WebCore/css/StylePropertySet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698