Chromium Code Reviews| Index: Source/core/css/resolver/StyleResolver.h |
| diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h |
| index 0d986e44d7d8a6b6a9ac6c37642cdd840460c96e..09f0e60e3708058392cdee8368d93f894f579d49 100644 |
| --- a/Source/core/css/resolver/StyleResolver.h |
| +++ b/Source/core/css/resolver/StyleResolver.h |
| @@ -230,7 +230,7 @@ private: |
| Element* findSiblingForStyleSharing(Node*, unsigned& count) const; |
| bool canShareStyleWithElement(Element*) const; |
| - PassRefPtr<RenderStyle> styleForKeyframe(const RenderStyle*, const StyleKeyframe*, KeyframeValue&); |
| + PassRefPtr<RenderStyle> styleForKeyframe(Element*, const RenderStyle*, const StyleKeyframe*, KeyframeValue&); |
| public: |
| // These methods will give back the set of rules that matched for a given element (or a pseudo-element). |
| @@ -246,9 +246,16 @@ public: |
| PassRefPtr<CSSRuleList> pseudoStyleRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules); |
| public: |
| - void applyPropertyToStyle(CSSPropertyID, CSSValue*, RenderStyle*); |
| - |
| - void applyPropertyToCurrentStyle(CSSPropertyID, CSSValue*); |
| + struct PropertyValue { |
|
dglazkov
2013/07/12 16:45:47
Does this have to be nested? I just tried to un-ne
Jeffrey Yasskin
2013/07/12 19:41:28
Doesn't need to be, although the name should be mo
|
| + PropertyValue(CSSPropertyID property, CSSValue* value) |
| + : property(property), value(value) { } |
| + // Stores value=propertySet.getPropertyCSSValue(id).get(). |
| + PropertyValue(CSSPropertyID, const StylePropertySet&); |
| + CSSPropertyID property; |
| + CSSValue* value; |
| + }; |
| + // |properties| is an array with |count| elements. |
| + void applyPropertiesToStyle(const PropertyValue* properties, size_t count, RenderStyle*); |
| void updateFont(); |
| void initializeFontStyle(Settings*); |