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

Side by Side Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 651123003: Use count strings as keyframes/animation-name identifiers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Bug fix Created 6 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/parser/CSSGrammar.y ('k') | Source/core/frame/UseCounter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2906 matching lines...) Expand 10 before | Expand all | Expand 10 after
2917 if (validUnit(value, FNumber | FNonNeg)) 2917 if (validUnit(value, FNumber | FNonNeg))
2918 return createPrimitiveNumericValue(value); 2918 return createPrimitiveNumericValue(value);
2919 return nullptr; 2919 return nullptr;
2920 } 2920 }
2921 2921
2922 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAnimationName() 2922 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAnimationName()
2923 { 2923 {
2924 CSSParserValue* value = m_valueList->current(); 2924 CSSParserValue* value = m_valueList->current();
2925 // FIXME: Strings are not valid as per spec 2925 // FIXME: Strings are not valid as per spec
2926 if (value->unit == CSSPrimitiveValue::CSS_STRING || value->unit == CSSPrimit iveValue::CSS_IDENT) { 2926 if (value->unit == CSSPrimitiveValue::CSS_STRING || value->unit == CSSPrimit iveValue::CSS_IDENT) {
2927 if (value->unit == CSSPrimitiveValue::CSS_STRING)
2928 m_context.useCounter()->count(UseCounter::QuotedAnimationName);
2927 if (value->id == CSSValueNone || (value->unit == CSSPrimitiveValue::CSS_ STRING && equalIgnoringCase(value->string, "none"))) 2929 if (value->id == CSSValueNone || (value->unit == CSSPrimitiveValue::CSS_ STRING && equalIgnoringCase(value->string, "none")))
2928 return cssValuePool().createIdentifierValue(CSSValueNone); 2930 return cssValuePool().createIdentifierValue(CSSValueNone);
2929 return createPrimitiveStringValue(value); 2931 return createPrimitiveStringValue(value);
2930 } 2932 }
2931 return nullptr; 2933 return nullptr;
2932 } 2934 }
2933 2935
2934 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAnimationPlayState() 2936 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAnimationPlayState()
2935 { 2937 {
2936 CSSParserValue* value = m_valueList->current(); 2938 CSSParserValue* value = m_valueList->current();
(...skipping 5404 matching lines...) Expand 10 before | Expand all | Expand 10 after
8341 return nullptr; 8343 return nullptr;
8342 a = args->next(); 8344 a = args->next();
8343 8345
8344 argNumber++; 8346 argNumber++;
8345 } 8347 }
8346 8348
8347 return transformValue.release(); 8349 return transformValue.release();
8348 } 8350 }
8349 8351
8350 } // namespace blink 8352 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSGrammar.y ('k') | Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698