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

Side by Side Diff: third_party/WebKit/Source/core/dom/Element.cpp

Issue 2382653006: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Make check-webkit-style happy 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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 20 matching lines...) Expand all
31 #include "bindings/core/v8/ExceptionState.h" 31 #include "bindings/core/v8/ExceptionState.h"
32 #include "bindings/core/v8/V8DOMActivityLogger.h" 32 #include "bindings/core/v8/V8DOMActivityLogger.h"
33 #include "bindings/core/v8/V8DOMWrapper.h" 33 #include "bindings/core/v8/V8DOMWrapper.h"
34 #include "bindings/core/v8/V8PerContextData.h" 34 #include "bindings/core/v8/V8PerContextData.h"
35 #include "core/CSSValueKeywords.h" 35 #include "core/CSSValueKeywords.h"
36 #include "core/SVGNames.h" 36 #include "core/SVGNames.h"
37 #include "core/XMLNames.h" 37 #include "core/XMLNames.h"
38 #include "core/animation/AnimationTimeline.h" 38 #include "core/animation/AnimationTimeline.h"
39 #include "core/animation/CustomCompositorAnimations.h" 39 #include "core/animation/CustomCompositorAnimations.h"
40 #include "core/animation/css/CSSAnimations.h" 40 #include "core/animation/css/CSSAnimations.h"
41 #include "core/css/CSSIdentifierValue.h"
41 #include "core/css/CSSImageValue.h" 42 #include "core/css/CSSImageValue.h"
42 #include "core/css/CSSPrimitiveValue.h" 43 #include "core/css/CSSPrimitiveValue.h"
43 #include "core/css/CSSStyleSheet.h" 44 #include "core/css/CSSStyleSheet.h"
44 #include "core/css/PropertySetCSSStyleDeclaration.h" 45 #include "core/css/PropertySetCSSStyleDeclaration.h"
45 #include "core/css/StylePropertySet.h" 46 #include "core/css/StylePropertySet.h"
46 #include "core/css/parser/CSSParser.h" 47 #include "core/css/parser/CSSParser.h"
47 #include "core/css/resolver/SelectorFilterParentScope.h" 48 #include "core/css/resolver/SelectorFilterParentScope.h"
48 #include "core/css/resolver/StyleResolver.h" 49 #include "core/css/resolver/StyleResolver.h"
49 #include "core/css/resolver/StyleResolverStats.h" 50 #include "core/css/resolver/StyleResolverStats.h"
50 #include "core/css/resolver/StyleSharingDepthScope.h" 51 #include "core/css/resolver/StyleSharingDepthScope.h"
(...skipping 3784 matching lines...) Expand 10 before | Expand all | Expand 10 after
3835 MutationRecord::createAttributes(this, styleAttr, oldValue)); 3836 MutationRecord::createAttributes(this, styleAttr, oldValue));
3836 // Need to synchronize every time so that following MutationRecords will 3837 // Need to synchronize every time so that following MutationRecords will
3837 // have correct oldValues. 3838 // have correct oldValues.
3838 synchronizeAttribute(styleAttr); 3839 synchronizeAttribute(styleAttr);
3839 } 3840 }
3840 } 3841 }
3841 3842
3842 void Element::setInlineStyleProperty(CSSPropertyID propertyID, 3843 void Element::setInlineStyleProperty(CSSPropertyID propertyID,
3843 CSSValueID identifier, 3844 CSSValueID identifier,
3844 bool important) { 3845 bool important) {
3845 setInlineStyleProperty( 3846 setInlineStyleProperty(propertyID, CSSIdentifierValue::create(identifier),
3846 propertyID, CSSPrimitiveValue::createIdentifier(identifier), important); 3847 important);
3847 } 3848 }
3848 3849
3849 void Element::setInlineStyleProperty(CSSPropertyID propertyID, 3850 void Element::setInlineStyleProperty(CSSPropertyID propertyID,
3850 double value, 3851 double value,
3851 CSSPrimitiveValue::UnitType unit, 3852 CSSPrimitiveValue::UnitType unit,
3852 bool important) { 3853 bool important) {
3853 setInlineStyleProperty(propertyID, CSSPrimitiveValue::create(value, unit), 3854 setInlineStyleProperty(propertyID, CSSPrimitiveValue::create(value, unit),
3854 important); 3855 important);
3855 } 3856 }
3856 3857
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
3898 elementData.m_presentationAttributeStyleIsDirty = false; 3899 elementData.m_presentationAttributeStyleIsDirty = false;
3899 elementData.m_presentationAttributeStyle = 3900 elementData.m_presentationAttributeStyle =
3900 computePresentationAttributeStyle(*this); 3901 computePresentationAttributeStyle(*this);
3901 } 3902 }
3902 3903
3903 void Element::addPropertyToPresentationAttributeStyle( 3904 void Element::addPropertyToPresentationAttributeStyle(
3904 MutableStylePropertySet* style, 3905 MutableStylePropertySet* style,
3905 CSSPropertyID propertyID, 3906 CSSPropertyID propertyID,
3906 CSSValueID identifier) { 3907 CSSValueID identifier) {
3907 DCHECK(isStyledElement()); 3908 DCHECK(isStyledElement());
3908 style->setProperty(propertyID, 3909 style->setProperty(propertyID, *CSSIdentifierValue::create(identifier));
3909 *CSSPrimitiveValue::createIdentifier(identifier));
3910 } 3910 }
3911 3911
3912 void Element::addPropertyToPresentationAttributeStyle( 3912 void Element::addPropertyToPresentationAttributeStyle(
3913 MutableStylePropertySet* style, 3913 MutableStylePropertySet* style,
3914 CSSPropertyID propertyID, 3914 CSSPropertyID propertyID,
3915 double value, 3915 double value,
3916 CSSPrimitiveValue::UnitType unit) { 3916 CSSPrimitiveValue::UnitType unit) {
3917 DCHECK(isStyledElement()); 3917 DCHECK(isStyledElement());
3918 style->setProperty(propertyID, *CSSPrimitiveValue::create(value, unit)); 3918 style->setProperty(propertyID, *CSSPrimitiveValue::create(value, unit));
3919 } 3919 }
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
4046 } 4046 }
4047 4047
4048 DEFINE_TRACE_WRAPPERS(Element) { 4048 DEFINE_TRACE_WRAPPERS(Element) {
4049 if (hasRareData()) { 4049 if (hasRareData()) {
4050 visitor->traceWrappers(elementRareData()); 4050 visitor->traceWrappers(elementRareData());
4051 } 4051 }
4052 ContainerNode::traceWrappers(visitor); 4052 ContainerNode::traceWrappers(visitor);
4053 } 4053 }
4054 4054
4055 } // namespace blink 4055 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698