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

Side by Side Diff: Source/core/css/StylePropertySet.h

Issue 1183023003: Move (copy/remove)BlockProperties out of MutableStylePropertySet (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
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, 2008, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 int findPropertyIndex(CSSPropertyID) const; 92 int findPropertyIndex(CSSPropertyID) const;
93 bool hasProperty(CSSPropertyID property) const { return findPropertyIndex(pr operty) != -1; } 93 bool hasProperty(CSSPropertyID property) const { return findPropertyIndex(pr operty) != -1; }
94 94
95 PassRefPtrWillBeRawPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const; 95 PassRefPtrWillBeRawPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
96 String getPropertyValue(CSSPropertyID) const; 96 String getPropertyValue(CSSPropertyID) const;
97 97
98 bool propertyIsImportant(CSSPropertyID) const; 98 bool propertyIsImportant(CSSPropertyID) const;
99 CSSPropertyID getPropertyShorthand(CSSPropertyID) const; 99 CSSPropertyID getPropertyShorthand(CSSPropertyID) const;
100 bool isPropertyImplicit(CSSPropertyID) const; 100 bool isPropertyImplicit(CSSPropertyID) const;
101 101
102 PassRefPtrWillBeRawPtr<MutableStylePropertySet> copyBlockProperties() const;
103
104 CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cs sParserMode); } 102 CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cs sParserMode); }
105 103
106 PassRefPtrWillBeRawPtr<MutableStylePropertySet> mutableCopy() const; 104 PassRefPtrWillBeRawPtr<MutableStylePropertySet> mutableCopy() const;
107 PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() co nst; 105 PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() co nst;
108 106
109 PassRefPtrWillBeRawPtr<MutableStylePropertySet> copyPropertiesInSet(const Ve ctor<CSSPropertyID>&) const; 107 PassRefPtrWillBeRawPtr<MutableStylePropertySet> copyPropertiesInSet(const Ve ctor<CSSPropertyID>&) const;
110 108
111 String asText() const; 109 String asText() const;
112 110
113 bool isMutable() const { return m_isMutable; } 111 bool isMutable() const { return m_isMutable; }
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 196
199 // These expand shorthand properties into multiple properties. 197 // These expand shorthand properties into multiple properties.
200 bool setProperty(CSSPropertyID unresolvedProperty, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0); 198 bool setProperty(CSSPropertyID unresolvedProperty, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
201 void setProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool impor tant = false); 199 void setProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool impor tant = false);
202 200
203 // These do not. FIXME: This is too messy, we can do better. 201 // These do not. FIXME: This is too messy, we can do better.
204 bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = fals e); 202 bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = fals e);
205 bool setProperty(const CSSProperty&, CSSProperty* slot = 0); 203 bool setProperty(const CSSProperty&, CSSProperty* slot = 0);
206 204
207 bool removeProperty(CSSPropertyID, String* returnText = 0); 205 bool removeProperty(CSSPropertyID, String* returnText = 0);
208 void removeBlockProperties();
209 bool removePropertiesInSet(const CSSPropertyID* set, unsigned length); 206 bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
210 void removeEquivalentProperties(const StylePropertySet*); 207 void removeEquivalentProperties(const StylePropertySet*);
211 void removeEquivalentProperties(const CSSStyleDeclaration*); 208 void removeEquivalentProperties(const CSSStyleDeclaration*);
212 209
213 void mergeAndOverrideOnConflict(const StylePropertySet*); 210 void mergeAndOverrideOnConflict(const StylePropertySet*);
214 211
215 void clear(); 212 void clear();
216 void parseDeclarationList(const String& styleDeclaration, StyleSheetContents * contextStyleSheet); 213 void parseDeclarationList(const String& styleDeclaration, StyleSheetContents * contextStyleSheet);
217 214
218 CSSStyleDeclaration* ensureCSSStyleDeclaration(); 215 CSSStyleDeclaration* ensureCSSStyleDeclaration();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 inline int StylePropertySet::findPropertyIndex(CSSPropertyID propertyID) const 290 inline int StylePropertySet::findPropertyIndex(CSSPropertyID propertyID) const
294 { 291 {
295 if (m_isMutable) 292 if (m_isMutable)
296 return toMutableStylePropertySet(this)->findPropertyIndex(propertyID); 293 return toMutableStylePropertySet(this)->findPropertyIndex(propertyID);
297 return toImmutableStylePropertySet(this)->findPropertyIndex(propertyID); 294 return toImmutableStylePropertySet(this)->findPropertyIndex(propertyID);
298 } 295 }
299 296
300 } // namespace blink 297 } // namespace blink
301 298
302 #endif // StylePropertySet_h 299 #endif // StylePropertySet_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/StylePropertySet.cpp » ('j') | Source/core/editing/EditingStyle.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698