Commit e5428c59 authored by antti@apple.com's avatar antti@apple.com

Rename StylePropertySet to StyleProperties

https://bugs.webkit.org/show_bug.cgi?id=124990
        
Reviewed by Andreas Kling.

"Set" does not add useful information here. Use less clunky plural name.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159856 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a47b30a2
......@@ -1087,7 +1087,7 @@ set(WebCore_SOURCES
css/SelectorFilter.cpp
css/StyleInvalidationAnalysis.cpp
css/StyleMedia.cpp
css/StylePropertySet.cpp
css/StyleProperties.cpp
css/StylePropertyShorthand.cpp
css/StyleResolver.cpp
css/StyleRule.cpp
......
2013-11-28 Antti Koivisto <antti@apple.com>
Rename StylePropertySet to StyleProperties
https://bugs.webkit.org/show_bug.cgi?id=124990
Reviewed by Andreas Kling.
"Set" does not add useful information here. Use less clunky plural name.
2013-11-28 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
Nix Upstream: Adding EditorNix to WebCore
......@@ -2674,8 +2674,8 @@ webcore_sources += \
Source/WebCore/css/StyleInvalidationAnalysis.h \
Source/WebCore/css/StyleMedia.cpp \
Source/WebCore/css/StyleMedia.h \
Source/WebCore/css/StylePropertySet.cpp \
Source/WebCore/css/StylePropertySet.h \
Source/WebCore/css/StyleProperties.cpp \
Source/WebCore/css/StyleProperties.h \
Source/WebCore/css/StylePropertyShorthand.cpp \
Source/WebCore/css/StylePropertyShorthand.h \
Source/WebCore/css/StyleResolver.cpp \
......
......@@ -823,6 +823,8 @@ __ZN7WebCore21setGlobalIconDatabaseEPNS_16IconDatabaseBaseE
__ZN7WebCore21setPlatformStrategiesEPNS_18PlatformStrategiesE
__ZN7WebCore22HTMLPlugInImageElement24restartSnapshottedPlugInEv
__ZN7WebCore22HTMLPlugInImageElement29setIsPrimarySnapshottedPlugInEb
__ZN7WebCore22MutableStyleProperties25ensureCSSStyleDeclarationEv
__ZN7WebCore22MutableStylePropertiesD1Ev
__ZN7WebCore22RuntimeEnabledFeatures14sharedFeaturesEv
__ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
__ZN7WebCore22ScriptExecutionContext2vmEv
......@@ -847,8 +849,6 @@ __ZN7WebCore23ApplicationCacheStorage26storeUpdatedQuotaForOriginEPKNS_14Securit
__ZN7WebCore23ApplicationCacheStorage5emptyEv
__ZN7WebCore23AuthenticationChallenge23setAuthenticationClientEPNS_20AuthenticationClientE
__ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorE
__ZN7WebCore23MutableStylePropertySet25ensureCSSStyleDeclarationEv
__ZN7WebCore23MutableStylePropertySetD1Ev
__ZN7WebCore23SynchronousLoaderClient24platformBadResponseErrorEv
__ZN7WebCore23dataForURLComponentTypeEP5NSURLl
__ZN7WebCore23decodeHostNameWithRangeEP8NSString8_NSRange
......@@ -865,6 +865,7 @@ __ZN7WebCore24FrameDestructionObserver14frameDestroyedEv
__ZN7WebCore24FrameDestructionObserver14willDetachPageEv
__ZN7WebCore24FrameDestructionObserverC2EPNS_5FrameE
__ZN7WebCore24FrameDestructionObserverD2Ev
__ZN7WebCore24ImmutableStylePropertiesD1Ev
__ZN7WebCore24ReferenceFilterOperationC1ERKN3WTF6StringES4_NS_15FilterOperation13OperationTypeE
__ZN7WebCore24createFragmentFromMarkupERNS_8DocumentERKN3WTF6StringES5_NS_19ParserContentPolicyE
__ZN7WebCore24decodeURLEscapeSequencesERKN3WTF6StringE
......@@ -872,7 +873,6 @@ __ZN7WebCore24deleteCookiesForHostnameERKNS_21NetworkStorageSessionERKN3WTF6Stri
__ZN7WebCore24fileSystemRepresentationERKN3WTF6StringE
__ZN7WebCore24notifyHistoryItemChangedE
__ZN7WebCore24pathByAppendingComponentERKN3WTF6StringES3_
__ZN7WebCore25ImmutableStylePropertySetD1Ev
__ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
__ZN7WebCore25computeViewportAttributesENS_17ViewportArgumentsEiiifNS_7IntSizeE
__ZN7WebCore25createCanonicalUUIDStringEv
......@@ -1027,7 +1027,7 @@ __ZN7WebCore5Range8setStartEN3WTF10PassRefPtrINS_4NodeEEEiRi
__ZN7WebCore5RangeD1Ev
__ZN7WebCore6Chrome16setStatusbarTextEPNS_5FrameERKN3WTF6StringE
__ZN7WebCore6Chrome5printEPNS_5FrameE
__ZN7WebCore6Editor10applyStyleEPNS_16StylePropertySetENS_10EditActionE
__ZN7WebCore6Editor10applyStyleEPNS_15StylePropertiesENS_10EditActionE
__ZN7WebCore6Editor10findStringERKN3WTF6StringEj
__ZN7WebCore6Editor10insertTextERKN3WTF6StringEPNS_5EventE
__ZN7WebCore6Editor13performDeleteEv
......@@ -1044,9 +1044,9 @@ __ZN7WebCore6Editor18insertDictatedTextERKN3WTF6StringERKNS1_6VectorINS_20Dictat
__ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEjjbPNS1_6VectorINS1_6RefPtrIS5_EELm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore6Editor19deleteWithDirectionENS_18SelectionDirectionENS_15TextGranularityEbb
__ZN7WebCore6Editor19insertUnorderedListEv
__ZN7WebCore6Editor21applyStyleToSelectionEPNS_16StylePropertySetENS_10EditActionE
__ZN7WebCore6Editor21applyStyleToSelectionEPNS_15StylePropertiesENS_10EditActionE
__ZN7WebCore6Editor23setBaseWritingDirectionE16WritingDirection
__ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_16StylePropertySetENS_10EditActionE
__ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_15StylePropertiesENS_10EditActionE
__ZN7WebCore6Editor24isSelectionUngrammaticalEv
__ZN7WebCore6Editor24replaceSelectionWithTextERKN3WTF6StringEbb
__ZN7WebCore6Editor26decreaseSelectionListLevelEv
......@@ -1555,6 +1555,7 @@ __ZNK7WebCore15ProtectionSpace5realmEv
__ZNK7WebCore15ProtectionSpace7isProxyEv
__ZNK7WebCore15ResourceRequest12cfURLRequestENS_20HTTPBodyUpdatePolicyE
__ZNK7WebCore15ResourceRequest12nsURLRequestENS_20HTTPBodyUpdatePolicyE
__ZNK7WebCore15StyleProperties11mutableCopyEv
__ZNK7WebCore15VisiblePosition14characterAfterEv
__ZNK7WebCore15VisiblePosition14localCaretRectERPNS_12RenderObjectE
__ZNK7WebCore15VisiblePosition19absoluteCaretBoundsEv
......@@ -1570,7 +1571,6 @@ __ZNK7WebCore16HTMLInputElement6isTextEv
__ZNK7WebCore16IconDatabaseBase12databasePathEv
__ZNK7WebCore16ResourceResponse13nsURLResponseEv
__ZNK7WebCore16ResourceResponse16certificateChainEv
__ZNK7WebCore16StylePropertySet11mutableCopyEv
__ZNK7WebCore16VisibleSelection17isContentEditableEv
__ZNK7WebCore16VisibleSelection17toNormalizedRangeEv
__ZNK7WebCore16VisibleSelection19rootEditableElementEv
......
......@@ -9409,7 +9409,7 @@
<ClCompile Include="..\css\SelectorChecker.cpp" />
<ClCompile Include="..\css\StyleInvalidationAnalysis.cpp" />
<ClCompile Include="..\css\StyleMedia.cpp" />
<ClCompile Include="..\css\StylePropertySet.cpp">
<ClCompile Include="..\css\StyleProperties.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
......@@ -19784,7 +19784,7 @@
<ClInclude Include="..\css\SelectorChecker.h" />
<ClInclude Include="..\css\StyleInvalidationAnalysis.h" />
<ClInclude Include="..\css\StyleMedia.h" />
<ClInclude Include="..\css\StylePropertySet.h" />
<ClInclude Include="..\css\StyleProperties.h" />
<ClInclude Include="..\css\StylePropertyShorthand.h" />
<ClInclude Include="..\css\StyleResolver.h" />
<ClInclude Include="..\css\StyleRule.h" />
......@@ -35,7 +35,7 @@
#include "JSNode.h"
#include "RuntimeEnabledFeatures.h"
#include "Settings.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include <runtime/StringPrototype.h>
#include <wtf/ASCIICType.h>
#include <wtf/text/AtomicString.h>
......
......@@ -316,7 +316,7 @@ sub AddIncludesForType
}
$implIncludes{"Node.h"} = 1 if $type eq "NodeList";
$implIncludes{"StylePropertySet.h"} = 1 if $type eq "CSSStyleDeclaration";
$implIncludes{"StyleProperties.h"} = 1 if $type eq "CSSStyleDeclaration";
# Default, include the same named file (the implementation) and the same name prefixed with "WebDOM".
$implIncludes{"$type.h"} = 1 unless $type eq "any";
......
......@@ -3478,7 +3478,7 @@ sub NativeToJSValue
}
if ($type eq "CSSStyleDeclaration") {
AddToImplIncludes("StylePropertySet.h", $conditional);
AddToImplIncludes("StyleProperties.h", $conditional);
}
if ($type eq "NodeList") {
......
......@@ -677,7 +677,7 @@ sub AddIncludesForType
# FIXME: won't compile without these
$implIncludes{"CSSImportRule.h"} = 1 if $type eq "CSSRule";
$implIncludes{"StylePropertySet.h"} = 1 if $type eq "CSSStyleDeclaration";
$implIncludes{"StyleProperties.h"} = 1 if $type eq "CSSStyleDeclaration";
$implIncludes{"NameNodeList.h"} = 1 if $type eq "NodeList";
# Default, include the same named file (the implementation) and the same name prefixed with "DOM".
......
......@@ -81,7 +81,7 @@
#include "RuleSet.cpp"
#include "SelectorCheckerFastPath.cpp"
#include "SelectorFilter.cpp"
#include "StylePropertySet.cpp"
#include "StyleProperties.cpp"
#include "StylePropertyShorthand.cpp"
#include "StyleResolver.cpp"
#include "StyleScopeResolver.cpp"
......
......@@ -59,7 +59,7 @@
#include "RenderStyle.h"
#include "RenderView.h"
#include "StyleInheritedData.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include "StylePropertyShorthand.h"
#include "StyleResolver.h"
#include "WebKitCSSTransformValue.h"
......@@ -1709,7 +1709,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).propertyValue(propertyID, updateLayout);
}
PassRef<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties() const
PassRef<MutableStyleProperties> CSSComputedStyleDeclaration::copyProperties() const
{
return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).copyProperties();
}
......@@ -3180,7 +3180,7 @@ bool ComputedStyleExtractor::propertyMatches(CSSPropertyID propertyID, const CSS
return computedValue && value && computedValue->equals(*value);
}
PassRef<MutableStylePropertySet> ComputedStyleExtractor::copyProperties() const
PassRef<MutableStyleProperties> ComputedStyleExtractor::copyProperties() const
{
return copyPropertiesInSet(computedProperties, numComputedProperties);
}
......@@ -3233,7 +3233,7 @@ PassRefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForGridShor
return list.release();
}
PassRef<MutableStylePropertySet> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
PassRef<MutableStyleProperties> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
{
Vector<CSSProperty, 256> list;
list.reserveInitialCapacity(length);
......@@ -3242,7 +3242,7 @@ PassRef<MutableStylePropertySet> ComputedStyleExtractor::copyPropertiesInSet(con
if (value)
list.append(CSSProperty(set[i], value.release(), false));
}
return MutableStylePropertySet::create(list.data(), list.size());
return MutableStyleProperties::create(list.data(), list.size());
}
CSSRule* CSSComputedStyleDeclaration::parentRule() const
......
......@@ -32,13 +32,13 @@ class CSSPrimitiveValue;
class CSSValueList;
class Color;
class FilterOperations;
class MutableStylePropertySet;
class MutableStyleProperties;
class Node;
class RenderObject;
class RenderStyle;
class SVGPaint;
class ShadowData;
class StylePropertySet;
class StyleProperties;
class StylePropertyShorthand;
#if ENABLE(CSS_SHADERS)
......@@ -57,8 +57,8 @@ public:
PassRefPtr<CSSValue> propertyValue(CSSPropertyID, EUpdateLayout = UpdateLayout) const;
// Helper methods for HTML editing.
PassRef<MutableStylePropertySet> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
PassRef<MutableStylePropertySet> copyProperties() const;
PassRef<MutableStyleProperties> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
PassRef<MutableStyleProperties> copyProperties() const;
PassRefPtr<CSSPrimitiveValue> getFontSizeCSSValuePreferringKeyword() const;
bool useFixedFontDefaultSize() const;
bool propertyMatches(CSSPropertyID, const CSSValue*) const;
......@@ -124,7 +124,7 @@ private:
virtual PassRefPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) OVERRIDE;
virtual String getPropertyValueInternal(CSSPropertyID) OVERRIDE;
virtual void setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) OVERRIDE;
virtual PassRef<MutableStylePropertySet> copyProperties() const OVERRIDE;
virtual PassRef<MutableStyleProperties> copyProperties() const OVERRIDE;
PassRefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID, EUpdateLayout = UpdateLayout) const;
......
......@@ -23,7 +23,7 @@
#include "CSSFontFaceRule.h"
#include "PropertySetCSSStyleDeclaration.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include "StyleRule.h"
#include <wtf/text/StringBuilder.h>
......
......@@ -45,7 +45,7 @@
#include "FrameLoader.h"
#include "Settings.h"
#include "SimpleFontData.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include "StyleResolver.h"
#include "StyleRule.h"
#include "WebKitFontFamilyNames.h"
......@@ -90,7 +90,7 @@ bool CSSFontSelector::isEmpty() const
void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule)
{
// Obtain the font-family property and the src property. Both must be defined.
const StylePropertySet& style = fontFaceRule->properties();
const StyleProperties& style = fontFaceRule->properties();
RefPtr<CSSValue> fontFamily = style.getPropertyCSSValue(CSSPropertyFontFamily);
RefPtr<CSSValue> src = style.getPropertyCSSValue(CSSPropertySrc);
RefPtr<CSSValue> unicodeRange = style.getPropertyCSSValue(CSSPropertyUnicodeRange);
......
......@@ -27,7 +27,7 @@
#include "CSSStyleSheet.h"
#include "Document.h"
#include "PropertySetCSSStyleDeclaration.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include "StyleRule.h"
#include <wtf/Vector.h>
#include <wtf/text/StringBuilder.h>
......
......@@ -74,7 +74,7 @@
#include "RuntimeEnabledFeatures.h"
#include "SVGParserUtilities.h"
#include "Settings.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include "StylePropertyShorthand.h"
#include "StyleRule.h"
#include "StyleRuleImport.h"
......@@ -507,7 +507,7 @@ static inline bool isColorPropertyID(CSSPropertyID propertyId)
}
}
static bool parseColorValue(MutableStylePropertySet* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
static bool parseColorValue(MutableStyleProperties* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
{
ASSERT(!string.isEmpty());
bool strict = isStrictParserMode(cssParserMode);
......@@ -605,7 +605,7 @@ static inline bool parseSimpleLength(const CharacterType* characters, unsigned&
return ok;
}
static bool parseSimpleLengthValue(MutableStylePropertySet* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
static bool parseSimpleLengthValue(MutableStyleProperties* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
{
ASSERT(!string.isEmpty());
bool acceptsNegativeNumbers;
......@@ -1170,7 +1170,7 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId)
}
}
static bool parseKeywordValue(MutableStylePropertySet* declaration, CSSPropertyID propertyId, const String& string, bool important, const CSSParserContext& parserContext)
static bool parseKeywordValue(MutableStyleProperties* declaration, CSSPropertyID propertyId, const String& string, bool important, const CSSParserContext& parserContext)
{
ASSERT(!string.isEmpty());
......@@ -1227,7 +1227,7 @@ static bool parseTransformArguments(WebKitCSSTransformValue* transformValue, Cha
return true;
}
static bool parseTranslateTransformValue(MutableStylePropertySet* properties, CSSPropertyID propertyID, const String& string, bool important)
static bool parseTranslateTransformValue(MutableStyleProperties* properties, CSSPropertyID propertyID, const String& string, bool important)
{
if (propertyID != CSSPropertyWebkitTransform)
return false;
......@@ -1278,7 +1278,7 @@ PassRefPtr<CSSValueList> CSSParser::parseFontFaceValue(const AtomicString& strin
{
if (string.isEmpty())
return 0;
RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create();
RefPtr<MutableStyleProperties> dummyStyle = MutableStyleProperties::create();
if (!parseValue(dummyStyle.get(), CSSPropertyFontFamily, string, false, CSSQuirksMode, 0))
return 0;
......@@ -1288,7 +1288,7 @@ PassRefPtr<CSSValueList> CSSParser::parseFontFaceValue(const AtomicString& strin
return static_pointer_cast<CSSValueList>(fontFamily.release());
}
bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
bool CSSParser::parseValue(MutableStyleProperties* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
{
ASSERT(!string.isEmpty());
if (parseSimpleLengthValue(declaration, propertyID, string, important, cssParserMode))
......@@ -1311,7 +1311,7 @@ bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID p
return parser.parseValue(declaration, propertyID, string, important, contextStyleSheet);
}
bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, StyleSheetContents* contextStyleSheet)
bool CSSParser::parseValue(MutableStyleProperties* declaration, CSSPropertyID propertyID, const String& string, bool important, StyleSheetContents* contextStyleSheet)
{
setStyleSheet(contextStyleSheet);
......@@ -1397,14 +1397,14 @@ void CSSParser::parseSelector(const String& string, CSSSelectorList& selectorLis
m_selectorListForParseSelector = 0;
}
PassRef<ImmutableStylePropertySet> CSSParser::parseInlineStyleDeclaration(const String& string, Element* element)
PassRef<ImmutableStyleProperties> CSSParser::parseInlineStyleDeclaration(const String& string, Element* element)
{
CSSParserContext context = element->document().elementSheet().contents().parserContext();
context.mode = strictToCSSParserMode(element->isHTMLElement() && !element->document().inQuirksMode());
return CSSParser(context).parseDeclaration(string, &element->document().elementSheet().contents());
}
PassRef<ImmutableStylePropertySet> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
PassRef<ImmutableStyleProperties> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
{
setStyleSheet(contextStyleSheet);
......@@ -1415,13 +1415,13 @@ PassRef<ImmutableStylePropertySet> CSSParser::parseDeclaration(const String& str
if (m_hasFontFaceOnlyValues)
deleteFontFaceOnlyValues();
PassRef<ImmutableStylePropertySet> style = createStylePropertySet();
PassRef<ImmutableStyleProperties> style = createStyleProperties();
clearProperties();
return style;
}
bool CSSParser::parseDeclaration(MutableStylePropertySet* declaration, const String& string, PassRefPtr<CSSRuleSourceData> prpRuleSourceData, StyleSheetContents* contextStyleSheet)
bool CSSParser::parseDeclaration(MutableStyleProperties* declaration, const String& string, PassRefPtr<CSSRuleSourceData> prpRuleSourceData, StyleSheetContents* contextStyleSheet)
{
// Length of the "@-webkit-decls{" prefix.
static const unsigned prefixLength = 15;
......@@ -1494,7 +1494,7 @@ static inline void filterProperties(bool important, const CSSParser::ParsedPrope
}
}
PassRef<ImmutableStylePropertySet> CSSParser::createStylePropertySet()
PassRef<ImmutableStyleProperties> CSSParser::createStyleProperties()
{
BitArray<numCSSProperties> seenProperties;
size_t unusedEntries = m_parsedProperties.size();
......@@ -1506,7 +1506,7 @@ PassRef<ImmutableStylePropertySet> CSSParser::createStylePropertySet()
if (unusedEntries)
results.remove(0, unusedEntries);
return ImmutableStylePropertySet::create(results.data(), results.size(), m_context.mode);
return ImmutableStyleProperties::create(results.data(), results.size(), m_context.mode);
}
void CSSParser::addPropertyWithPrefixingVariant(CSSPropertyID propId, PassRefPtr<CSSValue> value, bool important, bool implicit)
......@@ -9485,7 +9485,7 @@ bool CSSParser::parseFilterRuleParameters()
PassRefPtr<StyleRuleBase> CSSParser::createFilterRule(const CSSParserString& filterName)
{
RefPtr<StyleRuleFilter> rule = StyleRuleFilter::create(filterName, createStylePropertySet());
RefPtr<StyleRuleFilter> rule = StyleRuleFilter::create(filterName, createStyleProperties());
clearProperties();
processAndAddNewRuleToSourceTreeIfNeeded();
return rule.release();
......@@ -11902,7 +11902,7 @@ PassRefPtr<StyleRuleBase> CSSParser::createStyleRule(Vector<OwnPtr<CSSParserSele
m_allowNamespaceDeclarations = false;
if (m_hasFontFaceOnlyValues)
deleteFontFaceOnlyValues();
rule = StyleRule::create(m_lastSelectorLineNumber, createStylePropertySet());
rule = StyleRule::create(m_lastSelectorLineNumber, createStyleProperties());
rule->parserAdoptSelectorVector(*selectors);
processAndAddNewRuleToSourceTreeIfNeeded();
} else
......@@ -11928,7 +11928,7 @@ PassRefPtr<StyleRuleBase> CSSParser::createFontFaceRule()
return 0;
}
}
RefPtr<StyleRuleFontFace> rule = StyleRuleFontFace::create(createStylePropertySet());
RefPtr<StyleRuleFontFace> rule = StyleRuleFontFace::create(createStyleProperties());
clearProperties();
processAndAddNewRuleToSourceTreeIfNeeded();
return rule.release();
......@@ -12034,7 +12034,7 @@ PassRefPtr<StyleRuleBase> CSSParser::createPageRule(PassOwnPtr<CSSParserSelector
m_allowImportRules = m_allowNamespaceDeclarations = false;
RefPtr<StyleRulePage> rule;
if (pageSelector) {
rule = StyleRulePage::create(createStylePropertySet());
rule = StyleRulePage::create(createStyleProperties());
Vector<OwnPtr<CSSParserSelector>> selectorVector;
selectorVector.append(pageSelector);
rule->parserAdoptSelectorVector(selectorVector);
......@@ -12139,7 +12139,7 @@ PassRefPtr<StyleKeyframe> CSSParser::createKeyframe(CSSParserValueList& keys)
keyString.append('%');
}
RefPtr<StyleKeyframe> keyframe = StyleKeyframe::create(createStylePropertySet());
RefPtr<StyleKeyframe> keyframe = StyleKeyframe::create(createStyleProperties());
keyframe->setKeyText(keyString.toString());
clearProperties();
......@@ -12356,7 +12356,7 @@ PassRefPtr<StyleRuleBase> CSSParser::createViewportRule()
{
m_allowImportRules = m_allowNamespaceDeclarations = false;
RefPtr<StyleRuleViewport> rule = StyleRuleViewport::create(createStylePropertySet());
RefPtr<StyleRuleViewport> rule = StyleRuleViewport::create(createStyleProperties());
clearProperties();
processAndAddNewRuleToSourceTreeIfNeeded();
......
......@@ -54,10 +54,10 @@ class CSSValueList;
class CSSBasicShape;
class Document;
class Element;
class ImmutableStylePropertySet;
class ImmutableStyleProperties;
class MediaQueryExp;
class MediaQuerySet;
class MutableStylePropertySet;
class MutableStyleProperties;
class StyleKeyframe;
class StylePropertyShorthand;
class StyleRuleBase;
......@@ -93,13 +93,13 @@ public:
#if ENABLE(CSS3_CONDITIONAL_RULES)
bool parseSupportsCondition(const String&);
#endif
static bool parseValue(MutableStylePropertySet*, CSSPropertyID, const String&, bool important, CSSParserMode, StyleSheetContents*);
static bool parseValue(MutableStyleProperties*, CSSPropertyID, const String&, bool important, CSSParserMode, StyleSheetContents*);
static bool parseColor(RGBA32& color, const String&, bool strict = false);
static bool parseSystemColor(RGBA32& color, const String&, Document*);
static PassRefPtr<CSSValueList> parseFontFaceValue(const AtomicString&);
PassRefPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*);
bool parseDeclaration(MutableStylePropertySet*, const String&, PassRefPtr<CSSRuleSourceData>, StyleSheetContents* contextStyleSheet);
static PassRef<ImmutableStylePropertySet> parseInlineStyleDeclaration(const String&, Element*);
bool parseDeclaration(MutableStyleProperties*, const String&, PassRefPtr<CSSRuleSourceData>, StyleSheetContents* contextStyleSheet);
static PassRef<ImmutableStyleProperties> parseInlineStyleDeclaration(const String&, Element*);
PassOwnPtr<MediaQuery> parseMediaQuery(const String&);
void addPropertyWithPrefixingVariant(CSSPropertyID, PassRefPtr<CSSValue>, bool important, bool implicit = false);
......@@ -353,7 +353,7 @@ public:
void clearProperties();
PassRef<ImmutableStylePropertySet> createStylePropertySet();
PassRef<ImmutableStyleProperties> createStyleProperties();
CSSParserContext m_context;
......@@ -526,8 +526,8 @@ private:
bool isGeneratedImageValue(CSSParserValue*) const;
bool parseGeneratedImage(CSSParserValueList*, RefPtr<CSSValue>&);
bool parseValue(MutableStylePropertySet*, CSSPropertyID, const String&, bool important, StyleSheetContents* contextStyleSheet);
PassRef<ImmutableStylePropertySet> parseDeclaration(const String&, StyleSheetContents* contextStyleSheet);
bool parseValue(MutableStyleProperties*, CSSPropertyID, const String&, bool important, StyleSheetContents* contextStyleSheet);
PassRef<ImmutableStyleProperties> parseDeclaration(const String&, StyleSheetContents* contextStyleSheet);
enum SizeParameterType {
None,
......
......@@ -31,8 +31,8 @@ class CSSProperty;
class CSSRule;
class CSSStyleSheet;
class CSSValue;
class MutableStylePropertySet;
class StylePropertySet;
class MutableStyleProperties;
class StyleProperties;
class StyledElement;
typedef int ExceptionCode;
......@@ -65,7 +65,7 @@ public:
virtual String getPropertyValueInternal(CSSPropertyID) = 0;
virtual void setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) = 0;
virtual PassRef<MutableStylePropertySet> copyProperties() const = 0;
virtual PassRef<MutableStyleProperties> copyProperties() const = 0;
virtual CSSStyleSheet* parentStyleSheet() const { return 0; }
......
......@@ -28,7 +28,7 @@
#include "Document.h"
#include "PropertySetCSSStyleDeclaration.h"
#include "RuleSet.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include "StyleRule.h"
#include <wtf/text/StringBuilder.h>
......
......@@ -33,7 +33,7 @@
#if ENABLE(CSS3_CONDITIONAL_RULES)
#include "CSSParser.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include <wtf/text/WTFString.h>
namespace WebCore {
......@@ -73,7 +73,7 @@ bool DOMWindowCSS::supports(const String& property, const String& value) const
if (normalizedValue.isEmpty())
return false;
RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create();
RefPtr<MutableStyleProperties> dummyStyle = MutableStyleProperties::create();
return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, CSSStrictMode, 0);
}
......
......@@ -40,24 +40,24 @@
#include "RenderRegion.h"
#include "SVGElement.h"
#include "SelectorCheckerFastPath.h"
#include "StylePropertySet.h"
#include "StyleProperties.h"
#include "StyledElement.h"
#include <wtf/TemporaryChange.h>
namespace WebCore {
static const StylePropertySet& leftToRightDeclaration()
static const StyleProperties& leftToRightDeclaration()
{