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

Side by Side Diff: third_party/WebKit/Source/core/css/StylePropertySet.cpp

Issue 2323633002: Implement animation tainted custom property values (Closed)
Patch Set: Rebased Created 4 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
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * Copyright (C) 2013 Intel Corporation. All rights reserved. 5 * Copyright (C) 2013 Intel Corporation. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 // When replacing an existing property value, this moves the property to the e nd of the list. 310 // When replacing an existing property value, this moves the property to the e nd of the list.
311 // Firefox preserves the position, and MSIE moves the property to the beginnin g. 311 // Firefox preserves the position, and MSIE moves the property to the beginnin g.
312 return CSSParser::parseValue(this, unresolvedProperty, value, important, 312 return CSSParser::parseValue(this, unresolvedProperty, value, important,
313 contextStyleSheet); 313 contextStyleSheet);
314 } 314 }
315 315
316 bool MutableStylePropertySet::setProperty( 316 bool MutableStylePropertySet::setProperty(
317 const AtomicString& customPropertyName, 317 const AtomicString& customPropertyName,
318 const String& value, 318 const String& value,
319 bool important, 319 bool important,
320 StyleSheetContents* contextStyleSheet) { 320 StyleSheetContents* contextStyleSheet,
321 bool isAnimationTainted) {
321 if (value.isEmpty()) 322 if (value.isEmpty())
322 return removeProperty(customPropertyName); 323 return removeProperty(customPropertyName);
323 return CSSParser::parseValueForCustomProperty(this, customPropertyName, value, 324 return CSSParser::parseValueForCustomProperty(this, customPropertyName, value,
324 important, contextStyleSheet); 325 important, contextStyleSheet,
326 isAnimationTainted);
325 } 327 }
326 328
327 void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, 329 void MutableStylePropertySet::setProperty(CSSPropertyID propertyID,
328 const CSSValue& value, 330 const CSSValue& value,
329 bool important) { 331 bool important) {
330 StylePropertyShorthand shorthand = shorthandForProperty(propertyID); 332 StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
331 if (!shorthand.length()) { 333 if (!shorthand.length()) {
332 setProperty(CSSProperty(propertyID, value, important)); 334 setProperty(CSSProperty(propertyID, value, important));
333 return; 335 return;
334 } 336 }
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 return new MutableStylePropertySet(cssParserMode); 597 return new MutableStylePropertySet(cssParserMode);
596 } 598 }
597 599
598 MutableStylePropertySet* MutableStylePropertySet::create( 600 MutableStylePropertySet* MutableStylePropertySet::create(
599 const CSSProperty* properties, 601 const CSSProperty* properties,
600 unsigned count) { 602 unsigned count) {
601 return new MutableStylePropertySet(properties, count); 603 return new MutableStylePropertySet(properties, count);
602 } 604 }
603 605
604 } // namespace blink 606 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/StylePropertySet.h ('k') | third_party/WebKit/Source/core/css/cssom/CSSUnparsedValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698