OLD | NEW |
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 4597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4608 value = m_valueList->next(); | 4608 value = m_valueList->next(); |
4609 familyBuilder.commit(); | 4609 familyBuilder.commit(); |
4610 inFamily = false; | 4610 inFamily = false; |
4611 } | 4611 } |
4612 else if (nextValIsFontName) | 4612 else if (nextValIsFontName) |
4613 value = nextValue; | 4613 value = nextValue; |
4614 else | 4614 else |
4615 break; | 4615 break; |
4616 } | 4616 } |
4617 familyBuilder.commit(); | 4617 familyBuilder.commit(); |
4618 | 4618 if (!list->length() || (m_ruleType == StyleRule::FontFace && list->length()
> 1)) |
4619 if (!list->length()) | |
4620 list = nullptr; | 4619 list = nullptr; |
4621 return list.release(); | 4620 return list.release(); |
4622 } | 4621 } |
4623 | 4622 |
4624 bool CSSPropertyParser::parseLineHeight(bool important) | 4623 bool CSSPropertyParser::parseLineHeight(bool important) |
4625 { | 4624 { |
4626 CSSParserValue* value = m_valueList->current(); | 4625 CSSParserValue* value = m_valueList->current(); |
4627 CSSValueID id = value->id; | 4626 CSSValueID id = value->id; |
4628 bool validPrimitive = false; | 4627 bool validPrimitive = false; |
4629 // normal | <number> | <length> | <percentage> | inherit | 4628 // normal | <number> | <length> | <percentage> | inherit |
(...skipping 3794 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8424 } | 8423 } |
8425 } | 8424 } |
8426 | 8425 |
8427 if (!list->length()) | 8426 if (!list->length()) |
8428 return nullptr; | 8427 return nullptr; |
8429 | 8428 |
8430 return list.release(); | 8429 return list.release(); |
8431 } | 8430 } |
8432 | 8431 |
8433 } // namespace blink | 8432 } // namespace blink |
OLD | NEW |