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

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

Issue 1151893003: Properties labelled !important must be ignored in keyframes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressing comments Created 5 years, 6 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
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.cpp ('k') | no next file » | 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 int parsedPropertiesSize = parsedProperties.size(); 103 int parsedPropertiesSize = parsedProperties.size();
104 104
105 CSSPropertyParser parser(valueList, context, parsedProperties, ruleType); 105 CSSPropertyParser parser(valueList, context, parsedProperties, ruleType);
106 CSSPropertyID resolvedProperty = resolveCSSPropertyID(unresolvedProperty); 106 CSSPropertyID resolvedProperty = resolveCSSPropertyID(unresolvedProperty);
107 bool parseSuccess; 107 bool parseSuccess;
108 108
109 if (ruleType == StyleRule::Viewport) { 109 if (ruleType == StyleRule::Viewport) {
110 parseSuccess = (RuntimeEnabledFeatures::cssViewportEnabled() || isUAShee tBehavior(context.mode())) 110 parseSuccess = (RuntimeEnabledFeatures::cssViewportEnabled() || isUAShee tBehavior(context.mode()))
111 && parser.parseViewportProperty(resolvedProperty, important); 111 && parser.parseViewportProperty(resolvedProperty, important);
112 } else if (ruleType == StyleRule::FontFace) { 112 } else if (ruleType == StyleRule::FontFace) {
113 parseSuccess = !important && parser.parseFontFaceDescriptor(resolvedProp erty); 113 parseSuccess = parser.parseFontFaceDescriptor(resolvedProperty);
114 } else { 114 } else {
115 parseSuccess = parser.parseValue(unresolvedProperty, important); 115 parseSuccess = parser.parseValue(unresolvedProperty, important);
116 } 116 }
117 117
118 // This doesn't count UA style sheets 118 // This doesn't count UA style sheets
119 if (parseSuccess && context.useCounter()) 119 if (parseSuccess && context.useCounter())
120 context.useCounter()->count(context, unresolvedProperty); 120 context.useCounter()->count(context, unresolvedProperty);
121 121
122 if (!parseSuccess) 122 if (!parseSuccess)
123 parser.rollbackLastProperties(parsedProperties.size() - parsedProperties Size); 123 parser.rollbackLastProperties(parsedProperties.size() - parsedProperties Size);
(...skipping 8276 matching lines...) Expand 10 before | Expand all | Expand 10 after
8400 } 8400 }
8401 } 8401 }
8402 8402
8403 if (!list->length()) 8403 if (!list->length())
8404 return nullptr; 8404 return nullptr;
8405 8405
8406 return list.release(); 8406 return list.release();
8407 } 8407 }
8408 8408
8409 } // namespace blink 8409 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698