| 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 | 320 |
| 321 bool CSSPropertyParser::validWidthOrHeight(CSSParserValue* value, Units unitless
) | 321 bool CSSPropertyParser::validWidthOrHeight(CSSParserValue* value, Units unitless
) |
| 322 { | 322 { |
| 323 int id = value->id; | 323 int id = value->id; |
| 324 if (id == CSSValueIntrinsic || id == CSSValueMinIntrinsic | 324 if (id == CSSValueIntrinsic || id == CSSValueMinIntrinsic |
| 325 || id == CSSValueWebkitMinContent || id == CSSValueWebkitMaxContent || i
d == CSSValueWebkitFillAvailable || id == CSSValueWebkitFitContent | 325 || id == CSSValueWebkitMinContent || id == CSSValueWebkitMaxContent || i
d == CSSValueWebkitFillAvailable || id == CSSValueWebkitFitContent |
| 326 || id == CSSValueMinContent || id == CSSValueMaxContent || id == CSSValu
eFitContent) { | 326 || id == CSSValueMinContent || id == CSSValueMaxContent || id == CSSValu
eFitContent) { |
| 327 if (m_context.useCounter()) { | 327 if (m_context.useCounter()) { |
| 328 switch (value->id) { | 328 switch (value->id) { |
| 329 case CSSValueIntrinsic: | 329 case CSSValueIntrinsic: |
| 330 m_context.useCounter()->count(UseCounter::LegacyCSSValueIntrinsi
c); | |
| 331 break; | |
| 332 case CSSValueMinIntrinsic: | 330 case CSSValueMinIntrinsic: |
| 333 m_context.useCounter()->count(UseCounter::LegacyCSSValueMinIntri
nsic); | 331 // These two will be counted in StyleAdjuster because they emit
a deprecation |
| 332 // message, and we don't have access to a Document/LocalFrame he
re. |
| 334 break; | 333 break; |
| 335 case CSSValueWebkitMinContent: | 334 case CSSValueWebkitMinContent: |
| 336 m_context.useCounter()->count(UseCounter::CSSValuePrefixedMinCon
tent); | 335 m_context.useCounter()->count(UseCounter::CSSValuePrefixedMinCon
tent); |
| 337 break; | 336 break; |
| 338 case CSSValueWebkitMaxContent: | 337 case CSSValueWebkitMaxContent: |
| 339 m_context.useCounter()->count(UseCounter::CSSValuePrefixedMaxCon
tent); | 338 m_context.useCounter()->count(UseCounter::CSSValuePrefixedMaxCon
tent); |
| 340 break; | 339 break; |
| 341 case CSSValueWebkitFillAvailable: | 340 case CSSValueWebkitFillAvailable: |
| 342 m_context.useCounter()->count(UseCounter::CSSValuePrefixedFillAv
ailable); | 341 m_context.useCounter()->count(UseCounter::CSSValuePrefixedFillAv
ailable); |
| 343 break; | 342 break; |
| (...skipping 7383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7727 } | 7726 } |
| 7728 } | 7727 } |
| 7729 | 7728 |
| 7730 if (!list->length()) | 7729 if (!list->length()) |
| 7731 return nullptr; | 7730 return nullptr; |
| 7732 | 7731 |
| 7733 return list.release(); | 7732 return list.release(); |
| 7734 } | 7733 } |
| 7735 | 7734 |
| 7736 } // namespace blink | 7735 } // namespace blink |
| OLD | NEW |