Changeset 159856 in webkit

Timestamp:

Nov 28, 2013, 12:53:22 PM (12 years ago)

Author:

Antti Koivisto

Message:

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.

Location:

trunk

Files:

• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/GNUmakefile.list.am (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (8 diffs)
• Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (9 diffs)
• Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (modified) (1 diff)
• Source/WebCore/css/CSSAllInOne.cpp (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (5 diffs)
• Source/WebCore/css/CSSComputedStyleDeclaration.h (modified) (4 diffs)
• Source/WebCore/css/CSSFontFaceRule.cpp (modified) (1 diff)
• Source/WebCore/css/CSSFontSelector.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSPageRule.cpp (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (20 diffs)
• Source/WebCore/css/CSSParser.h (modified) (4 diffs)
• Source/WebCore/css/CSSStyleDeclaration.h (modified) (2 diffs)
• Source/WebCore/css/CSSStyleRule.cpp (modified) (1 diff)
• Source/WebCore/css/DOMWindowCSS.cpp (modified) (2 diffs)
• Source/WebCore/css/ElementRuleCollector.cpp (modified) (5 diffs)
• Source/WebCore/css/ElementRuleCollector.h (modified) (1 diff)
• Source/WebCore/css/FontLoader.cpp (modified) (3 diffs)
• Source/WebCore/css/PageRuleCollector.cpp (modified) (2 diffs)
• Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (modified) (3 diffs)
• Source/WebCore/css/PropertySetCSSStyleDeclaration.h (modified) (7 diffs)
• Source/WebCore/css/StyleProperties.cpp (moved) (moved from trunk/Source/WebCore/css/StylePropertySet.cpp ) (50 diffs)
• Source/WebCore/css/StyleProperties.h (moved) (moved from trunk/Source/WebCore/css/StylePropertySet.h ) (15 diffs)
• Source/WebCore/css/StyleResolver.cpp (modified) (6 diffs)
• Source/WebCore/css/StyleResolver.h (modified) (4 diffs)
• Source/WebCore/css/StyleRule.cpp (modified) (10 diffs)
• Source/WebCore/css/StyleRule.h (modified) (11 diffs)
• Source/WebCore/css/StyleSheetContents.cpp (modified) (1 diff)
• Source/WebCore/css/ViewportStyleResolver.cpp (modified) (2 diffs)
• Source/WebCore/css/ViewportStyleResolver.h (modified) (2 diffs)
• Source/WebCore/css/WebKitCSSFilterRule.cpp (modified) (1 diff)
• Source/WebCore/css/WebKitCSSKeyframeRule.cpp (modified) (3 diffs)
• Source/WebCore/css/WebKitCSSKeyframeRule.h (modified) (3 diffs)
• Source/WebCore/css/WebKitCSSKeyframesRule.cpp (modified) (1 diff)
• Source/WebCore/css/WebKitCSSMatrix.cpp (modified) (2 diffs)
• Source/WebCore/css/WebKitCSSViewportRule.cpp (modified) (1 diff)
• Source/WebCore/dom/Attr.cpp (modified) (2 diffs)
• Source/WebCore/dom/Attr.h (modified) (2 diffs)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/ElementData.cpp (modified) (2 diffs)
• Source/WebCore/dom/ElementData.h (modified) (5 diffs)
• Source/WebCore/dom/StyledElement.cpp (modified) (9 diffs)
• Source/WebCore/dom/StyledElement.h (modified) (6 diffs)
• Source/WebCore/editing/ApplyStyleCommand.cpp (modified) (7 diffs)
• Source/WebCore/editing/DeleteButtonController.cpp (modified) (1 diff)
• Source/WebCore/editing/EditingStyle.cpp (modified) (44 diffs)
• Source/WebCore/editing/EditingStyle.h (modified) (6 diffs)
• Source/WebCore/editing/Editor.cpp (modified) (7 diffs)
• Source/WebCore/editing/Editor.h (modified) (4 diffs)
• Source/WebCore/editing/EditorCommand.cpp (modified) (9 diffs)
• Source/WebCore/editing/FrameSelection.cpp (modified) (2 diffs)
• Source/WebCore/editing/FrameSelection.h (modified) (2 diffs)
• Source/WebCore/editing/RemoveCSSPropertyCommand.cpp (modified) (2 diffs)
• Source/WebCore/editing/RemoveFormatCommand.cpp (modified) (1 diff)
• Source/WebCore/editing/ReplaceSelectionCommand.cpp (modified) (2 diffs)
• Source/WebCore/editing/ios/EditorIOS.mm (modified) (3 diffs)
• Source/WebCore/editing/mac/EditorMac.mm (modified) (1 diff)
• Source/WebCore/editing/markup.cpp (modified) (7 diffs)
• Source/WebCore/html/HTMLBRElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLBRElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLBodyElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLBodyElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLDivElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLDivElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLElement.cpp (modified) (7 diffs)
• Source/WebCore/html/HTMLElement.h (modified) (2 diffs)
• Source/WebCore/html/HTMLEmbedElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLEmbedElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLFontElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLFontElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLFrameSetElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLFrameSetElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLHRElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLHRElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLIFrameElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLIFrameElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLImageElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLImageElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLLIElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLLIElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLMarqueeElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLMarqueeElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLOListElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLOListElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLObjectElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLObjectElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLParagraphElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLParagraphElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLPlugInElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLPlugInElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLPreElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLPreElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLTableCaptionElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLTableCaptionElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLTableCellElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLTableCellElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLTableColElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLTableColElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLTableElement.cpp (modified) (11 diffs)
• Source/WebCore/html/HTMLTableElement.h (modified) (4 diffs)
• Source/WebCore/html/HTMLTablePartElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLTablePartElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLTableSectionElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLTableSectionElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLTextAreaElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLTextAreaElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLUListElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLUListElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLVideoElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLVideoElement.h (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)
• Source/WebCore/html/canvas/CanvasStyle.cpp (modified) (1 diff)
• Source/WebCore/html/shadow/MediaControlElementTypes.cpp (modified) (2 diffs)
• Source/WebCore/html/shadow/MeterShadowElement.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorCSSAgent.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorStyleSheet.cpp (modified) (3 diffs)
• Source/WebCore/loader/EmptyClients.h (modified) (1 diff)
• Source/WebCore/mathml/MathMLElement.cpp (modified) (1 diff)
• Source/WebCore/mathml/MathMLElement.h (modified) (1 diff)
• Source/WebCore/page/DragController.cpp (modified) (2 diffs)
• Source/WebCore/page/EditorClient.h (modified) (2 diffs)
• Source/WebCore/page/Frame.cpp (modified) (1 diff)
• Source/WebCore/page/PageSerializer.cpp (modified) (2 diffs)
• Source/WebCore/page/PageSerializer.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTableCell.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTreeAsText.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGAnimateElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGElement.cpp (modified) (4 diffs)
• Source/WebCore/svg/SVGElement.h (modified) (2 diffs)
• Source/WebCore/svg/SVGElementRareData.h (modified) (3 diffs)
• Source/WebCore/svg/SVGFontFaceElement.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGImageElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGImageElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGTextContentElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGTextContentElement.h (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h (modified) (2 diffs)
• Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (modified) (2 diffs)
• Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h (modified) (1 diff)
• Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (modified) (2 diffs)
• Source/WebKit/mac/WebView/WebFrame.mm (modified) (3 diffs)
• Source/WebKit/mac/WebView/WebHTMLView.mm (modified) (3 diffs)
• Source/WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp (modified) (2 diffs)
• Source/WebKit/win/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (modified) (2 diffs)
• Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• Tools/DumpRenderTree/efl/EditingCallbacks.cpp (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -1088 +1088 @@
     css/StyleInvalidationAnalysis.cpp
     css/StyleMedia.cpp
-    css/StylePropertySet.cpp
+    css/StyleProperties.cpp
     css/StylePropertyShorthand.cpp
     css/StyleResolver.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -2675 +2675 @@
         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 \

trunk/Source/WebCore/WebCore.exp.in

@@ -824 +824 @@
 __ZN7WebCore22HTMLPlugInImageElement24restartSnapshottedPlugInEv
 __ZN7WebCore22HTMLPlugInImageElement29setIsPrimarySnapshottedPlugInEb
+__ZN7WebCore22MutableStyleProperties25ensureCSSStyleDeclarationEv
+__ZN7WebCore22MutableStylePropertiesD1Ev
 __ZN7WebCore22RuntimeEnabledFeatures14sharedFeaturesEv
 __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
@@ -848 +850 @@
 __ZN7WebCore23AuthenticationChallenge23setAuthenticationClientEPNS_20AuthenticationClientE
 __ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorE
-__ZN7WebCore23MutableStylePropertySet25ensureCSSStyleDeclarationEv
-__ZN7WebCore23MutableStylePropertySetD1Ev
 __ZN7WebCore23SynchronousLoaderClient24platformBadResponseErrorEv
 __ZN7WebCore23dataForURLComponentTypeEP5NSURLl
@@ -866 +866 @@
 __ZN7WebCore24FrameDestructionObserverC2EPNS_5FrameE
 __ZN7WebCore24FrameDestructionObserverD2Ev
+__ZN7WebCore24ImmutableStylePropertiesD1Ev
 __ZN7WebCore24ReferenceFilterOperationC1ERKN3WTF6StringES4_NS_15FilterOperation13OperationTypeE
 __ZN7WebCore24createFragmentFromMarkupERNS_8DocumentERKN3WTF6StringES5_NS_19ParserContentPolicyE
@@ -873 +874 @@
 __ZN7WebCore24notifyHistoryItemChangedE
 __ZN7WebCore24pathByAppendingComponentERKN3WTF6StringES3_
-__ZN7WebCore25ImmutableStylePropertySetD1Ev
 __ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
 __ZN7WebCore25computeViewportAttributesENS_17ViewportArgumentsEiiifNS_7IntSizeE
@@ -1028 +1028 @@
 __ZN7WebCore6Chrome16setStatusbarTextEPNS_5FrameERKN3WTF6StringE
 __ZN7WebCore6Chrome5printEPNS_5FrameE
-__ZN7WebCore6Editor10applyStyleEPNS_16StylePropertySetENS_10EditActionE
+__ZN7WebCore6Editor10applyStyleEPNS_15StylePropertiesENS_10EditActionE
 __ZN7WebCore6Editor10findStringERKN3WTF6StringEj
 __ZN7WebCore6Editor10insertTextERKN3WTF6StringEPNS_5EventE
@@ -1045 +1045 @@
 __ZN7WebCore6Editor19deleteWithDirectionENS_18SelectionDirectionENS_15TextGranularityEbb
 __ZN7WebCore6Editor19insertUnorderedListEv
-__ZN7WebCore6Editor21applyStyleToSelectionEPNS_16StylePropertySetENS_10EditActionE
+__ZN7WebCore6Editor21applyStyleToSelectionEPNS_15StylePropertiesENS_10EditActionE
 __ZN7WebCore6Editor23setBaseWritingDirectionE16WritingDirection
-__ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_16StylePropertySetENS_10EditActionE
+__ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_15StylePropertiesENS_10EditActionE
 __ZN7WebCore6Editor24isSelectionUngrammaticalEv
 __ZN7WebCore6Editor24replaceSelectionWithTextERKN3WTF6StringEbb
@@ -1556 +1556 @@
 __ZNK7WebCore15ResourceRequest12cfURLRequestENS_20HTTPBodyUpdatePolicyE
 __ZNK7WebCore15ResourceRequest12nsURLRequestENS_20HTTPBodyUpdatePolicyE
+__ZNK7WebCore15StyleProperties11mutableCopyEv
 __ZNK7WebCore15VisiblePosition14characterAfterEv
 __ZNK7WebCore15VisiblePosition14localCaretRectERPNS_12RenderObjectE
@@ -1571 +1572 @@
 __ZNK7WebCore16ResourceResponse13nsURLResponseEv
 __ZNK7WebCore16ResourceResponse16certificateChainEv
-__ZNK7WebCore16StylePropertySet11mutableCopyEv
 __ZNK7WebCore16VisibleSelection17isContentEditableEv
 __ZNK7WebCore16VisibleSelection17toNormalizedRangeEv

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -9410 +9410 @@
     <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>
@@ -19785 +19785 @@
     <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" />

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -184 +184 @@
                 076970871463AD8700F502CF /* TextTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = 076970851463AD8700F502CF /* TextTrackList.h */; };
                 076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */; };
+                077664FC183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */; };
+                077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */; };
                 0779BF0D18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0779BF0A18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp */; };
                 0779BF0E18453168000B6AE7 /* HTMLMediaElementMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */; };
@@ -191 +193 @@
                 07846343145B151A00A58DF1 /* JSTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07846341145B151A00A58DF1 /* JSTrackEvent.h */; };
                 07846385145B1B8E00A58DF1 /* JSTrackCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 07846384145B1B8E00A58DF1 /* JSTrackCustom.h */; };
-                077664FC183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */; };
-                077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */; };
                 078E08FE17D14CEE00420AA1 /* MediaConstraintsImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B4A17CEC32700848E51 /* MediaConstraintsImpl.cpp */; };
                 078E08FF17D14CEE00420AA1 /* MediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B4C17CEC32700848E51 /* MediaStream.cpp */; };
@@ -3654 +3654 @@
                 A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE20A1989CA007FB8C5 /* CSSStyleRule.h */; };
                 A80E6D0D0A1989CA007FB8C5 /* CSSRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE30A1989CA007FB8C5 /* CSSRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                A80E6DFB0A199067007FB8C5 /* StylePropertySet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A80E6DF90A199067007FB8C5 /* StylePropertySet.cpp */; };
-                A80E6DFC0A199067007FB8C5 /* StylePropertySet.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6DFA0A199067007FB8C5 /* StylePropertySet.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                A80E6DFB0A199067007FB8C5 /* StyleProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A80E6DF90A199067007FB8C5 /* StyleProperties.cpp */; };
+                A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6DFA0A199067007FB8C5 /* StyleProperties.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A80E6E0F0A19911C007FB8C5 /* CSSStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6E0D0A19911C007FB8C5 /* CSSStyleDeclaration.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A80E734F0A199C77007FB8C5 /* CSSSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A80E73480A199C77007FB8C5 /* CSSSelector.cpp */; };
@@ -6808 +6808 @@
                 076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateAVFoundation.cpp; sourceTree = "<group>"; };
                 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundation.h; sourceTree = "<group>"; };
+                077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSQuickTimePluginReplacement.cpp; sourceTree = "<group>"; };
+                077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQuickTimePluginReplacement.h; sourceTree = "<group>"; };
                 0779BF0A18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaElementMediaStream.cpp; sourceTree = "<group>"; };
                 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaElementMediaStream.h; sourceTree = "<group>"; };
@@ -6813 +6815 @@
                 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamAudioSource.cpp; sourceTree = "<group>"; };
                 0783228318013ED800999E0C /* MediaStreamAudioSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamAudioSource.h; sourceTree = "<group>"; };
-                077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSQuickTimePluginReplacement.cpp; path = JSQuickTimePluginReplacement.cpp; sourceTree = "<group>"; };
-                077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSQuickTimePluginReplacement.h; path = JSQuickTimePluginReplacement.h; sourceTree = "<group>"; };
                 07846340145B151A00A58DF1 /* JSTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackEvent.cpp; sourceTree = "<group>"; };
                 07846341145B151A00A58DF1 /* JSTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTrackEvent.h; sourceTree = "<group>"; };
@@ -10469 +10469 @@
                 A80E6CE20A1989CA007FB8C5 /* CSSStyleRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSStyleRule.h; sourceTree = "<group>"; };
                 A80E6CE30A1989CA007FB8C5 /* CSSRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSRule.h; sourceTree = "<group>"; };
-                A80E6DF90A199067007FB8C5 /* StylePropertySet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StylePropertySet.cpp; sourceTree = "<group>"; };
-                A80E6DFA0A199067007FB8C5 /* StylePropertySet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StylePropertySet.h; sourceTree = "<group>"; };
+                A80E6DF90A199067007FB8C5 /* StyleProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = StyleProperties.cpp; sourceTree = "<group>"; };
+                A80E6DFA0A199067007FB8C5 /* StyleProperties.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StyleProperties.h; sourceTree = "<group>"; };
                 A80E6E0D0A19911C007FB8C5 /* CSSStyleDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSStyleDeclaration.h; sourceTree = "<group>"; };
                 A80E73480A199C77007FB8C5 /* CSSSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSSelector.cpp; sourceTree = "<group>"; };
@@ -20887 +20887 @@
                                 0FF5026F102BA96A0066F39A /* StyleMedia.h */,
                                 0FF50270102BA96A0066F39A /* StyleMedia.idl */,
-                                A80E6DF90A199067007FB8C5 /* StylePropertySet.cpp */,
-                                A80E6DFA0A199067007FB8C5 /* StylePropertySet.h */,
+                                A80E6DF90A199067007FB8C5 /* StyleProperties.cpp */,
+                                A80E6DFA0A199067007FB8C5 /* StyleProperties.h */,
                                 E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */,
                                 E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */,
@@ -24635 +24635 @@
                                 0FF50272102BA96A0066F39A /* StyleMedia.h in Headers */,
                                 BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */,
-                                A80E6DFC0A199067007FB8C5 /* StylePropertySet.h in Headers */,
+                                A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */,
                                 E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */,
                                 BC2272E40E82EE9B00E7F975 /* StyleRareInheritedData.h in Headers */,
@@ -27850 +27850 @@
                                 0FF50271102BA96A0066F39A /* StyleMedia.cpp in Sources */,
                                 BC5EB74D0E81E06700B25965 /* StyleMultiColData.cpp in Sources */,
-                                A80E6DFB0A199067007FB8C5 /* StylePropertySet.cpp in Sources */,
+                                A80E6DFB0A199067007FB8C5 /* StyleProperties.cpp in Sources */,
                                 E1B25106152A0BAF0069B779 /* StylePropertyShorthand.cpp in Sources */,
                                 BC2272E30E82EE9B00E7F975 /* StyleRareInheritedData.cpp in Sources */,

trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp

@@ -36 +36 @@
 #include "RuntimeEnabledFeatures.h"
 #include "Settings.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include <runtime/StringPrototype.h>
 #include <wtf/ASCIICType.h>

trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm

@@ -317 +317 @@
 
     $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". 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -3479 +3479 @@
 
     if ($type eq "CSSStyleDeclaration") {
-        AddToImplIncludes("StylePropertySet.h", $conditional);
+        AddToImplIncludes("StyleProperties.h", $conditional);
     }
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -678 +678 @@
     # 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";
 

trunk/Source/WebCore/css/CSSAllInOne.cpp

@@ -82 +82 @@
 #include "SelectorCheckerFastPath.cpp"
 #include "SelectorFilter.cpp"
-#include "StylePropertySet.cpp"
+#include "StyleProperties.cpp"
 #include "StylePropertyShorthand.cpp"
 #include "StyleResolver.cpp"

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -60 +60 @@
 #include "RenderView.h"
 #include "StyleInheritedData.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StylePropertyShorthand.h"
 #include "StyleResolver.h"
@@ -1710 +1710 @@
 }
 
-PassRef<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties() const
+PassRef<MutableStyleProperties> CSSComputedStyleDeclaration::copyProperties() const
 {
     return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).copyProperties();
@@ -3181 +3181 @@
 }
 
-PassRef<MutableStylePropertySet> ComputedStyleExtractor::copyProperties() const
+PassRef<MutableStyleProperties> ComputedStyleExtractor::copyProperties() const
 {
     return copyPropertiesInSet(computedProperties, numComputedProperties);
@@ -3234 +3234 @@
 }
 
-PassRef<MutableStylePropertySet> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
+PassRef<MutableStyleProperties> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
 {
     Vector<CSSProperty, 256> list;
@@ -3243 +3243 @@
             list.append(CSSProperty(set[i], value.release(), false));
     }
-    return MutableStylePropertySet::create(list.data(), list.size());
+    return MutableStyleProperties::create(list.data(), list.size());
 }
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h

@@ -33 +33 @@
 class Color;
 class FilterOperations;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class Node;
 class RenderObject;
@@ -39 +39 @@
 class SVGPaint;
 class ShadowData;
-class StylePropertySet;
+class StyleProperties;
 class StylePropertyShorthand;
 
@@ -58 +58 @@
 
     // 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;
@@ -125 +125 @@
     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;

trunk/Source/WebCore/css/CSSFontFaceRule.cpp

@@ -24 +24 @@
 
 #include "PropertySetCSSStyleDeclaration.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include <wtf/text/StringBuilder.h>

trunk/Source/WebCore/css/CSSFontSelector.cpp

@@ -46 +46 @@
 #include "Settings.h"
 #include "SimpleFontData.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "StyleRule.h"
@@ -91 +91 @@
 {
     // 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);

trunk/Source/WebCore/css/CSSPageRule.cpp

@@ -28 +28 @@
 #include "Document.h"
 #include "PropertySetCSSStyleDeclaration.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include <wtf/Vector.h>

trunk/Source/WebCore/css/CSSParser.cpp

@@ -75 +75 @@
 #include "SVGParserUtilities.h"
 #include "Settings.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StylePropertyShorthand.h"
 #include "StyleRule.h"
@@ -508 +508 @@
 }
 
-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());
@@ -606 +606 @@
 }
 
-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());
@@ -1171 +1171 @@
 }
 
-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());
@@ -1228 +1228 @@
 }
 
-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)
@@ -1279 +1279 @@
     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;
@@ -1289 +1289 @@
 }
 
-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());
@@ -1312 +1312 @@
 }
 
-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);
@@ -1398 +1398 @@
 }
 
-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();
@@ -1405 +1405 @@
 }
 
-PassRef<ImmutableStylePropertySet> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
+PassRef<ImmutableStyleProperties> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
 {
     setStyleSheet(contextStyleSheet);
@@ -1416 +1416 @@
         deleteFontFaceOnlyValues();
 
-    PassRef<ImmutableStylePropertySet> style = createStylePropertySet();
+    PassRef<ImmutableStyleProperties> style = createStyleProperties();
     clearProperties();
     return style;
@@ -1422 +1422 @@
 
 
-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.
@@ -1495 +1495 @@
 }
 
-PassRef<ImmutableStylePropertySet> CSSParser::createStylePropertySet()
+PassRef<ImmutableStyleProperties> CSSParser::createStyleProperties()
 {
     BitArray<numCSSProperties> seenProperties;
@@ -1507 +1507 @@
         results.remove(0, unusedEntries);
 
-    return ImmutableStylePropertySet::create(results.data(), results.size(), m_context.mode);
+    return ImmutableStyleProperties::create(results.data(), results.size(), m_context.mode);
 }
 
@@ -9486 +9486 @@
 PassRefPtr<StyleRuleBase> CSSParser::createFilterRule(const CSSParserString& filterName)
 {
-    RefPtr<StyleRuleFilter> rule = StyleRuleFilter::create(filterName, createStylePropertySet());
+    RefPtr<StyleRuleFilter> rule = StyleRuleFilter::create(filterName, createStyleProperties());
     clearProperties();
     processAndAddNewRuleToSourceTreeIfNeeded();
@@ -11903 +11903 @@
         if (m_hasFontFaceOnlyValues)
             deleteFontFaceOnlyValues();
-        rule = StyleRule::create(m_lastSelectorLineNumber, createStylePropertySet());
+        rule = StyleRule::create(m_lastSelectorLineNumber, createStyleProperties());
         rule->parserAdoptSelectorVector(*selectors);
         processAndAddNewRuleToSourceTreeIfNeeded();
@@ -11929 +11929 @@
         }
     }
-    RefPtr<StyleRuleFontFace> rule = StyleRuleFontFace::create(createStylePropertySet());
+    RefPtr<StyleRuleFontFace> rule = StyleRuleFontFace::create(createStyleProperties());
     clearProperties();
     processAndAddNewRuleToSourceTreeIfNeeded();
@@ -12035 +12035 @@
     RefPtr<StyleRulePage> rule;
     if (pageSelector) {
-        rule = StyleRulePage::create(createStylePropertySet());
+        rule = StyleRulePage::create(createStyleProperties());
         Vector<OwnPtr<CSSParserSelector>> selectorVector;
         selectorVector.append(pageSelector);
@@ -12140 +12140 @@
     }
 
-    RefPtr<StyleKeyframe> keyframe = StyleKeyframe::create(createStylePropertySet());
+    RefPtr<StyleKeyframe> keyframe = StyleKeyframe::create(createStyleProperties());
     keyframe->setKeyText(keyString.toString());
 
@@ -12357 +12357 @@
     m_allowImportRules = m_allowNamespaceDeclarations = false;
 
-    RefPtr<StyleRuleViewport> rule = StyleRuleViewport::create(createStylePropertySet());
+    RefPtr<StyleRuleViewport> rule = StyleRuleViewport::create(createStyleProperties());
     clearProperties();
 

trunk/Source/WebCore/css/CSSParser.h

@@ -55 +55 @@
 class Document;
 class Element;
-class ImmutableStylePropertySet;
+class ImmutableStyleProperties;
 class MediaQueryExp;
 class MediaQuerySet;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class StyleKeyframe;
 class StylePropertyShorthand;
@@ -94 +94 @@
     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&);
 
@@ -354 +354 @@
     void clearProperties();
 
-    PassRef<ImmutableStylePropertySet> createStylePropertySet();
+    PassRef<ImmutableStyleProperties> createStyleProperties();
 
     CSSParserContext m_context;
@@ -527 +527 @@
     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 {

trunk/Source/WebCore/css/CSSStyleDeclaration.h

@@ -32 +32 @@
 class CSSStyleSheet;
 class CSSValue;
-class MutableStylePropertySet;
-class StylePropertySet;
+class MutableStyleProperties;
+class StyleProperties;
 class StyledElement;
 
@@ -66 +66 @@
     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; }

trunk/Source/WebCore/css/CSSStyleRule.cpp

@@ -29 +29 @@
 #include "PropertySetCSSStyleDeclaration.h"
 #include "RuleSet.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include <wtf/text/StringBuilder.h>

trunk/Source/WebCore/css/DOMWindowCSS.cpp

@@ -34 +34 @@
 
 #include "CSSParser.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include <wtf/text/WTFString.h>
 
@@ -74 +74 @@
         return false;
 
-    RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> dummyStyle = MutableStyleProperties::create();
     return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, CSSStrictMode, 0);
 }

trunk/Source/WebCore/css/ElementRuleCollector.cpp

@@ -41 +41 @@
 #include "SVGElement.h"
 #include "SelectorCheckerFastPath.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyledElement.h"
 
@@ -48 +48 @@
 namespace WebCore {
 
-static const StylePropertySet& leftToRightDeclaration()
-{
-    static NeverDestroyed<Ref<MutableStylePropertySet>> leftToRightDecl(MutableStylePropertySet::create());
+static const StyleProperties& leftToRightDeclaration()
+{
+    static NeverDestroyed<Ref<MutableStyleProperties>> leftToRightDecl(MutableStyleProperties::create());
     if (leftToRightDecl.get()->isEmpty())
         leftToRightDecl.get()->setProperty(CSSPropertyDirection, CSSValueLtr);
@@ -56 +56 @@
 }
 
-static const StylePropertySet& rightToLeftDeclaration()
-{
-    static NeverDestroyed<Ref<MutableStylePropertySet>> rightToLeftDecl(MutableStylePropertySet::create());
+static const StyleProperties& rightToLeftDeclaration()
+{
+    static NeverDestroyed<Ref<MutableStyleProperties>> rightToLeftDecl(MutableStyleProperties::create());
     if (rightToLeftDecl.get()->isEmpty())
         rightToLeftDecl.get()->setProperty(CSSPropertyDirection, CSSValueRtl);
@@ -101 +101 @@
 }
 
-inline void ElementRuleCollector::addElementStyleProperties(const StylePropertySet* propertySet, bool isCacheable)
+inline void ElementRuleCollector::addElementStyleProperties(const StyleProperties* propertySet, bool isCacheable)
 {
     if (!propertySet)
@@ -361 +361 @@
 
             // If the rule has no properties to apply, then ignore it in the non-debug mode.
-            const StylePropertySet& properties = rule->properties();
+            const StyleProperties& properties = rule->properties();
             if (properties.isEmpty() && !matchRequest.includeEmptyRules) {
                 if (hasInspectorFrontends)

trunk/Source/WebCore/css/ElementRuleCollector.h

@@ -74 +74 @@
 private:
     Document& document() { return m_state.document(); }
-    void addElementStyleProperties(const StylePropertySet*, bool isCacheable = true);
+    void addElementStyleProperties(const StyleProperties*, bool isCacheable = true);
 
     void matchUARules(RuleSet*);

trunk/Source/WebCore/css/FontLoader.cpp

@@ -37 +37 @@
 #include "Document.h"
 #include "FrameView.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 
@@ -262 +262 @@
 }
 
-static void applyPropertyToCurrentStyle(StyleResolver* styleResolver, CSSPropertyID id, const RefPtr<StylePropertySet>& parsedStyle)
+static void applyPropertyToCurrentStyle(StyleResolver* styleResolver, CSSPropertyID id, const RefPtr<StyleProperties>& parsedStyle)
 {
     styleResolver->applyPropertyToCurrentStyle(id, parsedStyle->getPropertyCSSValue(id).get());
@@ -270 +270 @@
 {
     // Interpret fontString in the same way as the 'font' attribute of CanvasRenderingContext2D.
-    RefPtr<MutableStylePropertySet> parsedStyle = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> parsedStyle = MutableStyleProperties::create();
     CSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, fontString, true, CSSStrictMode, 0);
     if (parsedStyle->isEmpty())

trunk/Source/WebCore/css/PageRuleCollector.cpp

@@ -31 +31 @@
 
 #include "CSSDefaultStyleSheets.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 
@@ -119 +119 @@
 
         // If the rule has no properties to apply, then ignore it.
-        const StylePropertySet& properties = rule->properties();
+        const StyleProperties& properties = rule->properties();
         if (properties.isEmpty())
             continue;

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp

@@ -29 +29 @@
 #include "MutationObserverInterestGroup.h"
 #include "MutationRecord.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyledElement.h"
 
@@ -289 +289 @@
 }
 
-PassRef<MutableStylePropertySet> PropertySetCSSStyleDeclaration::copyProperties() const
+PassRef<MutableStyleProperties> PropertySetCSSStyleDeclaration::copyProperties() const
 {
     return m_propertySet->mutableCopy();
 }
     
-StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStylePropertySet& propertySet, CSSRule& parentRule)
+StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStyleProperties& propertySet, CSSRule& parentRule)
     : PropertySetCSSStyleDeclaration(&propertySet)
     , m_refCount(1)
@@ -340 +340 @@
 }
 
-void StyleRuleCSSStyleDeclaration::reattach(MutableStylePropertySet& propertySet)
+void StyleRuleCSSStyleDeclaration::reattach(MutableStyleProperties& propertySet)
 {
     m_propertySet->deref();

trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h

@@ -37 +37 @@
 class CSSProperty;
 class CSSValue;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class StyleSheetContents;
 class StyledElement;
@@ -43 +43 @@
 class PropertySetCSSStyleDeclaration : public CSSStyleDeclaration {
 public:
-    PropertySetCSSStyleDeclaration(MutableStylePropertySet* propertySet) : m_propertySet(propertySet) { }
+    PropertySetCSSStyleDeclaration(MutableStyleProperties* propertySet) : m_propertySet(propertySet) { }
     
     virtual StyledElement* parentElement() const { return 0; }
@@ -69 +69 @@
     virtual void setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) OVERRIDE;
     
-    virtual PassRef<MutableStylePropertySet> copyProperties() const OVERRIDE;
+    virtual PassRef<MutableStyleProperties> copyProperties() const OVERRIDE;
 
     CSSValue* cloneAndCacheForCSSOM(CSSValue*);
@@ -78 +78 @@
     virtual void didMutate(MutationType) { }
 
-    MutableStylePropertySet* m_propertySet;
+    MutableStyleProperties* m_propertySet;
     OwnPtr<HashMap<CSSValue*, RefPtr<CSSValue>>> m_cssomCSSValueClones;
 };
@@ -85 +85 @@
 {
 public:
-    static PassRefPtr<StyleRuleCSSStyleDeclaration> create(MutableStylePropertySet& propertySet, CSSRule& parentRule)
+    static PassRefPtr<StyleRuleCSSStyleDeclaration> create(MutableStyleProperties& propertySet, CSSRule& parentRule)
     {
         return adoptRef(new StyleRuleCSSStyleDeclaration(propertySet, parentRule));
@@ -96 +96 @@
     virtual void deref() OVERRIDE;
 
-    void reattach(MutableStylePropertySet&);
+    void reattach(MutableStyleProperties&);
 
 private:
-    StyleRuleCSSStyleDeclaration(MutableStylePropertySet&, CSSRule&);
+    StyleRuleCSSStyleDeclaration(MutableStyleProperties&, CSSRule&);
 
     virtual CSSStyleSheet* parentStyleSheet() const OVERRIDE;
@@ -115 +115 @@
 {
 public:
-    InlineCSSStyleDeclaration(MutableStylePropertySet* propertySet, StyledElement* parentElement)
+    InlineCSSStyleDeclaration(MutableStyleProperties* propertySet, StyledElement* parentElement)
         : PropertySetCSSStyleDeclaration(propertySet)
         , m_parentElement(parentElement) 

trunk/Source/WebCore/css/StyleProperties.cpp

@@ -22 +22 @@
 
 #include "config.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 #include "CSSComputedStyleDeclaration.h"
@@ -44 +44 @@
 namespace WebCore {
 
-static size_t sizeForImmutableStylePropertySetWithPropertyCount(unsigned count)
-{
-    return sizeof(ImmutableStylePropertySet) - sizeof(void*) + sizeof(CSSValue*) * count + sizeof(StylePropertyMetadata) * count;
+static size_t sizeForImmutableStylePropertiesWithPropertyCount(unsigned count)
+{
+    return sizeof(ImmutableStyleProperties) - sizeof(void*) + sizeof(CSSValue*) * count + sizeof(StylePropertyMetadata) * count;
 }
 
@@ -56 +56 @@
 }
 
-PassRef<ImmutableStylePropertySet> ImmutableStylePropertySet::create(const CSSProperty* properties, unsigned count, CSSParserMode cssParserMode)
-{
-    void* slot = WTF::fastMalloc(sizeForImmutableStylePropertySetWithPropertyCount(count));
-    return adoptRef(*new (NotNull, slot) ImmutableStylePropertySet(properties, count, cssParserMode));
-}
-
-PassRef<ImmutableStylePropertySet> StylePropertySet::immutableCopyIfNeeded() const
+PassRef<ImmutableStyleProperties> ImmutableStyleProperties::create(const CSSProperty* properties, unsigned count, CSSParserMode cssParserMode)
+{
+    void* slot = WTF::fastMalloc(sizeForImmutableStylePropertiesWithPropertyCount(count));
+    return adoptRef(*new (NotNull, slot) ImmutableStyleProperties(properties, count, cssParserMode));
+}
+
+PassRef<ImmutableStyleProperties> StyleProperties::immutableCopyIfNeeded() const
 {
     if (!isMutable())
-        return static_cast<ImmutableStylePropertySet&>(const_cast<StylePropertySet&>(*this));
-    const MutableStylePropertySet& mutableThis = static_cast<const MutableStylePropertySet&>(*this);
-    return ImmutableStylePropertySet::create(mutableThis.m_propertyVector.data(), mutableThis.m_propertyVector.size(), cssParserMode());
-}
-
-MutableStylePropertySet::MutableStylePropertySet(CSSParserMode cssParserMode)
-    : StylePropertySet(cssParserMode)
-{
-}
-
-MutableStylePropertySet::MutableStylePropertySet(const CSSProperty* properties, unsigned length)
-    : StylePropertySet(CSSStrictMode)
+        return static_cast<ImmutableStyleProperties&>(const_cast<StyleProperties&>(*this));
+    const MutableStyleProperties& mutableThis = static_cast<const MutableStyleProperties&>(*this);
+    return ImmutableStyleProperties::create(mutableThis.m_propertyVector.data(), mutableThis.m_propertyVector.size(), cssParserMode());
+}
+
+MutableStyleProperties::MutableStyleProperties(CSSParserMode cssParserMode)
+    : StyleProperties(cssParserMode)
+{
+}
+
+MutableStyleProperties::MutableStyleProperties(const CSSProperty* properties, unsigned length)
+    : StyleProperties(CSSStrictMode)
 {
     m_propertyVector.reserveInitialCapacity(length);
@@ -83 +83 @@
 }
 
-MutableStylePropertySet::~MutableStylePropertySet()
-{
-}
-
-ImmutableStylePropertySet::ImmutableStylePropertySet(const CSSProperty* properties, unsigned length, CSSParserMode cssParserMode)
-    : StylePropertySet(cssParserMode, length)
+MutableStyleProperties::~MutableStyleProperties()
+{
+}
+
+ImmutableStyleProperties::ImmutableStyleProperties(const CSSProperty* properties, unsigned length, CSSParserMode cssParserMode)
+    : StyleProperties(cssParserMode, length)
 {
     StylePropertyMetadata* metadataArray = const_cast<StylePropertyMetadata*>(this->metadataArray());
@@ -99 +99 @@
 }
 
-ImmutableStylePropertySet::~ImmutableStylePropertySet()
+ImmutableStyleProperties::~ImmutableStyleProperties()
 {
     CSSValue** valueArray = const_cast<CSSValue**>(this->valueArray());
@@ -106 +106 @@
 }
 
-MutableStylePropertySet::MutableStylePropertySet(const StylePropertySet& other)
-    : StylePropertySet(other.cssParserMode())
+MutableStyleProperties::MutableStyleProperties(const StyleProperties& other)
+    : StyleProperties(other.cssParserMode())
 {
     if (other.isMutable())
-        m_propertyVector = static_cast<const MutableStylePropertySet&>(other).m_propertyVector;
+        m_propertyVector = static_cast<const MutableStyleProperties&>(other).m_propertyVector;
     else {
         m_propertyVector.reserveInitialCapacity(other.propertyCount());
@@ -118 +118 @@
 }
 
-String StylePropertySet::getPropertyValue(CSSPropertyID propertyID) const
+String StyleProperties::getPropertyValue(CSSPropertyID propertyID) const
 {
     RefPtr<CSSValue> value = getPropertyCSSValue(propertyID);
@@ -209 +209 @@
         return get4Values(borderRadiusShorthand());
     default:
-          return String();
-    }
-}
-
-String StylePropertySet::borderSpacingValue(const StylePropertyShorthand& shorthand) const
+        return String();
+    }
+}
+
+String StyleProperties::borderSpacingValue(const StylePropertyShorthand& shorthand) const
 {
     RefPtr<CSSValue> horizontalValue = getPropertyCSSValue(shorthand.properties()[0]);
@@ -231 +231 @@
 }
 
-void StylePropertySet::appendFontLonghandValueIfExplicit(CSSPropertyID propertyID, StringBuilder& result, String& commonValue) const
+void StyleProperties::appendFontLonghandValueIfExplicit(CSSPropertyID propertyID, StringBuilder& result, String& commonValue) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -266 +266 @@
 }
 
-String StylePropertySet::fontValue() const
+String StyleProperties::fontValue() const
 {
     int fontSizePropertyIndex = findPropertyIndex(CSSPropertyFontSize);
@@ -295 +295 @@
 }
 
-String StylePropertySet::get4Values(const StylePropertyShorthand& shorthand) const
+String StyleProperties::get4Values(const StylePropertyShorthand& shorthand) const
 {
     // Assume the properties are in the usual order top, right, bottom, left.
@@ -349 +349 @@
 }
 
-String StylePropertySet::getLayeredShorthandValue(const StylePropertyShorthand& shorthand) const
+String StyleProperties::getLayeredShorthandValue(const StylePropertyShorthand& shorthand) const
 {
     StringBuilder result;
@@ -371 +371 @@
     bool commonValueInitialized = false;
 
-    // Now stitch the properties together.  Implicit initial values are flagged as such and
+    // Now stitch the properties together. Implicit initial values are flagged as such and
     // can safely be omitted.
     for (size_t i = 0; i < numLayers; i++) {
@@ -391 +391 @@
                         if (i != numLayers - 1)
                             value = 0;
-                    } else if (i != 0) // Other singletons only belong in the first layer.
+                    } else if (i) // Other singletons only belong in the first layer.
                         value = 0;
                 }
@@ -486 +486 @@
 }
 
-String StylePropertySet::getShorthandValue(const StylePropertyShorthand& shorthand) const
+String StyleProperties::getShorthandValue(const StylePropertyShorthand& shorthand) const
 {
     String commonValue;
@@ -516 +516 @@
 
 // only returns a non-null value if all properties have the same, non-null value
-String StylePropertySet::getCommonValue(const StylePropertyShorthand& shorthand) const
+String StyleProperties::getCommonValue(const StylePropertyShorthand& shorthand) const
 {
     String res;
@@ -541 +541 @@
 }
 
-String StylePropertySet::borderPropertyValue(CommonValueMode valueMode) const
+String StyleProperties::borderPropertyValue(CommonValueMode valueMode) const
 {
     const StylePropertyShorthand properties[3] = { borderWidthShorthand(), borderStyleShorthand(), borderColorShorthand() };
@@ -569 +569 @@
 }
 
-PassRefPtr<CSSValue> StylePropertySet::getPropertyCSSValue(CSSPropertyID propertyID) const
+PassRefPtr<CSSValue> StyleProperties::getPropertyCSSValue(CSSPropertyID propertyID) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -577 +577 @@
 }
 
-bool MutableStylePropertySet::removeShorthandProperty(CSSPropertyID propertyID)
+bool MutableStyleProperties::removeShorthandProperty(CSSPropertyID propertyID)
 {
     StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
@@ -593 +593 @@
 }
 
-bool MutableStylePropertySet::removeProperty(CSSPropertyID propertyID, String* returnText)
+bool MutableStyleProperties::removeProperty(CSSPropertyID propertyID, String* returnText)
 {
     if (removeShorthandProperty(propertyID)) {
@@ -621 +621 @@
 }
 
-void MutableStylePropertySet::removePrefixedOrUnprefixedProperty(CSSPropertyID propertyID)
+void MutableStyleProperties::removePrefixedOrUnprefixedProperty(CSSPropertyID propertyID)
 {
     int foundPropertyIndex = findPropertyIndex(prefixingVariantForPropertyId(propertyID));
@@ -629 +629 @@
 }
 
-bool StylePropertySet::propertyIsImportant(CSSPropertyID propertyID) const
+bool StyleProperties::propertyIsImportant(CSSPropertyID propertyID) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -646 +646 @@
 }
 
-String StylePropertySet::getPropertyShorthand(CSSPropertyID propertyID) const
+String StyleProperties::getPropertyShorthand(CSSPropertyID propertyID) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -654 +654 @@
 }
 
-bool StylePropertySet::isPropertyImplicit(CSSPropertyID propertyID) const
+bool StyleProperties::isPropertyImplicit(CSSPropertyID propertyID) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -662 +662 @@
 }
 
-bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, const String& value, bool important, StyleSheetContents* contextStyleSheet)
+bool MutableStyleProperties::setProperty(CSSPropertyID propertyID, const String& value, bool important, StyleSheetContents* contextStyleSheet)
 {
     // Setting the value to an empty string just removes the property in both IE and Gecko.
@@ -674 +674 @@
 }
 
-void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> prpValue, bool important)
+void MutableStyleProperties::setProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> prpValue, bool important)
 {
     StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
@@ -689 +689 @@
 }
 
-void MutableStylePropertySet::setProperty(const CSSProperty& property, CSSProperty* slot)
+void MutableStyleProperties::setProperty(const CSSProperty& property, CSSProperty* slot)
 {
     if (!removeShorthandProperty(property.id())) {
@@ -711 +711 @@
 }
 
-void MutableStylePropertySet::appendPrefixingVariantProperty(const CSSProperty& property)
+void MutableStyleProperties::appendPrefixingVariantProperty(const CSSProperty& property)
 {
     m_propertyVector.append(property);
@@ -721 +721 @@
 }
 
-void MutableStylePropertySet::setPrefixingVariantProperty(const CSSProperty& property)
+void MutableStyleProperties::setPrefixingVariantProperty(const CSSProperty& property)
 {
     CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
@@ -729 +729 @@
 }
 
-bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValueID identifier, bool important)
+bool MutableStyleProperties::setProperty(CSSPropertyID propertyID, CSSValueID identifier, bool important)
 {
     setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important));
@@ -735 +735 @@
 }
 
-bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSPropertyID identifier, bool important)
+bool MutableStyleProperties::setProperty(CSSPropertyID propertyID, CSSPropertyID identifier, bool important)
 {
     setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important));
@@ -741 +741 @@
 }
 
-void MutableStylePropertySet::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
+void MutableStyleProperties::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
 {
     m_propertyVector.clear();
@@ -754 +754 @@
 }
 
-void MutableStylePropertySet::addParsedProperties(const Vector<CSSProperty>& properties)
+void MutableStyleProperties::addParsedProperties(const Vector<CSSProperty>& properties)
 {
     m_propertyVector.reserveCapacity(m_propertyVector.size() + properties.size());
@@ -761 +761 @@
 }
 
-void MutableStylePropertySet::addParsedProperty(const CSSProperty& property)
+void MutableStyleProperties::addParsedProperty(const CSSProperty& property)
 {
     // Only add properties that have no !important counterpart present
@@ -768 +768 @@
 }
 
-String StylePropertySet::asText() const
+String StyleProperties::asText() const
 {
     StringBuilder result;
@@ -1018 +1018 @@
 }
 
-bool StylePropertySet::hasCSSOMWrapper() const
-{
-    return m_isMutable && static_cast<const MutableStylePropertySet*>(this)->m_cssomWrapper;
-}
-
-void MutableStylePropertySet::mergeAndOverrideOnConflict(const StylePropertySet& other)
+bool StyleProperties::hasCSSOMWrapper() const
+{
+    return m_isMutable && static_cast<const MutableStyleProperties*>(this)->m_cssomWrapper;
+}
+
+void MutableStyleProperties::mergeAndOverrideOnConflict(const StyleProperties& other)
 {
     unsigned size = other.propertyCount();
@@ -1030 +1030 @@
 }
 
-void StylePropertySet::addSubresourceStyleURLs(ListHashSet<URL>& urls, StyleSheetContents* contextStyleSheet) const
+void StyleProperties::addSubresourceStyleURLs(ListHashSet<URL>& urls, StyleSheetContents* contextStyleSheet) const
 {
     unsigned size = propertyCount();
@@ -1037 +1037 @@
 }
 
-bool StylePropertySet::hasFailedOrCanceledSubresources() const
+bool StyleProperties::hasFailedOrCanceledSubresources() const
 {
     unsigned size = propertyCount();
@@ -1079 +1079 @@
 };
 
-void MutableStylePropertySet::clear()
+void MutableStyleProperties::clear()
 {
     m_propertyVector.clear();
@@ -1086 +1086 @@
 const unsigned numBlockProperties = WTF_ARRAY_LENGTH(blockProperties);
 
-PassRef<MutableStylePropertySet> StylePropertySet::copyBlockProperties() const
+PassRef<MutableStyleProperties> StyleProperties::copyBlockProperties() const
 {
     return copyPropertiesInSet(blockProperties, numBlockProperties);
 }
 
-void MutableStylePropertySet::removeBlockProperties()
+void MutableStyleProperties::removeBlockProperties()
 {
     removePropertiesInSet(blockProperties, numBlockProperties);
 }
 
-bool MutableStylePropertySet::removePropertiesInSet(const CSSPropertyID* set, unsigned length)
+bool MutableStyleProperties::removePropertiesInSet(const CSSPropertyID* set, unsigned length)
 {
     if (m_propertyVector.isEmpty())
@@ -1125 +1125 @@
 }
 
-int StylePropertySet::findPropertyIndex(CSSPropertyID propertyID) const
+int StyleProperties::findPropertyIndex(CSSPropertyID propertyID) const
 {
     // Convert here propertyID into an uint16_t to compare it with the metadata's m_propertyID to avoid
@@ -1137 +1137 @@
 }
 
-CSSProperty* MutableStylePropertySet::findCSSPropertyWithID(CSSPropertyID propertyID)
+CSSProperty* MutableStyleProperties::findCSSPropertyWithID(CSSPropertyID propertyID)
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -1145 +1145 @@
 }
 
-bool StylePropertySet::propertyMatches(CSSPropertyID propertyID, const CSSValue* propertyValue) const
+bool StyleProperties::propertyMatches(CSSPropertyID propertyID, const CSSValue* propertyValue) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
@@ -1153 +1153 @@
 }
 
-void MutableStylePropertySet::removeEquivalentProperties(const StylePropertySet* style)
+void MutableStyleProperties::removeEquivalentProperties(const StyleProperties* style)
 {
     Vector<CSSPropertyID> propertiesToRemove;
@@ -1167 +1167 @@
 }
 
-void MutableStylePropertySet::removeEquivalentProperties(const ComputedStyleExtractor* computedStyle)
+void MutableStyleProperties::removeEquivalentProperties(const ComputedStyleExtractor* computedStyle)
 {
     Vector<CSSPropertyID> propertiesToRemove;
@@ -1181 +1181 @@
 }
 
-PassRef<MutableStylePropertySet> StylePropertySet::mutableCopy() const
-{
-    return adoptRef(*new MutableStylePropertySet(*this));
-}
-
-PassRef<MutableStylePropertySet> StylePropertySet::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
+PassRef<MutableStyleProperties> StyleProperties::mutableCopy() const
+{
+    return adoptRef(*new MutableStyleProperties(*this));
+}
+
+PassRef<MutableStyleProperties> StyleProperties::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
 {
     Vector<CSSProperty, 256> list;
@@ -1195 +1195 @@
             list.append(CSSProperty(set[i], value.release(), false));
     }
-    return MutableStylePropertySet::create(list.data(), list.size());
-}
-
-PropertySetCSSStyleDeclaration* MutableStylePropertySet::cssStyleDeclaration()
+    return MutableStyleProperties::create(list.data(), list.size());
+}
+
+PropertySetCSSStyleDeclaration* MutableStyleProperties::cssStyleDeclaration()
 {
     return m_cssomWrapper.get();
 }
 
-CSSStyleDeclaration* MutableStylePropertySet::ensureCSSStyleDeclaration()
+CSSStyleDeclaration* MutableStyleProperties::ensureCSSStyleDeclaration()
 {
     if (m_cssomWrapper) {
@@ -1214 +1214 @@
 }
 
-CSSStyleDeclaration* MutableStylePropertySet::ensureInlineCSSStyleDeclaration(StyledElement* parentElement)
+CSSStyleDeclaration* MutableStyleProperties::ensureInlineCSSStyleDeclaration(StyledElement* parentElement)
 {
     if (m_cssomWrapper) {
@@ -1224 +1224 @@
 }
 
-unsigned StylePropertySet::averageSizeInBytes()
+unsigned StyleProperties::averageSizeInBytes()
 {
     // Please update this if the storage scheme changes so that this longer reflects the actual size.
-    return sizeForImmutableStylePropertySetWithPropertyCount(4);
+    return sizeForImmutableStylePropertiesWithPropertyCount(4);
 }
 
 // See the function above if you need to update this.
-struct SameSizeAsStylePropertySet : public RefCounted<SameSizeAsStylePropertySet> {
+struct SameSizeAsStyleProperties : public RefCounted<SameSizeAsStyleProperties> {
     unsigned bitfield;
 };
-COMPILE_ASSERT(sizeof(StylePropertySet) == sizeof(SameSizeAsStylePropertySet), style_property_set_should_stay_small);
+COMPILE_ASSERT(sizeof(StyleProperties) == sizeof(SameSizeAsStyleProperties), style_property_set_should_stay_small);
 
 #ifndef NDEBUG
-void StylePropertySet::showStyle()
+void StyleProperties::showStyle()
 {
     fprintf(stderr, "%s\n", asText().ascii().data());
@@ -1243 +1243 @@
 #endif
 
-PassRef<MutableStylePropertySet> MutableStylePropertySet::create(CSSParserMode cssParserMode)
-{
-    return adoptRef(*new MutableStylePropertySet(cssParserMode));
-}
-
-PassRef<MutableStylePropertySet> MutableStylePropertySet::create(const CSSProperty* properties, unsigned count)
-{
-    return adoptRef(*new MutableStylePropertySet(properties, count));
-}
-
-String StylePropertySet::PropertyReference::cssName() const
+PassRef<MutableStyleProperties> MutableStyleProperties::create(CSSParserMode cssParserMode)
+{
+    return adoptRef(*new MutableStyleProperties(cssParserMode));
+}
+
+PassRef<MutableStyleProperties> MutableStyleProperties::create(const CSSProperty* properties, unsigned count)
+{
+    return adoptRef(*new MutableStyleProperties(properties, count));
+}
+
+String StyleProperties::PropertyReference::cssName() const
 {
     return getPropertyNameString(id());
 }
 
-String StylePropertySet::PropertyReference::cssText() const
+String StyleProperties::PropertyReference::cssText() const
 {
     StringBuilder result;

trunk/Source/WebCore/css/StyleProperties.h

@@ -20 +20 @@
  */
 
-#ifndef StylePropertySet_h
-#define StylePropertySet_h
+#ifndef StyleProperties_h
+#define StyleProperties_h
 
 #include "CSSParserMode.h"
@@ -37 +37 @@
 class CSSStyleDeclaration;
 class ComputedStyleExtractor;
-class ImmutableStylePropertySet;
+class ImmutableStyleProperties;
 class URL;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class PropertySetCSSStyleDeclaration;
 class StyledElement;
@@ -45 +45 @@
 class StyleSheetContents;
 
-class StylePropertySet : public RefCounted<StylePropertySet> {
+class StyleProperties : public RefCounted<StyleProperties> {
     friend class PropertyReference;
 public:
@@ -54 +54 @@
     class PropertyReference {
     public:
-        PropertyReference(const StylePropertySet& propertySet, unsigned index)
+        PropertyReference(const StyleProperties& propertySet, unsigned index)
             : m_propertySet(propertySet)
             , m_index(index)
@@ -81 +81 @@
         const CSSValue* propertyValue() const;
 
-        const StylePropertySet& m_propertySet;
+        const StyleProperties& m_propertySet;
         unsigned m_index;
     };
@@ -95 +95 @@
     bool isPropertyImplicit(CSSPropertyID) const;
 
-    PassRef<MutableStylePropertySet> copyBlockProperties() const;
+    PassRef<MutableStyleProperties> copyBlockProperties() const;
 
     CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cssParserMode); }
@@ -101 +101 @@
     void addSubresourceStyleURLs(ListHashSet<URL>&, StyleSheetContents* contextStyleSheet) const;
 
-    PassRef<MutableStylePropertySet> mutableCopy() const;
-    PassRef<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
-
-    PassRef<MutableStylePropertySet> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
+    PassRef<MutableStyleProperties> mutableCopy() const;
+    PassRef<ImmutableStyleProperties> immutableCopyIfNeeded() const;
+
+    PassRef<MutableStyleProperties> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
     
     String asText() const;
@@ -122 +122 @@
 
 protected:
-    StylePropertySet(CSSParserMode cssParserMode)
+    StyleProperties(CSSParserMode cssParserMode)
         : m_cssParserMode(cssParserMode)
         , m_isMutable(true)
@@ -128 +128 @@
     { }
 
-    StylePropertySet(CSSParserMode cssParserMode, unsigned immutableArraySize)
+    StyleProperties(CSSParserMode cssParserMode, unsigned immutableArraySize)
         : m_cssParserMode(cssParserMode)
         , m_isMutable(false)
@@ -154 +154 @@
 };
 
-class ImmutableStylePropertySet : public StylePropertySet {
+class ImmutableStyleProperties : public StyleProperties {
 public:
-    ~ImmutableStylePropertySet();
-    static PassRef<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
+    ~ImmutableStyleProperties();
+    static PassRef<ImmutableStyleProperties> create(const CSSProperty* properties, unsigned count, CSSParserMode);
 
     unsigned propertyCount() const { return m_arraySize; }
@@ -167 +167 @@
 
 private:
-    ImmutableStylePropertySet(const CSSProperty*, unsigned count, CSSParserMode);
+    ImmutableStyleProperties(const CSSProperty*, unsigned count, CSSParserMode);
 };
 
-inline const CSSValue** ImmutableStylePropertySet::valueArray() const
+inline const CSSValue** ImmutableStyleProperties::valueArray() const
 {
     return reinterpret_cast<const CSSValue**>(const_cast<const void**>((&(this->m_storage))));
 }
 
-inline const StylePropertyMetadata* ImmutableStylePropertySet::metadataArray() const
+inline const StylePropertyMetadata* ImmutableStyleProperties::metadataArray() const
 {
     return reinterpret_cast_ptr<const StylePropertyMetadata*>(&reinterpret_cast_ptr<const char*>(&(this->m_storage))[m_arraySize * sizeof(CSSValue*)]);
 }
 
-class MutableStylePropertySet : public StylePropertySet {
+class MutableStyleProperties : public StyleProperties {
 public:
-    static PassRef<MutableStylePropertySet> create(CSSParserMode = CSSQuirksMode);
-    static PassRef<MutableStylePropertySet> create(const CSSProperty* properties, unsigned count);
-
-    ~MutableStylePropertySet();
+    static PassRef<MutableStyleProperties> create(CSSParserMode = CSSQuirksMode);
+    static PassRef<MutableStyleProperties> create(const CSSProperty* properties, unsigned count);
+
+    ~MutableStyleProperties();
 
     unsigned propertyCount() const { return m_propertyVector.size(); }
@@ -211 +211 @@
 
     // FIXME: These two can be moved to EditingStyle.cpp
-    void removeEquivalentProperties(const StylePropertySet*);
+    void removeEquivalentProperties(const StyleProperties*);
     void removeEquivalentProperties(const ComputedStyleExtractor*);
 
-    void mergeAndOverrideOnConflict(const StylePropertySet&);
+    void mergeAndOverrideOnConflict(const StyleProperties&);
 
     void clear();
@@ -225 +225 @@
 
 private:
-    explicit MutableStylePropertySet(CSSParserMode);
-    explicit MutableStylePropertySet(const StylePropertySet&);
-    MutableStylePropertySet(const CSSProperty* properties, unsigned count);
+    explicit MutableStyleProperties(CSSParserMode);
+    explicit MutableStyleProperties(const StyleProperties&);
+    MutableStyleProperties(const CSSProperty* properties, unsigned count);
 
     bool removeShorthandProperty(CSSPropertyID);
@@ -233 +233 @@
     OwnPtr<PropertySetCSSStyleDeclaration> m_cssomWrapper;
 
-    friend class StylePropertySet;
+    friend class StyleProperties;
 };
 
-inline const StylePropertyMetadata& StylePropertySet::PropertyReference::propertyMetadata() const
+inline const StylePropertyMetadata& StyleProperties::PropertyReference::propertyMetadata() const
 {
     if (m_propertySet.isMutable())
-        return static_cast<const MutableStylePropertySet&>(m_propertySet).m_propertyVector.at(m_index).metadata();
-    return static_cast<const ImmutableStylePropertySet&>(m_propertySet).metadataArray()[m_index];
-}
-
-inline const CSSValue* StylePropertySet::PropertyReference::propertyValue() const
+        return static_cast<const MutableStyleProperties&>(m_propertySet).m_propertyVector.at(m_index).metadata();
+    return static_cast<const ImmutableStyleProperties&>(m_propertySet).metadataArray()[m_index];
+}
+
+inline const CSSValue* StyleProperties::PropertyReference::propertyValue() const
 {
     if (m_propertySet.isMutable())
-        return static_cast<const MutableStylePropertySet&>(m_propertySet).m_propertyVector.at(m_index).value();
-    return static_cast<const ImmutableStylePropertySet&>(m_propertySet).valueArray()[m_index];
-}
-
-inline unsigned StylePropertySet::propertyCount() const
+        return static_cast<const MutableStyleProperties&>(m_propertySet).m_propertyVector.at(m_index).value();
+    return static_cast<const ImmutableStyleProperties&>(m_propertySet).valueArray()[m_index];
+}
+
+inline unsigned StyleProperties::propertyCount() const
 {
     if (m_isMutable)
-        return static_cast<const MutableStylePropertySet*>(this)->m_propertyVector.size();
+        return static_cast<const MutableStyleProperties*>(this)->m_propertyVector.size();
     return m_arraySize;
 }
 
-inline bool StylePropertySet::isEmpty() const
+inline bool StyleProperties::isEmpty() const
 {
     return !propertyCount();
 }
 
-inline void StylePropertySet::deref()
+inline void StyleProperties::deref()
 {
     if (!derefBase())
@@ -268 +268 @@
 
     if (m_isMutable)
-        delete static_cast<MutableStylePropertySet*>(this);
+        delete static_cast<MutableStyleProperties*>(this);
     else
-        delete static_cast<ImmutableStylePropertySet*>(this);
+        delete static_cast<ImmutableStyleProperties*>(this);
 }
 
 } // namespace WebCore
 
-#endif // StylePropertySet_h
+#endif // StyleProperties_h

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -109 +109 @@
 #include "StyleGeneratedImage.h"
 #include "StylePendingImage.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StylePropertyShorthand.h"
 #include "StyleRule.h"
@@ -233 +233 @@
 }
 
-void StyleResolver::MatchResult::addMatchedProperties(const StylePropertySet& properties, StyleRule* rule, unsigned linkMatchType, PropertyWhitelistType propertyWhitelistType)
+void StyleResolver::MatchResult::addMatchedProperties(const StyleProperties& properties, StyleRule* rule, unsigned linkMatchType, PropertyWhitelistType propertyWhitelistType)
 {
     matchedProperties.grow(matchedProperties.size() + 1);
     StyleResolver::MatchedProperties& newProperties = matchedProperties.last();
-    newProperties.properties = const_cast<StylePropertySet*>(&properties);
+    newProperties.properties = const_cast<StyleProperties*>(&properties);
     newProperties.linkMatchType = linkMatchType;
     newProperties.whitelistType = propertyWhitelistType;
@@ -947 +947 @@
         static StyleKeyframe* zeroPercentKeyframe;
         if (!zeroPercentKeyframe) {
-            zeroPercentKeyframe = StyleKeyframe::create(MutableStylePropertySet::create()).leakRef();
+            zeroPercentKeyframe = StyleKeyframe::create(MutableStyleProperties::create()).leakRef();
             zeroPercentKeyframe->setKeyText("0%");
         }
@@ -959 +959 @@
         static StyleKeyframe* hundredPercentKeyframe;
         if (!hundredPercentKeyframe) {
-            hundredPercentKeyframe = StyleKeyframe::create(MutableStylePropertySet::create()).leakRef();
+            hundredPercentKeyframe = StyleKeyframe::create(MutableStyleProperties::create()).leakRef();
             hundredPercentKeyframe->setKeyText("100%");
         }
@@ -1522 +1522 @@
 
 template <StyleResolver::StyleApplicationPass pass>
-void StyleResolver::applyProperties(const StylePropertySet* properties, StyleRule* rule, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType)
+void StyleResolver::applyProperties(const StyleProperties* properties, StyleRule* rule, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType)
 {
     ASSERT((propertyWhitelistType != PropertyWhitelistRegion) || m_state.regionForStyling());
@@ -1529 +1529 @@
     unsigned propertyCount = properties->propertyCount();
     for (unsigned i = 0; i < propertyCount; ++i) {
-        StylePropertySet::PropertyReference current = properties->propertyAt(i);
+        StyleProperties::PropertyReference current = properties->propertyAt(i);
         if (isImportant != current.isImportant())
             continue;

trunk/Source/WebCore/css/StyleResolver.h

@@ -93 +93 @@
 class StyleKeyframe;
 class StylePendingImage;
-class StylePropertySet;
+class StyleProperties;
 class StyleRule;
 #if ENABLE(SHADOW_DOM)
@@ -317 +317 @@
         ~MatchedProperties();
         
-        RefPtr<StylePropertySet> properties;
+        RefPtr<StyleProperties> properties;
         union {
             struct {
@@ -335 +335 @@
         bool isCacheable;
 
-        void addMatchedProperties(const StylePropertySet& properties, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
+        void addMatchedProperties(const StyleProperties&, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
     };
 
@@ -360 +360 @@
     void applyMatchedProperties(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
     template <StyleApplicationPass pass>
-    void applyProperties(const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
+    void applyProperties(const StyleProperties*, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
     static bool isValidRegionStyleProperty(CSSPropertyID);
 #if ENABLE(VIDEO_TRACK)

trunk/Source/WebCore/css/StyleRule.cpp

@@ -32 +32 @@
 #include "CSSSupportsRule.h"
 #include "CSSUnknownRule.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRuleImport.h"
 #include "WebKitCSSFilterRule.h"
@@ -229 +229 @@
 unsigned StyleRule::averageSizeInBytes()
 {
-    return sizeof(StyleRule) + sizeof(CSSSelector) + StylePropertySet::averageSizeInBytes();
-}
-
-StyleRule::StyleRule(int sourceLine, PassRef<StylePropertySet> properties)
+    return sizeof(StyleRule) + sizeof(CSSSelector) + StyleProperties::averageSizeInBytes();
+}
+
+StyleRule::StyleRule(int sourceLine, PassRef<StyleProperties> properties)
     : StyleRuleBase(Style, sourceLine)
     , m_properties(std::move(properties))
@@ -249 +249 @@
 }
 
-MutableStylePropertySet& StyleRule::mutableProperties()
+MutableStyleProperties& StyleRule::mutableProperties()
 {
     if (!m_properties->isMutable())
         m_properties = m_properties->mutableCopy();
-    return static_cast<MutableStylePropertySet&>(m_properties.get());
-}
-
-PassRef<StyleRule> StyleRule::create(int sourceLine, const Vector<const CSSSelector*>& selectors, PassRef<StylePropertySet> properties)
+    return static_cast<MutableStyleProperties&>(m_properties.get());
+}
+
+PassRef<StyleRule> StyleRule::create(int sourceLine, const Vector<const CSSSelector*>& selectors, PassRef<StyleProperties> properties)
 {
     CSSSelector* selectorListArray = reinterpret_cast<CSSSelector*>(fastMalloc(sizeof(CSSSelector) * selectors.size()));
@@ -280 +280 @@
 
         if (componentsInThisSelector.size() + componentsSinceLastSplit.size() > maxCount) {
-            rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StylePropertySet&>(m_properties.get())));
+            rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StyleProperties&>(m_properties.get())));
             componentsSinceLastSplit.clear();
         }
@@ -288 +288 @@
 
     if (!componentsSinceLastSplit.isEmpty())
-        rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StylePropertySet&>(m_properties.get())));
+        rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StyleProperties&>(m_properties.get())));
 
     return rules;
 }
 
-StyleRulePage::StyleRulePage(PassRef<StylePropertySet> properties)
+StyleRulePage::StyleRulePage(PassRef<StyleProperties> properties)
     : StyleRuleBase(Page)
     , m_properties(std::move(properties))
@@ -310 +310 @@
 }
 
-MutableStylePropertySet& StyleRulePage::mutableProperties()
+MutableStyleProperties& StyleRulePage::mutableProperties()
 {
     if (!m_properties->isMutable())
         m_properties = m_properties->mutableCopy();
-    return static_cast<MutableStylePropertySet&>(m_properties.get());
-}
-
-StyleRuleFontFace::StyleRuleFontFace(PassRef<StylePropertySet> properties)
+    return static_cast<MutableStyleProperties&>(m_properties.get());
+}
+
+StyleRuleFontFace::StyleRuleFontFace(PassRef<StyleProperties> properties)
     : StyleRuleBase(FontFace, 0)
     , m_properties(std::move(properties))
@@ -333 +333 @@
 }
 
-MutableStylePropertySet& StyleRuleFontFace::mutableProperties()
+MutableStyleProperties& StyleRuleFontFace::mutableProperties()
 {
     if (!m_properties->isMutable())
         m_properties = m_properties->mutableCopy();
-    return static_cast<MutableStylePropertySet&>(m_properties.get());
+    return static_cast<MutableStyleProperties&>(m_properties.get());
 }
 
@@ -409 +409 @@
 
 #if ENABLE(CSS_DEVICE_ADAPTATION)
-StyleRuleViewport::StyleRuleViewport(PassRef<StylePropertySet> properties)
+StyleRuleViewport::StyleRuleViewport(PassRef<StyleProperties> properties)
     : StyleRuleBase(Viewport, 0)
     , m_properties(std::move(properties))
@@ -425 +425 @@
 }
 
-MutableStylePropertySet& StyleRuleViewport::mutableProperties()
+MutableStyleProperties& StyleRuleViewport::mutableProperties()
 {
     if (!m_properties->isMutable())
         m_properties = m_properties->mutableCopy();
-    return static_cast<MutableStylePropertySet&>(m_properties.get());
+    return static_cast<MutableStyleProperties&>(m_properties.get());
 }
 #endif // ENABLE(CSS_DEVICE_ADAPTATION)
 
 #if ENABLE(CSS_SHADERS)
-StyleRuleFilter::StyleRuleFilter(const String& filterName, PassRef<StylePropertySet> properties)
+StyleRuleFilter::StyleRuleFilter(const String& filterName, PassRef<StyleProperties> properties)
     : StyleRuleBase(Filter, 0)
     , m_filterName(filterName)
@@ -452 +452 @@
 }
 
-MutableStylePropertySet& StyleRuleFilter::mutableProperties()
+MutableStyleProperties& StyleRuleFilter::mutableProperties()
 {
     if (!m_properties->isMutable())
         m_properties = m_properties->mutableCopy();
-    return static_cast<MutableStylePropertySet&>(m_properties.get());
+    return static_cast<MutableStyleProperties&>(m_properties.get());
 }
 

trunk/Source/WebCore/css/StyleRule.h

@@ -25 +25 @@
 #include "CSSSelectorList.h"
 #include "MediaList.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include <wtf/RefPtr.h>
 
@@ -33 +33 @@
 class CSSStyleRule;
 class CSSStyleSheet;
-class MutableStylePropertySet;
-class StylePropertySet;
+class MutableStyleProperties;
+class StyleProperties;
 
 class StyleRuleBase : public WTF::RefCountedBase {
@@ -119 +119 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassRef<StyleRule> create(int sourceLine, PassRef<StylePropertySet> properties)
+    static PassRef<StyleRule> create(int sourceLine, PassRef<StyleProperties> properties)
     {
         return adoptRef(*new StyleRule(sourceLine, std::move(properties)));
@@ -127 +127 @@
 
     const CSSSelectorList& selectorList() const { return m_selectorList; }
-    const StylePropertySet& properties() const { return m_properties.get(); }
-    MutableStylePropertySet& mutableProperties();
+    const StyleProperties& properties() const { return m_properties.get(); }
+    MutableStyleProperties& mutableProperties();
     
     void parserAdoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectors) { m_selectorList.adoptSelectorVector(selectors); }
@@ -141 +141 @@
 
 private:
-    StyleRule(int sourceLine, PassRef<StylePropertySet>);
+    StyleRule(int sourceLine, PassRef<StyleProperties>);
     StyleRule(const StyleRule&);
 
-    static PassRef<StyleRule> create(int sourceLine, const Vector<const CSSSelector*>&, PassRef<StylePropertySet>);
-
-    Ref<StylePropertySet> m_properties;
+    static PassRef<StyleRule> create(int sourceLine, const Vector<const CSSSelector*>&, PassRef<StyleProperties>);
+
+    Ref<StyleProperties> m_properties;
     CSSSelectorList m_selectorList;
 };
@@ -158 +158 @@
 class StyleRuleFontFace : public StyleRuleBase {
 public:
-    static PassRef<StyleRuleFontFace> create(PassRef<StylePropertySet> properties) { return adoptRef(*new StyleRuleFontFace(std::move(properties))); }
+    static PassRef<StyleRuleFontFace> create(PassRef<StyleProperties> properties) { return adoptRef(*new StyleRuleFontFace(std::move(properties))); }
     
     ~StyleRuleFontFace();
 
-    const StylePropertySet& properties() const { return m_properties.get(); }
-    MutableStylePropertySet& mutableProperties();
+    const StyleProperties& properties() const { return m_properties.get(); }
+    MutableStyleProperties& mutableProperties();
 
     PassRef<StyleRuleFontFace> copy() const { return adoptRef(*new StyleRuleFontFace(*this)); }
@@ -169 +169 @@
 
 private:
-    StyleRuleFontFace(PassRef<StylePropertySet>);
+    StyleRuleFontFace(PassRef<StyleProperties>);
     StyleRuleFontFace(const StyleRuleFontFace&);
 
-    Ref<StylePropertySet> m_properties;
+    Ref<StyleProperties> m_properties;
 };
 
 class StyleRulePage : public StyleRuleBase {
 public:
-    static PassRef<StyleRulePage> create(PassRef<StylePropertySet> properties) { return adoptRef(*new StyleRulePage(std::move(properties))); }
+    static PassRef<StyleRulePage> create(PassRef<StyleProperties> properties) { return adoptRef(*new StyleRulePage(std::move(properties))); }
 
     ~StyleRulePage();
 
     const CSSSelector* selector() const { return m_selectorList.first(); }    
-    const StylePropertySet& properties() const { return m_properties.get(); }
-    MutableStylePropertySet& mutableProperties();
+    const StyleProperties& properties() const { return m_properties.get(); }
+    MutableStyleProperties& mutableProperties();
 
     void parserAdoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectors) { m_selectorList.adoptSelectorVector(selectors); }
@@ -191 +191 @@
 
 private:
-    StyleRulePage(PassRef<StylePropertySet>);
+    StyleRulePage(PassRef<StyleProperties>);
     StyleRulePage(const StyleRulePage&);
     
-    Ref<StylePropertySet> m_properties;
+    Ref<StyleProperties> m_properties;
     CSSSelectorList m_selectorList;
 };
@@ -289 +289 @@
 class StyleRuleViewport : public StyleRuleBase {
 public:
-    static PassRef<StyleRuleViewport> create(PassRef<StylePropertySet> properties) { return adoptRef(*new StyleRuleViewport(std::move(properties))); }
+    static PassRef<StyleRuleViewport> create(PassRef<StyleProperties> properties) { return adoptRef(*new StyleRuleViewport(std::move(properties))); }
 
     ~StyleRuleViewport();
 
-    const StylePropertySet& properties() const { return m_properties.get(); }
-    MutableStylePropertySet& mutableProperties();
+    const StyleProperties& properties() const { return m_properties.get(); }
+    MutableStyleProperties& mutableProperties();
 
     PassRef<StyleRuleViewport> copy() const { return adoptRef(*new StyleRuleViewport(*this)); }
 
 private:
-    StyleRuleViewport(PassRef<StylePropertySet>);
+    StyleRuleViewport(PassRef<StyleProperties>);
     StyleRuleViewport(const StyleRuleViewport&);
 
-    Ref<StylePropertySet> m_properties;
+    Ref<StyleProperties> m_properties;
 };
 #endif // ENABLE(CSS_DEVICE_ADAPTATION)
@@ -329 +329 @@
 class StyleRuleFilter : public StyleRuleBase {
 public:
-    static PassRef<StyleRuleFilter> create(const String& filterName, PassRef<StylePropertySet> properties)
+    static PassRef<StyleRuleFilter> create(const String& filterName, PassRef<StyleProperties> properties)
     {
         return adoptRef(*new StyleRuleFilter(filterName, std::move(properties)));
@@ -338 +338 @@
     const String& filterName() const { return m_filterName; }
 
-    const StylePropertySet& properties() const { return m_properties.get(); }
-    MutableStylePropertySet& mutableProperties();
+    const StyleProperties& properties() const { return m_properties.get(); }
+    MutableStyleProperties& mutableProperties();
 
     PassRef<StyleRuleFilter> copy() const { return adoptRef(*new StyleRuleFilter(*this)); }
 
 private:
-    StyleRuleFilter(const String&, PassRef<StylePropertySet>);
+    StyleRuleFilter(const String&, PassRef<StyleProperties>);
     StyleRuleFilter(const StyleRuleFilter&);
 
     String m_filterName;
-    Ref<StylePropertySet> m_properties;
+    Ref<StyleProperties> m_properties;
 };
 #endif // ENABLE(CSS_SHADERS)

trunk/Source/WebCore/css/StyleSheetContents.cpp

@@ -31 +31 @@
 #include "RuleSet.h"
 #include "SecurityOrigin.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include "StyleRuleImport.h"

trunk/Source/WebCore/css/ViewportStyleResolver.cpp

@@ -37 +37 @@
 #include "Page.h"
 #include "RenderView.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include "ViewportArguments.h"
@@ -55 +55 @@
 void ViewportStyleResolver::addViewportRule(StyleRuleViewport* viewportRule)
 {
-    StylePropertySet& propertySet = viewportRule->mutableProperties();
+    StyleProperties& propertySet = viewportRule->mutableProperties();
 
     unsigned propertyCount = propertySet.propertyCount();

trunk/Source/WebCore/css/ViewportStyleResolver.h

@@ -42 +42 @@
 class CSSPrimitiveValue;
 class Document;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class StyleRuleViewport;
 
@@ -65 +65 @@
 
     Document* m_document;
-    RefPtr<MutableStylePropertySet> m_propertySet;
+    RefPtr<MutableStyleProperties> m_propertySet;
 };
 

trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp

@@ -34 +34 @@
 
 #include "PropertySetCSSStyleDeclaration.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include <wtf/text/StringBuilder.h>

trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp

@@ -28 +28 @@
 
 #include "PropertySetCSSStyleDeclaration.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "WebKitCSSKeyframesRule.h"
 #include <wtf/text/StringBuilder.h>
@@ -34 +34 @@
 namespace WebCore {
 
-StyleKeyframe::StyleKeyframe(PassRef<StylePropertySet> properties)
+StyleKeyframe::StyleKeyframe(PassRef<StyleProperties> properties)
     : m_properties(std::move(properties))
 {
@@ -43 +43 @@
 }
 
-MutableStylePropertySet& StyleKeyframe::mutableProperties()
+MutableStyleProperties& StyleKeyframe::mutableProperties()
 {
     if (!m_properties->isMutable())
         m_properties = m_properties->mutableCopy();
-    return static_cast<MutableStylePropertySet&>(m_properties.get());
+    return static_cast<MutableStyleProperties&>(m_properties.get());
 }
 

trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h

@@ -28 +28 @@
 
 #include "CSSRule.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {
@@ -39 +39 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassRefPtr<StyleKeyframe> create(PassRef<StylePropertySet> properties)
+    static PassRefPtr<StyleKeyframe> create(PassRef<StyleProperties> properties)
     {
         return adoptRef(new StyleKeyframe(std::move(properties)));
@@ -50 +50 @@
     void getKeys(Vector<double>& keys) const   { parseKeyString(m_key, keys); }
     
-    const StylePropertySet& properties() const { return m_properties.get(); }
-    MutableStylePropertySet& mutableProperties();
+    const StyleProperties& properties() const { return m_properties.get(); }
+    MutableStyleProperties& mutableProperties();
     
     String cssText() const;
 
 private:
-    explicit StyleKeyframe(PassRef<StylePropertySet>);
+    explicit StyleKeyframe(PassRef<StyleProperties>);
     
     static void parseKeyString(const String&, Vector<double>& keys);
     
-    Ref<StylePropertySet> m_properties;
+    Ref<StyleProperties> m_properties;
     // FIXME: This should be a parsed vector of floats.
     // comma separated list of keys

trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp

@@ -30 +30 @@
 #include "CSSRuleList.h"
 #include "CSSStyleSheet.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleSheet.h"
 #include "WebKitCSSKeyframeRule.h"

trunk/Source/WebCore/css/WebKitCSSMatrix.cpp

@@ -31 +31 @@
 #include "CSSValueKeywords.h"
 #include "ExceptionCode.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "TransformFunctions.h"
 #include <wtf/MathExtras.h>
@@ -56 +56 @@
         return;
 
-    RefPtr<MutableStylePropertySet> styleDeclaration = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> styleDeclaration = MutableStyleProperties::create();
     if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform, string, true, CSSStrictMode, 0)) {
         // Convert to TransformOperations. This can fail if a property

trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp

@@ -35 +35 @@
 
 #include "PropertySetCSSStyleDeclaration.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include <wtf/text/StringBuilder.h>

trunk/Source/WebCore/dom/Attr.cpp

@@ -26 +26 @@
 #include "ExceptionCode.h"
 #include "ScopedEventQueue.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyledElement.h"
 #include "TextNodeTraversal.h"
@@ -189 +189 @@
     if (!m_element || !m_element->isStyledElement())
         return nullptr;
-    m_style = MutableStylePropertySet::create();
+    m_style = MutableStyleProperties::create();
     toStyledElement(m_element)->collectStyleForPresentationAttribute(qualifiedName(), value(), *m_style);
     return m_style->ensureCSSStyleDeclaration();

trunk/Source/WebCore/dom/Attr.h

@@ -32 +32 @@
 
 class CSSStyleDeclaration;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 
 // Attr can have Text and EntityReference children
@@ -96 +96 @@
     AtomicString m_standaloneValue;
 
-    RefPtr<MutableStylePropertySet> m_style;
+    RefPtr<MutableStyleProperties> m_style;
     unsigned m_ignoreChildrenChanged;
 };

trunk/Source/WebCore/dom/Document.cpp

@@ -130 +130 @@
 #include "Settings.h"
 #include "ShadowRoot.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "StyleSheetContents.h"
@@ -857 +857 @@
 PassRefPtr<CSSStyleDeclaration> Document::createCSSStyleDeclaration()
 {
-    Ref<MutableStylePropertySet> propertySet(MutableStylePropertySet::create());
+    Ref<MutableStyleProperties> propertySet(MutableStyleProperties::create());
     return propertySet->ensureCSSStyleDeclaration();
 }

trunk/Source/WebCore/dom/Element.cpp

@@ -68 +68 @@
 #include "SelectorQuery.h"
 #include "Settings.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "TextIterator.h"

trunk/Source/WebCore/dom/ElementData.cpp

@@ -28 +28 @@
 
 #include "Attr.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {
@@ -145 +145 @@
     : ElementData(other, true)
 {
-    // An ShareableElementData should never have a mutable inline StylePropertySet attached.
+    // An ShareableElementData should never have a mutable inline StyleProperties attached.
     ASSERT(!other.m_inlineStyle || !other.m_inlineStyle->isMutable());
     m_inlineStyle = other.m_inlineStyle;

trunk/Source/WebCore/dom/ElementData.h

@@ -35 +35 @@
 class Attr;
 class ShareableElementData;
-class StylePropertySet;
+class StyleProperties;
 class UniqueElementData;
 
@@ -54 +54 @@
     void setIdForStyleResolution(const AtomicString& newId) const { m_idForStyleResolution = newId; }
 
-    const StylePropertySet* inlineStyle() const { return m_inlineStyle.get(); }
-    const StylePropertySet* presentationAttributeStyle() const;
+    const StyleProperties* inlineStyle() const { return m_inlineStyle.get(); }
+    const StyleProperties* presentationAttributeStyle() const;
 
     unsigned length() const;
@@ -88 +88 @@
 #endif
 
-    mutable RefPtr<StylePropertySet> m_inlineStyle;
+    mutable RefPtr<StyleProperties> m_inlineStyle;
     mutable SpaceSplitString m_classNames;
     mutable AtomicString m_idForStyleResolution;
@@ -146 +146 @@
     explicit UniqueElementData(const UniqueElementData&);
 
-    mutable RefPtr<StylePropertySet> m_presentationAttributeStyle;
+    mutable RefPtr<StyleProperties> m_presentationAttributeStyle;
     Vector<Attribute, 4> m_attributeVector;
 };
@@ -171 +171 @@
 }
 
-inline const StylePropertySet* ElementData::presentationAttributeStyle() const
+inline const StyleProperties* ElementData::presentationAttributeStyle() const
 {
     if (!m_isUnique)

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -35 +35 @@
 #include "PropertySetCSSStyleDeclaration.h"
 #include "ScriptableDocumentParser.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include <wtf/HashFunctions.h>
@@ -56 +56 @@
 public:
     PresentationAttributeCacheKey key;
-    RefPtr<StylePropertySet> value;
+    RefPtr<StyleProperties> value;
 };
 
@@ -124 +124 @@
     ASSERT(elementData()->m_styleAttributeIsDirty);
     elementData()->m_styleAttributeIsDirty = false;
-    if (const StylePropertySet* inlineStyle = this->inlineStyle())
+    if (const StyleProperties* inlineStyle = this->inlineStyle())
         const_cast<StyledElement*>(this)->setSynchronizedLazyAttribute(styleAttr, inlineStyle->asText());
 }
@@ -139 +139 @@
 }
 
-MutableStylePropertySet& StyledElement::ensureMutableInlineStyle()
-{
-    RefPtr<StylePropertySet>& inlineStyle = ensureUniqueElementData().m_inlineStyle;
+MutableStyleProperties& StyledElement::ensureMutableInlineStyle()
+{
+    RefPtr<StyleProperties>& inlineStyle = ensureUniqueElementData().m_inlineStyle;
     if (!inlineStyle)
-        inlineStyle = MutableStylePropertySet::create(strictToCSSParserMode(isHTMLElement() && !document().inQuirksMode()));
+        inlineStyle = MutableStyleProperties::create(strictToCSSParserMode(isHTMLElement() && !document().inQuirksMode()));
     else if (!inlineStyle->isMutable())
         inlineStyle = inlineStyle->mutableCopy();
     ASSERT_WITH_SECURITY_IMPLICATION(inlineStyle->isMutable());
-    return static_cast<MutableStylePropertySet&>(*inlineStyle);
+    return static_cast<MutableStyleProperties&>(*inlineStyle);
 }
 
@@ -173 +173 @@
 inline void StyledElement::setInlineStyleFromString(const AtomicString& newStyleString)
 {
-    RefPtr<StylePropertySet>& inlineStyle = elementData()->m_inlineStyle;
+    RefPtr<StyleProperties>& inlineStyle = elementData()->m_inlineStyle;
 
     // Avoid redundant work if we're using shared attribute data with already parsed inline style.
@@ -188 +188 @@
     else {
         ASSERT(inlineStyle->isMutable());
-        static_pointer_cast<MutableStylePropertySet>(inlineStyle)->parseDeclaration(newStyleString, &document().elementSheet().contents());
+        static_pointer_cast<MutableStyleProperties>(inlineStyle)->parseDeclaration(newStyleString, &document().elementSheet().contents());
     }
 }
@@ -268 +268 @@
 void StyledElement::addSubresourceAttributeURLs(ListHashSet<URL>& urls) const
 {
-    if (const StylePropertySet* inlineStyle = elementData() ? elementData()->inlineStyle() : 0)
+    if (const StyleProperties* inlineStyle = elementData() ? elementData()->inlineStyle() : 0)
         inlineStyle->addSubresourceStyleURLs(urls, &document().elementSheet().contents());
 }
@@ -330 +330 @@
         cacheIterator = presentationAttributeCache().end();
 
-    RefPtr<StylePropertySet> style;
+    RefPtr<StyleProperties> style;
     if (cacheHash && cacheIterator->value) {
         style = cacheIterator->value->value;
         presentationAttributeCacheCleaner().didHitPresentationAttributeCache();
     } else {
-        style = MutableStylePropertySet::create(isSVGElement() ? SVGAttributeMode : CSSQuirksMode);
+        style = MutableStyleProperties::create(isSVGElement() ? SVGAttributeMode : CSSQuirksMode);
         unsigned size = attributeCount();
         for (unsigned i = 0; i < size; ++i) {
             const Attribute& attribute = attributeAt(i);
-            collectStyleForPresentationAttribute(attribute.name(), attribute.value(), static_cast<MutableStylePropertySet&>(*style));
+            collectStyleForPresentationAttribute(attribute.name(), attribute.value(), static_cast<MutableStyleProperties&>(*style));
         }
     }
@@ -365 +365 @@
 }
 
-void StyledElement::addPropertyToPresentationAttributeStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, CSSValueID identifier)
+void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, CSSValueID identifier)
 {
     style.setProperty(propertyID, cssValuePool().createIdentifierValue(identifier));
 }
 
-void StyledElement::addPropertyToPresentationAttributeStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitTypes unit)
+void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitTypes unit)
 {
     style.setProperty(propertyID, cssValuePool().createValue(value, unit));
 }
     
-void StyledElement::addPropertyToPresentationAttributeStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, const String& value)
+void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, const String& value)
 {
     style.setProperty(propertyID, value, false, &document().elementSheet().contents());

trunk/Source/WebCore/dom/StyledElement.h

@@ -34 +34 @@
 
 class Attribute;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class PropertySetCSSStyleDeclaration;
-class StylePropertySet;
+class StyleProperties;
 
 struct PresentationAttributeCacheKey;
@@ -44 +44 @@
     virtual ~StyledElement();
 
-    virtual const StylePropertySet* additionalPresentationAttributeStyle() { return 0; }
+    virtual const StyleProperties* additionalPresentationAttributeStyle() { return 0; }
     void invalidateStyleAttribute();
 
-    const StylePropertySet* inlineStyle() const { return elementData() ? elementData()->m_inlineStyle.get() : 0; }
+    const StyleProperties* inlineStyle() const { return elementData() ? elementData()->m_inlineStyle.get() : 0; }
     
     bool setInlineStyleProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
@@ -60 +60 @@
     virtual CSSStyleDeclaration* style() OVERRIDE FINAL;
 
-    const StylePropertySet* presentationAttributeStyle();
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) { }
+    const StyleProperties* presentationAttributeStyle();
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) { }
 
 protected:
@@ -73 +73 @@
     virtual bool isPresentationAttribute(const QualifiedName&) const { return false; }
 
-    void addPropertyToPresentationAttributeStyle(MutableStylePropertySet&, CSSPropertyID, CSSValueID identifier);
-    void addPropertyToPresentationAttributeStyle(MutableStylePropertySet&, CSSPropertyID, double value, CSSPrimitiveValue::UnitTypes);
-    void addPropertyToPresentationAttributeStyle(MutableStylePropertySet&, CSSPropertyID, const String& value);
+    void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, CSSValueID identifier);
+    void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, double value, CSSPrimitiveValue::UnitTypes);
+    void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, const String& value);
 
     virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const OVERRIDE;
@@ -85 +85 @@
     PropertySetCSSStyleDeclaration* inlineStyleCSSOMWrapper();
     void setInlineStyleFromString(const AtomicString&);
-    MutableStylePropertySet& ensureMutableInlineStyle();
+    MutableStyleProperties& ensureMutableInlineStyle();
 
     void makePresentationAttributeCacheKey(PresentationAttributeCacheKey&) const;
@@ -97 +97 @@
 }
 
-inline const StylePropertySet* StyledElement::presentationAttributeStyle()
+inline const StyleProperties* StyledElement::presentationAttributeStyle()
 {
     if (!elementData())

trunk/Source/WebCore/editing/ApplyStyleCommand.cpp

@@ -41 +41 @@
 #include "RenderObject.h"
 #include "RenderText.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "Text.h"
@@ -300 +300 @@
 }
 
-static PassRefPtr<MutableStylePropertySet> copyStyleOrCreateEmpty(const StylePropertySet* style)
+static PassRefPtr<MutableStyleProperties> copyStyleOrCreateEmpty(const StyleProperties* style)
 {
     if (!style)
-        return MutableStylePropertySet::create();
+        return MutableStyleProperties::create();
     return style->mutableCopy();
 }
@@ -397 +397 @@
         lastStyledNode = node;
 
-        RefPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
+        RefPtr<MutableStyleProperties> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
         float currentFontSize = computedFontSize(node);
         float desiredFontSize = std::max(MinimumFontSize, startingFontSizes.get(node) + style->fontSizeDelta());
@@ -526 +526 @@
             removeNodeAttribute(element, dirAttr);
         } else {
-            RefPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
+            RefPtr<MutableStyleProperties> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
             inlineStyle->setProperty(CSSPropertyUnicodeBidi, CSSValueNormal);
             inlineStyle->removeProperty(CSSPropertyDirection);
@@ -770 +770 @@
             // Add to this element's inline style and skip over its contents.
             HTMLElement* element = toHTMLElement(node.get());
-            RefPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
-            if (MutableStylePropertySet* otherStyle = style->style())
+            RefPtr<MutableStyleProperties> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
+            if (MutableStyleProperties* otherStyle = style->style())
                 inlineStyle->mergeAndOverrideOnConflict(*otherStyle);
             setNodeAttribute(element, styleAttr, inlineStyle->asText());
@@ -1388 +1388 @@
     StringBuilder cssText;
     cssText.append(cssStyle);
-    if (const StylePropertySet* decl = block->inlineStyle()) {
+    if (const StyleProperties* decl = block->inlineStyle()) {
         if (!cssStyle.isEmpty())
             cssText.append(' ');
@@ -1468 +1468 @@
     if (styleChange.cssStyle().length()) {
         if (styleContainer) {
-            if (const StylePropertySet* existingStyle = styleContainer->inlineStyle()) {
+            if (const StyleProperties* existingStyle = styleContainer->inlineStyle()) {
                 String existingText = existingStyle->asText();
                 StringBuilder cssText;

trunk/Source/WebCore/editing/DeleteButtonController.cpp

@@ -40 +40 @@
 #include "RemoveNodeCommand.h"
 #include "RenderBox.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {

trunk/Source/WebCore/editing/EditingStyle.cpp

@@ -45 +45 @@
 #include "RenderStyle.h"
 #include "StyleFontSizeFunctions.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "StyleRule.h"
@@ -90 +90 @@
 enum EditingPropertiesToInclude { OnlyInheritableEditingProperties, AllEditingProperties };
 template <class StyleDeclarationType>
-static PassRefPtr<MutableStylePropertySet> copyEditingProperties(StyleDeclarationType* style, EditingPropertiesToInclude type)
+static PassRefPtr<MutableStyleProperties> copyEditingProperties(StyleDeclarationType* style, EditingPropertiesToInclude type)
 {
     if (type == AllEditingProperties)
@@ -106 +106 @@
 }
 
-static PassRefPtr<MutableStylePropertySet> copyPropertiesFromComputedStyle(ComputedStyleExtractor& computedStyle, EditingStyle::PropertiesToInclude propertiesToInclude)
+static PassRefPtr<MutableStyleProperties> copyPropertiesFromComputedStyle(ComputedStyleExtractor& computedStyle, EditingStyle::PropertiesToInclude propertiesToInclude)
 {
     switch (propertiesToInclude) {
@@ -120 +120 @@
 }
 
-static PassRefPtr<MutableStylePropertySet> copyPropertiesFromComputedStyle(Node* node, EditingStyle::PropertiesToInclude propertiesToInclude)
+static PassRefPtr<MutableStyleProperties> copyPropertiesFromComputedStyle(Node* node, EditingStyle::PropertiesToInclude propertiesToInclude)
 {
     ComputedStyleExtractor computedStyle(node);
@@ -126 +126 @@
 }
 
-static PassRefPtr<CSSValue> extractPropertyValue(const StylePropertySet* style, CSSPropertyID propertyID)
+static PassRefPtr<CSSValue> extractPropertyValue(const StyleProperties* style, CSSPropertyID propertyID)
 {
     return style ? style->getPropertyCSSValue(propertyID) : PassRefPtr<CSSValue>();
@@ -145 +145 @@
 }
 
-template<typename T> PassRefPtr<MutableStylePropertySet> getPropertiesNotIn(StylePropertySet* styleWithRedundantProperties, T* baseStyle);
+template<typename T> PassRefPtr<MutableStyleProperties> getPropertiesNotIn(StyleProperties* styleWithRedundantProperties, T* baseStyle);
 enum LegacyFontSizeMode { AlwaysUseLegacyFontSize, UseLegacyFontSizeOnlyIfPixelValuesMatch };
 static int legacyFontSizeFromCSSValue(Document*, CSSPrimitiveValue*, bool shouldUseFixedFontDefaultSize, LegacyFontSizeMode);
 static bool isTransparentColorValue(CSSValue*);
-static bool hasTransparentBackgroundColor(StylePropertySet*);
+static bool hasTransparentBackgroundColor(StyleProperties*);
 static PassRefPtr<CSSValue> backgroundColorInEffect(Node*);
 
@@ -163 +163 @@
     virtual bool matches(const Element* element) const { return !m_tagName || element->hasTagName(*m_tagName); }
     virtual bool hasAttribute() const { return false; }
-    virtual bool propertyExistsInStyle(const StylePropertySet* style) const { return style->getPropertyCSSValue(m_propertyID); }
-    virtual bool valueIsPresentInStyle(Element*, StylePropertySet*) const;
+    virtual bool propertyExistsInStyle(const StyleProperties* style) const { return style->getPropertyCSSValue(m_propertyID); }
+    virtual bool valueIsPresentInStyle(Element*, StyleProperties*) const;
     virtual void addToStyle(Element*, EditingStyle*) const;
 
@@ -196 +196 @@
 }
 
-bool HTMLElementEquivalent::valueIsPresentInStyle(Element* element, StylePropertySet* style) const
+bool HTMLElementEquivalent::valueIsPresentInStyle(Element* element, StyleProperties* style) const
 {
     RefPtr<CSSValue> value = style->getPropertyCSSValue(m_propertyID);
@@ -213 +213 @@
         return adoptPtr(new HTMLTextDecorationEquivalent(primitiveValue, tagName));
     }
-    virtual bool propertyExistsInStyle(const StylePropertySet*) const;
-    virtual bool valueIsPresentInStyle(Element*, StylePropertySet*) const;
+    virtual bool propertyExistsInStyle(const StyleProperties*) const;
+    virtual bool valueIsPresentInStyle(Element*, StyleProperties*) const;
 
 private:
@@ -226 +226 @@
 }
 
-bool HTMLTextDecorationEquivalent::propertyExistsInStyle(const StylePropertySet* style) const
+bool HTMLTextDecorationEquivalent::propertyExistsInStyle(const StyleProperties* style) const
 {
     return style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect) || style->getPropertyCSSValue(CSSPropertyTextDecoration);
 }
 
-bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(Element* element, StylePropertySet* style) const
+bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(Element* element, StyleProperties* style) const
 {
     RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
@@ -252 +252 @@
     bool matches(const Element* elem) const { return HTMLElementEquivalent::matches(elem) && elem->hasAttribute(m_attrName); }
     virtual bool hasAttribute() const { return true; }
-    virtual bool valueIsPresentInStyle(Element*, StylePropertySet*) const;
+    virtual bool valueIsPresentInStyle(Element*, StyleProperties*) const;
     virtual void addToStyle(Element*, EditingStyle*) const;
     virtual PassRefPtr<CSSValue> attributeValueAsCSSValue(Element*) const;
@@ -275 +275 @@
 }
 
-bool HTMLAttributeEquivalent::valueIsPresentInStyle(Element* element, StylePropertySet* style) const
+bool HTMLAttributeEquivalent::valueIsPresentInStyle(Element* element, StyleProperties* style) const
 {
     RefPtr<CSSValue> value = attributeValueAsCSSValue(element);
@@ -295 +295 @@
         return 0;
     
-    RefPtr<MutableStylePropertySet> dummyStyle;
-    dummyStyle = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> dummyStyle;
+    dummyStyle = MutableStyleProperties::create();
     dummyStyle->setProperty(m_propertyID, element->getAttribute(m_attrName));
     return dummyStyle->getPropertyCSSValue(m_propertyID);
@@ -351 +351 @@
 }
 
-EditingStyle::EditingStyle(const StylePropertySet* style)
+EditingStyle::EditingStyle(const StyleProperties* style)
     : m_shouldUseFixedDefaultFontSize(false)
     , m_fontSizeDelta(NoFontDelta)
@@ -476 +476 @@
 {
     if (!m_mutableStyle)
-        m_mutableStyle = MutableStylePropertySet::create();
+        m_mutableStyle = MutableStyleProperties::create();
 
     m_mutableStyle->setProperty(propertyID, value, important);
@@ -541 +541 @@
 }
 
-void EditingStyle::setStyle(PassRefPtr<MutableStylePropertySet> style)
+void EditingStyle::setStyle(PassRefPtr<MutableStyleProperties> style)
 {
     m_mutableStyle = style;
@@ -550 +550 @@
 }
 
-void EditingStyle::overrideWithStyle(const StylePropertySet* style)
+void EditingStyle::overrideWithStyle(const StyleProperties* style)
 {
     return mergeStyle(style, OverrideValues);
@@ -587 +587 @@
 {
     RefPtr<EditingStyle> textDirection = EditingStyle::create();
-    textDirection->m_mutableStyle = MutableStylePropertySet::create();
+    textDirection->m_mutableStyle = MutableStyleProperties::create();
     textDirection->m_mutableStyle->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed, m_mutableStyle->propertyIsImportant(CSSPropertyUnicodeBidi));
     textDirection->m_mutableStyle->setProperty(CSSPropertyDirection, m_mutableStyle->getPropertyValue(CSSPropertyDirection),
@@ -610 +610 @@
     if (!node || !node->parentNode())
         return;
-    RefPtr<MutableStylePropertySet> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
-    RefPtr<MutableStylePropertySet> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
+    RefPtr<MutableStyleProperties> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
+    RefPtr<MutableStyleProperties> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
     nodeStyle->removeEquivalentProperties(parentStyle.get());
     m_mutableStyle->removeEquivalentProperties(nodeStyle.get());
@@ -621 +621 @@
         return;
 
-    RefPtr<MutableStylePropertySet> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
-    RefPtr<MutableStylePropertySet> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
+    RefPtr<MutableStyleProperties> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
+    RefPtr<MutableStyleProperties> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
     nodeStyle->removeEquivalentProperties(parentStyle.get());
 
@@ -665 +665 @@
 TriState EditingStyle::triStateOfStyle(T* styleToCompare, ShouldIgnoreTextOnlyProperties shouldIgnoreTextOnlyProperties) const
 {
-    RefPtr<MutableStylePropertySet> difference = getPropertiesNotIn(m_mutableStyle.get(), styleToCompare);
+    RefPtr<MutableStyleProperties> difference = getPropertiesNotIn(m_mutableStyle.get(), styleToCompare);
 
     if (shouldIgnoreTextOnlyProperties == IgnoreTextOnlyProperties)
@@ -713 +713 @@
     ASSERT(!conflictingProperties || conflictingProperties->isEmpty());
 
-    const StylePropertySet* inlineStyle = element->inlineStyle();
+    const StyleProperties* inlineStyle = element->inlineStyle();
     if (!m_mutableStyle || !inlineStyle)
         return false;
@@ -902 +902 @@
 
     if (element->hasAttribute(HTMLNames::styleAttr)) {
-        if (const StylePropertySet* style = element->inlineStyle()) {
+        if (const StyleProperties* style = element->inlineStyle()) {
             unsigned propertyCount = style->propertyCount();
             for (unsigned i = 0; i < propertyCount; ++i) {
@@ -926 +926 @@
     // which one of editingStyleAtPosition or computedStyle is called.
     RefPtr<EditingStyle> editingStyleAtPosition = EditingStyle::create(position, EditingPropertiesInEffect);
-    StylePropertySet* styleAtPosition = editingStyleAtPosition->m_mutableStyle.get();
+    StyleProperties* styleAtPosition = editingStyleAtPosition->m_mutableStyle.get();
 
     RefPtr<CSSValue> unicodeBidi;
@@ -983 +983 @@
 
 static inline bool elementMatchesAndPropertyIsNotInInlineStyleDecl(const HTMLElementEquivalent* equivalent, const StyledElement* element,
-    EditingStyle::CSSPropertyOverrideMode mode, StylePropertySet* style)
+    EditingStyle::CSSPropertyOverrideMode mode, StyleProperties* style)
 {
     return equivalent->matches(element) && (!element->inlineStyle() || !equivalent->propertyExistsInStyle(element->inlineStyle()))
@@ -989 +989 @@
 }
 
-static PassRefPtr<MutableStylePropertySet> extractEditingProperties(const StylePropertySet* style, EditingStyle::PropertiesToInclude propertiesToInclude)
+static PassRefPtr<MutableStyleProperties> extractEditingProperties(const StyleProperties* style, EditingStyle::PropertiesToInclude propertiesToInclude)
 {
     if (!style)
@@ -1075 +1075 @@
 }
 
-void EditingStyle::mergeStyle(const StylePropertySet* style, CSSPropertyOverrideMode mode)
+void EditingStyle::mergeStyle(const StyleProperties* style, CSSPropertyOverrideMode mode)
 {
     if (!style)
@@ -1087 +1087 @@
     unsigned propertyCount = style->propertyCount();
     for (unsigned i = 0; i < propertyCount; ++i) {
-        StylePropertySet::PropertyReference property = style->propertyAt(i);
+        StyleProperties::PropertyReference property = style->propertyAt(i);
         RefPtr<CSSValue> value = m_mutableStyle->getPropertyCSSValue(property.id());
 
@@ -1108 +1108 @@
 }
 
-static PassRefPtr<MutableStylePropertySet> styleFromMatchedRulesForElement(Element* element, unsigned rulesToInclude)
-{
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+static PassRefPtr<MutableStyleProperties> styleFromMatchedRulesForElement(Element* element, unsigned rulesToInclude)
+{
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     Vector<RefPtr<StyleRuleBase>> matchedRules = element->document().ensureStyleResolver().styleRulesForElement(element, rulesToInclude);
     for (unsigned i = 0; i < matchedRules.size(); ++i) {
@@ -1122 +1122 @@
 void EditingStyle::mergeStyleFromRules(StyledElement* element)
 {
-    RefPtr<MutableStylePropertySet> styleFromMatchedRules = styleFromMatchedRulesForElement(element,
+    RefPtr<MutableStyleProperties> styleFromMatchedRules = styleFromMatchedRulesForElement(element,
         StyleResolver::AuthorCSSRules | StyleResolver::CrossOriginCSSRules);
     // Styles from the inline style declaration, held in the variable "style", take precedence 
@@ -1140 +1140 @@
     // For example: style="height: 1%; overflow: visible;" in quirksmode
     // FIXME: There are others like this, see <rdar://problem/5195123> Slashdot copy/paste fidelity problem
-    RefPtr<MutableStylePropertySet> fromComputedStyle = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> fromComputedStyle = MutableStyleProperties::create();
     ComputedStyleExtractor computedStyle(element);
 
@@ -1146 +1146 @@
         unsigned propertyCount = m_mutableStyle->propertyCount();
         for (unsigned i = 0; i < propertyCount; ++i) {
-            StylePropertySet::PropertyReference property = m_mutableStyle->propertyAt(i);
+            StyleProperties::PropertyReference property = m_mutableStyle->propertyAt(i);
             CSSValue* value = property.value();
             if (!value->isPrimitiveValue())
@@ -1159 +1159 @@
 }
 
-static void removePropertiesInStyle(MutableStylePropertySet* styleToRemovePropertiesFrom, StylePropertySet* style)
+static void removePropertiesInStyle(MutableStyleProperties* styleToRemovePropertiesFrom, StyleProperties* style)
 {
     unsigned propertyCount = style->propertyCount();
@@ -1176 +1176 @@
 
     // 1. Remove style from matched rules because style remain without repeating it in inline style declaration
-    RefPtr<MutableStylePropertySet> styleFromMatchedRules = styleFromMatchedRulesForElement(element, StyleResolver::AllButEmptyCSSRules);
+    RefPtr<MutableStyleProperties> styleFromMatchedRules = styleFromMatchedRulesForElement(element, StyleResolver::AllButEmptyCSSRules);
     if (styleFromMatchedRules && !styleFromMatchedRules->isEmpty())
         m_mutableStyle = getPropertiesNotIn(m_mutableStyle.get(), styleFromMatchedRules.get());
@@ -1205 +1205 @@
         return;
 
-    RefPtr<StylePropertySet> defaultStyle = styleFromMatchedRulesForElement(element, StyleResolver::UAAndUserCSSRules);
+    RefPtr<StyleProperties> defaultStyle = styleFromMatchedRulesForElement(element, StyleResolver::UAAndUserCSSRules);
 
     removePropertiesInStyle(m_mutableStyle.get(), defaultStyle.get());
@@ -1213 +1213 @@
 {
     if (!m_mutableStyle)
-        m_mutableStyle = MutableStylePropertySet::create();
+        m_mutableStyle = MutableStyleProperties::create();
     const bool propertyIsImportant = true;
     m_mutableStyle->setProperty(CSSPropertyDisplay, CSSValueInline, propertyIsImportant);
@@ -1345 +1345 @@
 }
 
-static void reconcileTextDecorationProperties(MutableStylePropertySet* style)
+static void reconcileTextDecorationProperties(MutableStyleProperties* style)
 {    
     RefPtr<CSSValue> textDecorationsInEffect = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
@@ -1381 +1381 @@
 
     // FIXME: take care of background-color in effect
-    RefPtr<MutableStylePropertySet> mutableStyle = getPropertiesNotIn(style->style(), &computedStyle);
+    RefPtr<MutableStyleProperties> mutableStyle = getPropertiesNotIn(style->style(), &computedStyle);
 
     reconcileTextDecorationProperties(mutableStyle.get());
@@ -1400 +1400 @@
 }
 
-static void setTextDecorationProperty(MutableStylePropertySet* style, const CSSValueList* newTextDecoration, CSSPropertyID propertyID)
+static void setTextDecorationProperty(MutableStyleProperties* style, const CSSValueList* newTextDecoration, CSSPropertyID propertyID)
 {
     if (newTextDecoration->length())
@@ -1410 +1410 @@
 }
 
-void StyleChange::extractTextStyles(Document* document, MutableStylePropertySet* style, bool shouldUseFixedFontDefaultSize)
+void StyleChange::extractTextStyles(Document* document, MutableStyleProperties* style, bool shouldUseFixedFontDefaultSize)
 {
     ASSERT(style);
@@ -1475 +1475 @@
 }
 
-static void diffTextDecorations(MutableStylePropertySet* style, CSSPropertyID propertID, CSSValue* refTextDecoration)
+static void diffTextDecorations(MutableStyleProperties* style, CSSPropertyID propertID, CSSValue* refTextDecoration)
 {
     RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(propertID);
@@ -1528 +1528 @@
 
 template<typename T>
-static PassRefPtr<MutableStylePropertySet> extractPropertiesNotIn(StylePropertySet* styleWithRedundantProperties, T* baseStyle)
+static PassRefPtr<MutableStyleProperties> extractPropertiesNotIn(StyleProperties* styleWithRedundantProperties, T* baseStyle)
 {
     ASSERT(styleWithRedundantProperties);
-    RefPtr<MutableStylePropertySet> result = styleWithRedundantProperties->mutableCopy();
+    RefPtr<MutableStyleProperties> result = styleWithRedundantProperties->mutableCopy();
 
     result->removeEquivalentProperties(baseStyle);
@@ -1556 +1556 @@
 
 template<typename T>
-PassRefPtr<MutableStylePropertySet> getPropertiesNotIn(StylePropertySet* styleWithRedundantProperties, T* baseStyle)
+PassRefPtr<MutableStyleProperties> getPropertiesNotIn(StyleProperties* styleWithRedundantProperties, T* baseStyle)
 {
     return extractPropertiesNotIn(styleWithRedundantProperties, baseStyle);
@@ -1599 +1599 @@
 }
 
-bool hasTransparentBackgroundColor(StylePropertySet* style)
+bool hasTransparentBackgroundColor(StyleProperties* style)
 {
     RefPtr<CSSValue> cssValue = style->getPropertyCSSValue(CSSPropertyBackgroundColor);

trunk/Source/WebCore/editing/EditingStyle.h

@@ -52 +52 @@
 class Element;
 class HTMLElement;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class Node;
 class Position;
 class QualifiedName;
 class RenderStyle;
-class StylePropertySet;
+class StyleProperties;
 class StyledElement;
 class VisibleSelection;
@@ -85 +85 @@
     }
 
-    static PassRefPtr<EditingStyle> create(const StylePropertySet* style)
+    static PassRefPtr<EditingStyle> create(const StyleProperties* style)
     {
         return adoptRef(new EditingStyle(style));
@@ -97 +97 @@
     ~EditingStyle();
 
-    MutableStylePropertySet* style() { return m_mutableStyle.get(); }
+    MutableStyleProperties* style() { return m_mutableStyle.get(); }
     bool textDirection(WritingDirection&) const;
     bool isEmpty() const;
-    void setStyle(PassRefPtr<MutableStylePropertySet>);
-    void overrideWithStyle(const StylePropertySet*);
+    void setStyle(PassRefPtr<MutableStyleProperties>);
+    void overrideWithStyle(const StyleProperties*);
     void clear();
     PassRefPtr<EditingStyle> copy() const;
@@ -148 +148 @@
     EditingStyle(Node*, PropertiesToInclude);
     EditingStyle(const Position&, PropertiesToInclude);
-    explicit EditingStyle(const StylePropertySet*);
+    explicit EditingStyle(const StyleProperties*);
     EditingStyle(CSSPropertyID, const String& value);
     void init(Node*, PropertiesToInclude);
@@ -158 +158 @@
     bool conflictsWithInlineStyleOfElement(StyledElement*, EditingStyle* extractedStyle, Vector<CSSPropertyID>* conflictingProperties) const;
     void mergeInlineAndImplicitStyleOfElement(StyledElement*, CSSPropertyOverrideMode, PropertiesToInclude);
-    void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
-
-    RefPtr<MutableStylePropertySet> m_mutableStyle;
+    void mergeStyle(const StyleProperties*, CSSPropertyOverrideMode);
+
+    RefPtr<MutableStyleProperties> m_mutableStyle;
     bool m_shouldUseFixedDefaultFontSize;
     float m_fontSizeDelta;
@@ -214 +214 @@
     }
 private:
-    void extractTextStyles(Document*, MutableStylePropertySet*, bool shouldUseFixedFontDefaultSize);
+    void extractTextStyles(Document*, MutableStyleProperties*, bool shouldUseFixedFontDefaultSize);
 
     String m_cssStyle;

trunk/Source/WebCore/editing/Editor.cpp

@@ -78 +78 @@
 #include "SpellChecker.h"
 #include "SpellingCorrectionCommand.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "Text.h"
 #include "TextCheckerClient.h"
@@ -747 +747 @@
 }
 
-void Editor::applyStyle(StylePropertySet* style, EditAction editingAction)
+void Editor::applyStyle(StyleProperties* style, EditAction editingAction)
 {
     switch (m_frame.selection().selectionType()) {
@@ -763 +763 @@
 }
     
-bool Editor::shouldApplyStyle(StylePropertySet* style, Range* range)
+bool Editor::shouldApplyStyle(StyleProperties* style, Range* range)
 {   
     return client()->shouldApplyStyle(style, range);
 }
     
-void Editor::applyParagraphStyle(StylePropertySet* style, EditAction editingAction)
+void Editor::applyParagraphStyle(StyleProperties* style, EditAction editingAction)
 {
     switch (m_frame.selection().selectionType()) {
@@ -782 +782 @@
 }
 
-void Editor::applyStyleToSelection(StylePropertySet* style, EditAction editingAction)
+void Editor::applyStyleToSelection(StyleProperties* style, EditAction editingAction)
 {
     if (!style || style->isEmpty() || !canEditRichly())
@@ -791 +791 @@
 }
 
-void Editor::applyParagraphStyleToSelection(StylePropertySet* style, EditAction editingAction)
+void Editor::applyParagraphStyleToSelection(StyleProperties* style, EditAction editingAction)
 {
     if (!style || style->isEmpty() || !canEditRichly())
@@ -1424 +1424 @@
     }
 
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(CSSPropertyDirection, direction == LeftToRightWritingDirection ? "ltr" : direction == RightToLeftWritingDirection ? "rtl" : "inherit", false);
     applyParagraphStyleToSelection(style.get(), EditActionSetWritingDirection);
@@ -2731 +2731 @@
 }
 
-void Editor::computeAndSetTypingStyle(StylePropertySet* style, EditAction editingAction)
+void Editor::computeAndSetTypingStyle(StyleProperties* style, EditAction editingAction)
 {
     if (!style || style->isEmpty()) {

trunk/Source/WebCore/editing/Editor.h

@@ -67 +67 @@
 class SpellCheckRequest;
 class SpellChecker;
-class StylePropertySet;
+class StyleProperties;
 class Text;
 class TextCheckerClient;
@@ -140 +140 @@
     bool shouldInsertText(const String&, Range*, EditorInsertAction) const;
     bool shouldDeleteRange(Range*) const;
-    bool shouldApplyStyle(StylePropertySet*, Range*);
+    bool shouldApplyStyle(StyleProperties*, Range*);
 
     void respondToChangedContents(const VisibleSelection& endingSelection);
@@ -167 +167 @@
     bool dispatchCPPEvent(const AtomicString&, ClipboardAccessPolicy);
     
-    void applyStyle(StylePropertySet*, EditAction = EditActionUnspecified);
-    void applyParagraphStyle(StylePropertySet*, EditAction = EditActionUnspecified);
-    void applyStyleToSelection(StylePropertySet*, EditAction);
-    void applyParagraphStyleToSelection(StylePropertySet*, EditAction);
+    void applyStyle(StyleProperties*, EditAction = EditActionUnspecified);
+    void applyParagraphStyle(StyleProperties*, EditAction = EditActionUnspecified);
+    void applyStyleToSelection(StyleProperties*, EditAction);
+    void applyParagraphStyleToSelection(StyleProperties*, EditAction);
 
     void appliedEditing(PassRefPtr<CompositeEditCommand>);
@@ -333 +333 @@
     void setMark(const VisibleSelection&);
 
-    void computeAndSetTypingStyle(StylePropertySet* , EditAction = EditActionUnspecified);
+    void computeAndSetTypingStyle(StyleProperties* , EditAction = EditActionUnspecified);
     void applyEditingStyleToBodyElement() const;
     void applyEditingStyleToElement(Element*) const;

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -55 +55 @@
 #include "Settings.h"
 #include "Sound.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "TypingCommand.h"
 #include "UnlinkCommand.h"
@@ -99 +99 @@
 }
 
-static bool applyCommandToFrame(Frame& frame, EditorCommandSource source, EditAction action, StylePropertySet* style)
+static bool applyCommandToFrame(Frame& frame, EditorCommandSource source, EditAction action, StyleProperties* style)
 {
     // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that?
@@ -117 +117 @@
 static bool executeApplyStyle(Frame& frame, EditorCommandSource source, EditAction action, CSSPropertyID propertyID, const String& propertyValue)
 {
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(propertyID, propertyValue);
     return applyCommandToFrame(frame, source, action, style.get());
@@ -124 +124 @@
 static bool executeApplyStyle(Frame& frame, EditorCommandSource source, EditAction action, CSSPropertyID propertyID, CSSValueID propertyValue)
 {
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(propertyID, propertyValue);
     return applyCommandToFrame(frame, source, action, style.get());
@@ -151 +151 @@
 
     // FIXME: We shouldn't be having to convert new style into text.  We should have setPropertyCSSValue.
-    RefPtr<MutableStylePropertySet> newMutableStyle = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> newMutableStyle = MutableStyleProperties::create();
     newMutableStyle->setProperty(propertyID, newStyle);
     return applyCommandToFrame(frame, source, action, newMutableStyle.get());
@@ -174 +174 @@
 static bool executeApplyParagraphStyle(Frame& frame, EditorCommandSource source, EditAction action, CSSPropertyID propertyID, const String& propertyValue)
 {
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(propertyID, propertyValue);
     // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that?
@@ -591 +591 @@
 static bool executeMakeTextWritingDirectionLeftToRight(Frame& frame, Event*, EditorCommandSource, const String&)
 {
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed);
     style->setProperty(CSSPropertyDirection, CSSValueLtr);
@@ -600 +600 @@
 static bool executeMakeTextWritingDirectionNatural(Frame& frame, Event*, EditorCommandSource, const String&)
 {
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(CSSPropertyUnicodeBidi, CSSValueNormal);
     frame.editor().applyStyle(style.get(), EditActionSetWritingDirection);
@@ -608 +608 @@
 static bool executeMakeTextWritingDirectionRightToLeft(Frame& frame, Event*, EditorCommandSource, const String&)
 {
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed);
     style->setProperty(CSSPropertyDirection, CSSValueRtl);

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -59 +59 @@
 #include "Settings.h"
 #include "SpatialNavigation.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "TypingCommand.h"
 #include "VisibleUnits.h"
@@ -1907 +1907 @@
 }
 
-PassRefPtr<MutableStylePropertySet> FrameSelection::copyTypingStyle() const
+PassRefPtr<MutableStyleProperties> FrameSelection::copyTypingStyle() const
 {
     if (!m_typingStyle || !m_typingStyle->style())

trunk/Source/WebCore/editing/FrameSelection.h

@@ -42 +42 @@
 class GraphicsContext;
 class HTMLFormElement;
-class MutableStylePropertySet;
+class MutableStyleProperties;
 class RenderObject;
 class RenderView;
@@ -238 +238 @@
 
     EditingStyle* typingStyle() const;
-    PassRefPtr<MutableStylePropertySet> copyTypingStyle() const;
+    PassRefPtr<MutableStyleProperties> copyTypingStyle() const;
     void setTypingStyle(PassRefPtr<EditingStyle>);
     void clearTypingStyle();

trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp

@@ -29 +29 @@
 #include "CSSStyleDeclaration.h"
 #include "ExceptionCodePlaceholder.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyledElement.h"
 #include <wtf/Assertions.h>
@@ -50 +50 @@
 void RemoveCSSPropertyCommand::doApply()
 {
-    const StylePropertySet* style = m_element->inlineStyle();
+    const StyleProperties* style = m_element->inlineStyle();
     m_oldValue = style->getPropertyValue(m_property);
     m_important = style->propertyIsImportant(m_property);

trunk/Source/WebCore/editing/RemoveFormatCommand.cpp

@@ -33 +33 @@
 #include "FrameSelection.h"
 #include "HTMLNames.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -50 +50 @@
 #include "SimplifyMarkupCommand.h"
 #include "SmartReplace.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "Text.h"
 #include "TextIterator.h"
@@ -484 +484 @@
         StyledElement* element = toStyledElement(node.get());
 
-        const StylePropertySet* inlineStyle = element->inlineStyle();
+        const StyleProperties* inlineStyle = element->inlineStyle();
         RefPtr<EditingStyle> newInlineStyle = EditingStyle::create(inlineStyle);
         if (inlineStyle) {

trunk/Source/WebCore/editing/ios/EditorIOS.mm

@@ -51 +51 @@
 #include "SharedBuffer.h"
 #include "SoftLinking.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "Text.h"
 #include "TypingCommand.h"
@@ -171 +171 @@
     }
 
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(CSSPropertyTextAlign, newValue);
     applyParagraphStyle(style.get());
@@ -278 +278 @@
     
     RefPtr<EditingStyle> editingStyle = EditingStyle::create(m_frame.document()->body());
-    RefPtr<MutableStylePropertySet> defaultStyle = editingStyle.get()->style()->mutableCopy();
+    RefPtr<MutableStyleProperties> defaultStyle = editingStyle.get()->style()->mutableCopy();
     
     // Text widgets implement background color via the UIView property. Their body element will not have one.

trunk/Source/WebCore/editing/mac/EditorMac.mm

@@ -55 +55 @@
 #import "RuntimeApplicationChecks.h"
 #import "Sound.h"
-#import "StylePropertySet.h"
+#import "StyleProperties.h"
 #import "Text.h"
 #import "TypingCommand.h"

trunk/Source/WebCore/editing/markup.cpp

@@ -53 +53 @@
 #include "Range.h"
 #include "RenderBlock.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "TextIterator.h"
 #include "VisibleSelection.h"
@@ -69 +69 @@
 using namespace HTMLNames;
 
-static bool propertyMissingOrEqualToNone(StylePropertySet*, CSSPropertyID);
+static bool propertyMissingOrEqualToNone(StyleProperties*, CSSPropertyID);
 
 class AttributeChange {
@@ -125 +125 @@
     Node* serializeNodes(Node* startNode, Node* pastEnd);
     void wrapWithNode(Node&, bool convertBlocksToInlines = false, RangeFullySelectsNode = DoesFullySelectNode);
-    void wrapWithStyleNode(StylePropertySet*, Document&, bool isBlock = false);
+    void wrapWithStyleNode(StyleProperties*, Document&, bool isBlock = false);
     String takeResults();
 
@@ -131 +131 @@
 
 private:
-    void appendStyleNodeOpenTag(StringBuilder&, StylePropertySet*, Document&, bool isBlock = false);
+    void appendStyleNodeOpenTag(StringBuilder&, StyleProperties*, Document&, bool isBlock = false);
     const String& styleNodeCloseTag(bool isBlock = false);
 
@@ -185 +185 @@
 }
 
-void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style, Document& document, bool isBlock)
+void StyledMarkupAccumulator::wrapWithStyleNode(StyleProperties* style, Document& document, bool isBlock)
 {
     StringBuilder openTag;
@@ -193 +193 @@
 }
 
-void StyledMarkupAccumulator::appendStyleNodeOpenTag(StringBuilder& out, StylePropertySet* style, Document& document, bool isBlock)
+void StyledMarkupAccumulator::appendStyleNodeOpenTag(StringBuilder& out, StyleProperties* style, Document& document, bool isBlock)
 {
     // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
@@ -455 +455 @@
 }
 
-static bool propertyMissingOrEqualToNone(StylePropertySet* style, CSSPropertyID propertyID)
+static bool propertyMissingOrEqualToNone(StyleProperties* style, CSSPropertyID propertyID)
 {
     if (!style)

trunk/Source/WebCore/html/HTMLBRElement.cpp

@@ -57 +57 @@
 }
 
-void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == clearAttr) {

trunk/Source/WebCore/html/HTMLBRElement.h

@@ -40 +40 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual RenderElement* createRenderer(PassRef<RenderStyle>) OVERRIDE;

trunk/Source/WebCore/html/HTMLBodyElement.cpp

@@ -36 +36 @@
 #include "HTMLParserIdioms.h"
 #include "Page.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {
@@ -69 +69 @@
 }
 
-void HTMLBodyElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLBodyElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == backgroundAttr) {

trunk/Source/WebCore/html/HTMLBodyElement.h

@@ -73 +73 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual InsertionNotificationRequest insertedInto(ContainerNode&) OVERRIDE;

trunk/Source/WebCore/html/HTMLDivElement.cpp

@@ -56 +56 @@
 }
 
-void HTMLDivElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLDivElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == alignAttr) {

trunk/Source/WebCore/html/HTMLDivElement.h

@@ -38 +38 @@
 private:
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -53 +53 @@
 #include "ScriptController.h"
 #include "Settings.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "SubframeLoader.h"
 #include "Text.h"
@@ -139 +139 @@
 }
 
-void HTMLElement::applyBorderAttributeToStyle(const AtomicString& value, MutableStylePropertySet& style)
+void HTMLElement::applyBorderAttributeToStyle(const AtomicString& value, MutableStyleProperties& style)
 {
     addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidth, parseBorderWidthAttribute(value), CSSPrimitiveValue::CSS_PX);
@@ -145 +145 @@
 }
 
-void HTMLElement::mapLanguageAttributeToLocale(const AtomicString& value, MutableStylePropertySet& style)
+void HTMLElement::mapLanguageAttributeToLocale(const AtomicString& value, MutableStyleProperties& style)
 {
     if (!value.isEmpty()) {
@@ -163 +163 @@
 }
 
-void HTMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == alignAttr) {
@@ -603 +603 @@
 }
 
-void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStylePropertySet& style)
+void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStyleProperties& style)
 {
     // Vertical alignment with respect to the current baseline of the text
@@ -966 +966 @@
 }
 
-void HTMLElement::addHTMLLengthToStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, const String& value)
+void HTMLElement::addHTMLLengthToStyle(MutableStyleProperties& style, CSSPropertyID propertyID, const String& value)
 {
     // FIXME: This function should not spin up the CSS parser, but should instead just figure out the correct
@@ -1055 +1055 @@
 
 // Color parsing that matches HTML's "rules for parsing a legacy color value"
-void HTMLElement::addHTMLColorToStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, const String& attributeValue)
+void HTMLElement::addHTMLColorToStyle(MutableStyleProperties& style, CSSPropertyID propertyID, const String& attributeValue)
 {
     // An empty string doesn't apply a color. (One containing only whitespace does, which is why this check occurs before stripping.)

trunk/Source/WebCore/html/HTMLElement.h

@@ -99 +99 @@
     HTMLElement(const QualifiedName& tagName, Document&, ConstructionType);
 
-    void addHTMLLengthToStyle(MutableStylePropertySet&, CSSPropertyID, const String& value);
-    void addHTMLColorToStyle(MutableStylePropertySet&, CSSPropertyID, const String& color);
+    void addHTMLLengthToStyle(MutableStyleProperties&, CSSPropertyID, const String& value);
+    void addHTMLColorToStyle(MutableStyleProperties&, CSSPropertyID, const String& color);
 
-    void applyAlignmentAttributeToStyle(const AtomicString&, MutableStylePropertySet&);
-    void applyBorderAttributeToStyle(const AtomicString&, MutableStylePropertySet&);
+    void applyAlignmentAttributeToStyle(const AtomicString&, MutableStyleProperties&);
+    void applyBorderAttributeToStyle(const AtomicString&, MutableStyleProperties&);
 
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     unsigned parseBorderWidthAttribute(const AtomicString&) const;
 
@@ -118 +118 @@
     virtual String nodeName() const OVERRIDE FINAL;
 
-    void mapLanguageAttributeToLocale(const AtomicString&, MutableStylePropertySet&);
+    void mapLanguageAttributeToLocale(const AtomicString&, MutableStyleProperties&);
 
     virtual HTMLFormElement* virtualForm() const;

trunk/Source/WebCore/html/HTMLEmbedElement.cpp

@@ -84 +84 @@
 }
 
-void HTMLEmbedElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLEmbedElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == hiddenAttr) {

trunk/Source/WebCore/html/HTMLEmbedElement.h

@@ -37 +37 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual bool rendererIsNeeded(const RenderStyle&);

trunk/Source/WebCore/html/HTMLFontElement.cpp

@@ -32 +32 @@
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include <wtf/text/StringBuilder.h>
 
@@ -187 +187 @@
 }
 
-void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == sizeAttr) {

trunk/Source/WebCore/html/HTMLFontElement.h

@@ -39 +39 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLFrameSetElement.cpp

@@ -71 +71 @@
 }
 
-void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == bordercolorAttr)

trunk/Source/WebCore/html/HTMLFrameSetElement.h

@@ -72 +72 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual void willAttachRenderers() OVERRIDE;

trunk/Source/WebCore/html/HTMLHRElement.cpp

@@ -29 +29 @@
 #include "CSSValuePool.h"
 #include "HTMLNames.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {
@@ -58 +58 @@
 }
 
-void HTMLHRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLHRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == alignAttr) {

trunk/Source/WebCore/html/HTMLHRElement.h

@@ -39 +39 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLIFrameElement.cpp

@@ -57 +57 @@
 }
 
-void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == widthAttr)

trunk/Source/WebCore/html/HTMLIFrameElement.h

@@ -40 +40 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual bool rendererIsNeeded(const RenderStyle&);

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -86 +86 @@
 }
 
-void HTMLImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == widthAttr)

trunk/Source/WebCore/html/HTMLImageElement.h

@@ -96 +96 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual void didAttachRenderers() OVERRIDE;

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -594 +594 @@
 }
 
-void HTMLInputElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLInputElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == vspaceAttr) {

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -362 +362 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     virtual void finishParsingChildren() OVERRIDE;
 

trunk/Source/WebCore/html/HTMLLIElement.cpp

@@ -58 +58 @@
 }
 
-void HTMLLIElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLLIElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == typeAttr) {

trunk/Source/WebCore/html/HTMLLIElement.h

@@ -38 +38 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual void didAttachRenderers() OVERRIDE;

trunk/Source/WebCore/html/HTMLMarqueeElement.cpp

@@ -66 +66 @@
 }
 
-void HTMLMarqueeElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLMarqueeElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == widthAttr) {

trunk/Source/WebCore/html/HTMLMarqueeElement.h

@@ -55 +55 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     // ActiveDOMObject

trunk/Source/WebCore/html/HTMLOListElement.cpp

@@ -62 +62 @@
 }
 
-void HTMLOListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLOListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == typeAttr) {

trunk/Source/WebCore/html/HTMLOListElement.h

@@ -56 +56 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     int m_start;

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -90 +90 @@
 }
 
-void HTMLObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == borderAttr)

trunk/Source/WebCore/html/HTMLObjectElement.h

@@ -71 +71 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual InsertionNotificationRequest insertedInto(ContainerNode&) OVERRIDE;

trunk/Source/WebCore/html/HTMLParagraphElement.cpp

@@ -57 +57 @@
 }
 
-void HTMLParagraphElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLParagraphElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == alignAttr) {

trunk/Source/WebCore/html/HTMLParagraphElement.h

@@ -37 +37 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLPlugInElement.cpp

@@ -180 +180 @@
 }
 
-void HTMLPlugInElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLPlugInElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == widthAttr)

trunk/Source/WebCore/html/HTMLPlugInElement.h

@@ -91 +91 @@
     virtual void willDetachRenderers() OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual bool useFallbackContent() const { return false; }

trunk/Source/WebCore/html/HTMLPreElement.cpp

@@ -28 +28 @@
 #include "CSSValueKeywords.h"
 #include "HTMLNames.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {
@@ -51 +51 @@
 }
 
-void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == wrapAttr)

trunk/Source/WebCore/html/HTMLPreElement.h

@@ -36 +36 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLTableCaptionElement.cpp

@@ -52 +52 @@
 }
 
-void HTMLTableCaptionElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLTableCaptionElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == alignAttr) {

trunk/Source/WebCore/html/HTMLTableCaptionElement.h

@@ -39 +39 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLTableCellElement.cpp

@@ -83 +83 @@
 }
 
-void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == nowrapAttr)
@@ -115 +115 @@
 }
 
-const StylePropertySet* HTMLTableCellElement::additionalPresentationAttributeStyle()
+const StyleProperties* HTMLTableCellElement::additionalPresentationAttributeStyle()
 {
     if (HTMLTableElement* table = findParentTable())

trunk/Source/WebCore/html/HTMLTableCellElement.h

@@ -55 +55 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
-    virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
+    virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
 
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;

trunk/Source/WebCore/html/HTMLTableColElement.cpp

@@ -55 +55 @@
 }
 
-void HTMLTableColElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLTableColElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == widthAttr)
@@ -82 +82 @@
 }
 
-const StylePropertySet* HTMLTableColElement::additionalPresentationAttributeStyle()
+const StyleProperties* HTMLTableColElement::additionalPresentationAttributeStyle()
 {
     if (!hasLocalName(colgroupTag))

trunk/Source/WebCore/html/HTMLTableColElement.h

@@ -45 +45 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
-    virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
+    virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
 
     int m_span;

trunk/Source/WebCore/html/HTMLTableElement.cpp

@@ -40 +40 @@
 #include "HTMLTableSectionElement.h"
 #include "RenderTable.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include <wtf/Ref.h>
 
@@ -300 +300 @@
 }
 
-void HTMLTableElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLTableElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == widthAttr)
@@ -413 +413 @@
 }
 
-static StylePropertySet* leakBorderStyle(CSSValueID value)
-{
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+static StyleProperties* leakBorderStyle(CSSValueID value)
+{
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     style->setProperty(CSSPropertyBorderTopStyle, value);
     style->setProperty(CSSPropertyBorderBottomStyle, value);
@@ -423 +423 @@
 }
 
-const StylePropertySet* HTMLTableElement::additionalPresentationAttributeStyle()
+const StyleProperties* HTMLTableElement::additionalPresentationAttributeStyle()
 {
     if (m_frameAttr)
@@ -432 +432 @@
         // set on the table's cells during border-conflict resolution.
         if (m_rulesAttr != UnsetRules) {
-            static StylePropertySet* solidBorderStyle = leakBorderStyle(CSSValueHidden);
+            static StyleProperties* solidBorderStyle = leakBorderStyle(CSSValueHidden);
             return solidBorderStyle;
         }
@@ -439 +439 @@
 
     if (m_borderColorAttr) {
-        static StylePropertySet* solidBorderStyle = leakBorderStyle(CSSValueSolid);
+        static StyleProperties* solidBorderStyle = leakBorderStyle(CSSValueSolid);
         return solidBorderStyle;
     }
-    static StylePropertySet* outsetBorderStyle = leakBorderStyle(CSSValueOutset);
+    static StyleProperties* outsetBorderStyle = leakBorderStyle(CSSValueOutset);
     return outsetBorderStyle;
 }
@@ -469 +469 @@
 }
 
-PassRefPtr<StylePropertySet> HTMLTableElement::createSharedCellStyle()
-{
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+PassRefPtr<StyleProperties> HTMLTableElement::createSharedCellStyle()
+{
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
 
     switch (cellBorders()) {
@@ -509 +509 @@
 }
 
-const StylePropertySet* HTMLTableElement::additionalCellStyle()
+const StyleProperties* HTMLTableElement::additionalCellStyle()
 {
     if (!m_sharedCellStyle)
@@ -516 +516 @@
 }
 
-static StylePropertySet* leakGroupBorderStyle(int rows)
-{
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+static StyleProperties* leakGroupBorderStyle(int rows)
+{
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
     if (rows) {
         style->setProperty(CSSPropertyBorderTopWidth, CSSValueThin);
@@ -533 +533 @@
 }
 
-const StylePropertySet* HTMLTableElement::additionalGroupStyle(bool rows)
+const StyleProperties* HTMLTableElement::additionalGroupStyle(bool rows)
 {
     if (m_rulesAttr != GroupsRules)
@@ -539 +539 @@
 
     if (rows) {
-        static StylePropertySet* rowBorderStyle = leakGroupBorderStyle(true);
+        static StyleProperties* rowBorderStyle = leakGroupBorderStyle(true);
         return rowBorderStyle;
     }
-    static StylePropertySet* columnBorderStyle = leakGroupBorderStyle(false);
+    static StyleProperties* columnBorderStyle = leakGroupBorderStyle(false);
     return columnBorderStyle;
 }

trunk/Source/WebCore/html/HTMLTableElement.h

@@ -66 +66 @@
     String summary() const;
 
-    const StylePropertySet* additionalCellStyle();
-    const StylePropertySet* additionalGroupStyle(bool rows);
+    const StyleProperties* additionalCellStyle();
+    const StyleProperties* additionalGroupStyle(bool rows);
 
 private:
@@ -74 +74 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
 
     // Used to obtain either a solid or outset border decl and to deal with the frame and rules attributes.
-    virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
+    virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
 
     virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const OVERRIDE;
@@ -87 +87 @@
     CellBorders cellBorders() const;
 
-    PassRefPtr<StylePropertySet> createSharedCellStyle();
+    PassRefPtr<StyleProperties> createSharedCellStyle();
 
     HTMLTableSectionElement* lastBody() const;
@@ -98 +98 @@
 
     unsigned short m_padding;
-    RefPtr<StylePropertySet> m_sharedCellStyle;
+    RefPtr<StyleProperties> m_sharedCellStyle;
 };
 

trunk/Source/WebCore/html/HTMLTablePartElement.cpp

@@ -34 +34 @@
 #include "HTMLParserIdioms.h"
 #include "HTMLTableElement.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {
@@ -47 +47 @@
 }
 
-void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == bgcolorAttr)

trunk/Source/WebCore/html/HTMLTablePartElement.h

@@ -41 +41 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     HTMLTableElement* findParentTable() const;

trunk/Source/WebCore/html/HTMLTableSectionElement.cpp

@@ -48 +48 @@
 }
 
-const StylePropertySet* HTMLTableSectionElement::additionalPresentationAttributeStyle()
+const StyleProperties* HTMLTableSectionElement::additionalPresentationAttributeStyle()
 {
     if (HTMLTableElement* table = findParentTable())

trunk/Source/WebCore/html/HTMLTableSectionElement.h

@@ -57 +57 @@
     HTMLTableSectionElement(const QualifiedName& tagName, Document&);
 
-    virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
+    virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -152 +152 @@
 }
 
-void HTMLTextAreaElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLTextAreaElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == wrapAttr) {

trunk/Source/WebCore/html/HTMLTextAreaElement.h

@@ -100 +100 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     virtual RenderElement* createRenderer(PassRef<RenderStyle>) OVERRIDE;
     virtual bool appendFormData(FormDataList&, bool) OVERRIDE;

trunk/Source/WebCore/html/HTMLUListElement.cpp

@@ -55 +55 @@
 }
 
-void HTMLUListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLUListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == typeAttr)

trunk/Source/WebCore/html/HTMLUListElement.h

@@ -37 +37 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLVideoElement.cpp

@@ -97 +97 @@
 }
 
-void HTMLVideoElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void HTMLVideoElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == widthAttr)

trunk/Source/WebCore/html/HTMLVideoElement.h

@@ -82 +82 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     virtual bool isVideo() const OVERRIDE { return true; }
     virtual bool hasVideo() const OVERRIDE { return player() && player()->hasVideo(); }

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -51 +51 @@
 #include "SecurityOrigin.h"
 #include "StrokeStyleApplier.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "TextMetrics.h"
@@ -1994 +1994 @@
         return;
 
-    RefPtr<MutableStylePropertySet> parsedStyle = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> parsedStyle = MutableStyleProperties::create();
     CSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, newFont, true, strictToCSSParserMode(!m_usesCSSCompatibilityParseMode), 0);
     if (parsedStyle->isEmpty())

trunk/Source/WebCore/html/canvas/CanvasStyle.cpp

@@ -36 +36 @@
 #include "GraphicsContext.h"
 #include "HTMLCanvasElement.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 #if USE(CG)

trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp

@@ -39 +39 @@
 #include "RenderMedia.h"
 #include "RenderMediaControlElements.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {
@@ -93 +93 @@
 bool MediaControlElement::isShowing() const
 {
-    const StylePropertySet* propertySet = m_element->inlineStyle();
+    const StyleProperties* propertySet = m_element->inlineStyle();
     // Following the code from show() and hide() above, we only have
     // to check for the presense of inline display.

trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp

@@ -39 +39 @@
 #include "RenderTheme.h"
 #include "ShadowRoot.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {

trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp

@@ -52 +52 @@
 #include "RenderRegion.h"
 #include "SVGStyleElement.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StylePropertyShorthand.h"
 #include "StyleResolver.h"
@@ -1349 +1349 @@
 
     // FIXME: Ugliness below.
-    StylePropertySet* attributeStyle = const_cast<StylePropertySet*>(toStyledElement(element)->presentationAttributeStyle());
+    StyleProperties* attributeStyle = const_cast<StyleProperties*>(toStyledElement(element)->presentationAttributeStyle());
     if (!attributeStyle)
         return 0;
 
     ASSERT_WITH_SECURITY_IMPLICATION(attributeStyle->isMutable());
-    MutableStylePropertySet* mutableAttributeStyle = static_cast<MutableStylePropertySet*>(attributeStyle);
+    MutableStyleProperties* mutableAttributeStyle = static_cast<MutableStyleProperties*>(attributeStyle);
 
     RefPtr<InspectorStyle> inspectorStyle = InspectorStyle::create(InspectorCSSId(), mutableAttributeStyle->ensureCSSStyleDeclaration(), 0);

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -89 +89 @@
 #include "Settings.h"
 #include "ShadowRoot.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "StyleSheetList.h"

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -54 +54 @@
 #include "RegularExpression.h"
 #include "SVGNames.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "StyleRule.h"
@@ -367 +367 @@
 
     if (propertyText.stripWhiteSpace().length()) {
-        RefPtr<MutableStylePropertySet> tempMutableStyle = MutableStylePropertySet::create();
+        RefPtr<MutableStyleProperties> tempMutableStyle = MutableStyleProperties::create();
         RefPtr<CSSRuleSourceData> sourceData = CSSRuleSourceData::create(CSSRuleSourceData::STYLE_RULE);
         Document* ownerDocument = m_parentStyleSheet->pageStyleSheet() ? m_parentStyleSheet->pageStyleSheet()->ownerDocument() : 0;
@@ -1548 +1548 @@
     }
 
-    RefPtr<MutableStylePropertySet> tempDeclaration = MutableStylePropertySet::create();
+    RefPtr<MutableStyleProperties> tempDeclaration = MutableStyleProperties::create();
     createCSSParser(&m_element->document())->parseDeclaration(tempDeclaration.get(), m_styleText, result, &m_element->document().elementSheet().contents());
     return true;

trunk/Source/WebCore/loader/EmptyClients.h

@@ -417 +417 @@
     virtual bool shouldChangeSelectedRange(Range*, Range*, EAffinity, bool) OVERRIDE { return false; }
 
-    virtual bool shouldApplyStyle(StylePropertySet*, Range*) OVERRIDE { return false; }
+    virtual bool shouldApplyStyle(StyleProperties*, Range*) OVERRIDE { return false; }
     virtual bool shouldMoveRangeAfterDelete(Range*, Range*) OVERRIDE { return false; }
 

trunk/Source/WebCore/mathml/MathMLElement.cpp

@@ -84 +84 @@
 }
 
-void MathMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void MathMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (name == mathbackgroundAttr)

trunk/Source/WebCore/mathml/MathMLElement.h

@@ -49 +49 @@
 private:    
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
 
     virtual bool childShouldCreateRenderer(const Node&) const OVERRIDE;

trunk/Source/WebCore/page/DragController.cpp

@@ -74 +74 @@
 #include "Settings.h"
 #include "ShadowRoot.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "Text.h"
 #include "TextEvent.h"
@@ -455 +455 @@
             return false;
         RefPtr<Range> innerRange = innerFrame->selection().toNormalizedRange();
-        RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
+        RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
         style->setProperty(CSSPropertyColor, color.serialized(), false);
         if (!innerFrame->editor().shouldApplyStyle(style.get(), innerRange.get()))

trunk/Source/WebCore/page/EditorClient.h

@@ -54 +54 @@
 class Range;
 class SharedBuffer;
-class StylePropertySet;
+class StyleProperties;
 class TextCheckerClient;
 class VisibleSelection;
@@ -81 +81 @@
     virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting) = 0;
     
-    virtual bool shouldApplyStyle(StylePropertySet*, Range*) = 0;
+    virtual bool shouldApplyStyle(StyleProperties*, Range*) = 0;
     virtual bool shouldMoveRangeAfterDelete(Range*, Range*) = 0;
 

trunk/Source/WebCore/page/Frame.cpp

@@ -90 +90 @@
 #include "ScrollingCoordinator.h"
 #include "Settings.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "TextIterator.h"
 #include "TextNodeTraversal.h"

trunk/Source/WebCore/page/PageSerializer.cpp

@@ -54 +54 @@
 #include "StyleCachedImage.h"
 #include "StyleImage.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleRule.h"
 #include "StyleSheetContents.h"
@@ -318 +318 @@
 }
 
-void PageSerializer::retrieveResourcesForProperties(const StylePropertySet* styleDeclaration, Document* document)
+void PageSerializer::retrieveResourcesForProperties(const StyleProperties* styleDeclaration, Document* document)
 {
     if (!styleDeclaration)

trunk/Source/WebCore/page/PageSerializer.h

@@ -47 +47 @@
 class Page;
 class RenderElement;
-class StylePropertySet;
+class StyleProperties;
 class StyleRule;
 
@@ -79 +79 @@
 
     void addImageToResources(CachedImage*, RenderElement*, const URL&);
-    void retrieveResourcesForProperties(const StylePropertySet*, Document*);
+    void retrieveResourcesForProperties(const StyleProperties*, Document*);
     void retrieveResourcesForRule(StyleRule*, Document*);
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -103 +103 @@
 #include "ShadowRoot.h"
 #include "SourceGraphic.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "TextStream.h"

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -34 +34 @@
 #include "RenderTableCol.h"
 #include "RenderView.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "TransformState.h"
 #include <wtf/StackStats.h>

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -55 +55 @@
 #include "ShadowRoot.h"
 #include "SimpleLineLayoutResolver.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include <wtf/HexNumber.h>
 #include <wtf/Vector.h>
@@ -140 +140 @@
         return true;
 
-    const StylePropertySet* inlineStyleDecl = elem->inlineStyle();
+    const StyleProperties* inlineStyleDecl = elem->inlineStyle();
     return (!inlineStyleDecl || inlineStyleDecl->isEmpty());
 }

trunk/Source/WebCore/svg/SVGAnimateElement.cpp

@@ -33 +33 @@
 #include "SVGElement.h"
 #include "SVGNames.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 
 namespace WebCore {

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -760 +760 @@
 }
 
-MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const
+MutableStyleProperties* SVGElement::animatedSMILStyleProperties() const
 {
     if (m_svgRareData)
@@ -767 +767 @@
 }
 
-MutableStylePropertySet& SVGElement::ensureAnimatedSMILStyleProperties()
+MutableStyleProperties& SVGElement::ensureAnimatedSMILStyleProperties()
 {
     return ensureSVGRareData().ensureAnimatedSMILStyleProperties();
@@ -967 +967 @@
 }
 
-void SVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void SVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     CSSPropertyID propertyID = cssPropertyIdForSVGAttributeName(name);
@@ -1055 +1055 @@
         return 0;
 
-    RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create(SVGAttributeMode);
+    RefPtr<MutableStyleProperties> style = MutableStyleProperties::create(SVGAttributeMode);
     CSSPropertyID propertyID = cssPropertyIdForSVGAttributeName(attribute->name());
     style->setProperty(propertyID, attribute->value());

trunk/Source/WebCore/svg/SVGElement.h

@@ -127 +127 @@
 #endif
 
-    MutableStylePropertySet* animatedSMILStyleProperties() const;
-    MutableStylePropertySet& ensureAnimatedSMILStyleProperties();
+    MutableStyleProperties* animatedSMILStyleProperties() const;
+    MutableStyleProperties& ensureAnimatedSMILStyleProperties();
     void setUseOverrideComputedStyle(bool);
 
@@ -157 +157 @@
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     virtual InsertionNotificationRequest insertedInto(ContainerNode&) OVERRIDE;
     virtual void removedFrom(ContainerNode&) OVERRIDE;

trunk/Source/WebCore/svg/SVGElementRareData.h

@@ -21 +21 @@
 #define SVGElementRareData_h
 
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include <wtf/HashSet.h>
@@ -62 +62 @@
     void setCursorImageValue(CSSCursorImageValue* cursorImageValue) { m_cursorImageValue = cursorImageValue; }
 
-    MutableStylePropertySet* animatedSMILStyleProperties() const { return m_animatedSMILStyleProperties.get(); }
-    MutableStylePropertySet& ensureAnimatedSMILStyleProperties()
+    MutableStyleProperties* animatedSMILStyleProperties() const { return m_animatedSMILStyleProperties.get(); }
+    MutableStyleProperties& ensureAnimatedSMILStyleProperties()
     {
         if (!m_animatedSMILStyleProperties)
-            m_animatedSMILStyleProperties = MutableStylePropertySet::create(SVGAttributeMode);
+            m_animatedSMILStyleProperties = MutableStyleProperties::create(SVGAttributeMode);
         return *m_animatedSMILStyleProperties;
     }
@@ -101 +101 @@
     bool m_useOverrideComputedStyle : 1;
     bool m_needsOverrideComputedStyleUpdate : 1;
-    RefPtr<MutableStylePropertySet> m_animatedSMILStyleProperties;
+    RefPtr<MutableStyleProperties> m_animatedSMILStyleProperties;
     RefPtr<RenderStyle> m_overrideComputedStyle;
 };

trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

@@ -40 +40 @@
 #include "SVGGlyphElement.h"
 #include "SVGNames.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "StyleResolver.h"
 #include "StyleRule.h"
@@ -51 +51 @@
 inline SVGFontFaceElement::SVGFontFaceElement(const QualifiedName& tagName, Document& document)
     : SVGElement(tagName, document)
-    , m_fontFaceRule(StyleRuleFontFace::create(MutableStylePropertySet::create(CSSStrictMode)))
+    , m_fontFaceRule(StyleRuleFontFace::create(MutableStyleProperties::create(CSSStrictMode)))
     , m_fontElement(0)
 {

trunk/Source/WebCore/svg/SVGImageElement.cpp

@@ -96 +96 @@
 }
 
-void SVGImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void SVGImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (!isSupportedAttribute(name))

trunk/Source/WebCore/svg/SVGImageElement.h

@@ -48 +48 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     virtual void svgAttributeChanged(const QualifiedName&);
 

trunk/Source/WebCore/svg/SVGTextContentElement.cpp

@@ -229 +229 @@
 }
 
-void SVGTextContentElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
+void SVGTextContentElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
 {
     if (!isSupportedAttribute(name))

trunk/Source/WebCore/svg/SVGTextContentElement.h

@@ -101 +101 @@
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
     virtual void svgAttributeChanged(const QualifiedName&);
 

trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp

@@ -107 +107 @@
 }
 
-bool EditorClientEfl::shouldApplyStyle(StylePropertySet* style, Range* range)
+bool EditorClientEfl::shouldApplyStyle(StyleProperties* style, Range* range)
 {
     Ewk_Should_Apply_Style_Event shouldApplyStyleEvent = { style, range };

trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h

@@ -62 +62 @@
 
 struct Ewk_Should_Apply_Style_Event {
-    WebCore::StylePropertySet* style;
+    WebCore::StyleProperties* style;
     WebCore::Range* range;
 };
@@ -97 +97 @@
     virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting);
 
-    virtual bool shouldApplyStyle(StylePropertySet*, Range*);
+    virtual bool shouldApplyStyle(StyleProperties*, Range*);
 
     virtual bool shouldMoveRangeAfterDelete(Range*, Range*);

trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

@@ -39 +39 @@
 #include "PlatformKeyboardEvent.h"
 #include "Settings.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "UndoStep.h"
 #include "WebKitDOMCSSStyleDeclarationPrivate.h"
@@ -178 +178 @@
 }
 
-bool EditorClient::shouldApplyStyle(WebCore::StylePropertySet* set, WebCore::Range* range)
-{
-    gboolean accept = TRUE;
-    Ref<MutableStylePropertySet> mutableStyle(set->mutableCopy());
+bool EditorClient::shouldApplyStyle(WebCore::StyleProperties* set, WebCore::Range* range)
+{
+    gboolean accept = TRUE;
+    Ref<MutableStyleProperties> mutableStyle(set->mutableCopy());
     GRefPtr<WebKitDOMCSSStyleDeclaration> kitDeclaration(kit(mutableStyle->ensureCSSStyleDeclaration()));
     GRefPtr<WebKitDOMRange> kitRange(adoptGRef(kit(range)));

trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h

@@ -88 +88 @@
         virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting);
 
-        virtual bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*);
+        virtual bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*);
 
         virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*);

trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h

@@ -60 +60 @@
     virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) OVERRIDE;
 
-    virtual bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*) OVERRIDE;
+    virtual bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*) OVERRIDE;
     
     virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range* rangeToBeReplaced) OVERRIDE;

trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm

@@ -64 +64 @@
 #import <WebCore/Settings.h>
 #import <WebCore/SpellChecker.h>
-#import <WebCore/StylePropertySet.h>
+#import <WebCore/StyleProperties.h>
 #import <WebCore/UndoStep.h>
 #import <WebCore/UserTypingGestureIndicator.h>
@@ -245 +245 @@
 }
 
-bool WebEditorClient::shouldApplyStyle(StylePropertySet* style, Range* range)
-{
-    Ref<MutableStylePropertySet> mutableStyle(style->isMutable() ? static_cast<MutableStylePropertySet&>(*style) : style->mutableCopy());
+bool WebEditorClient::shouldApplyStyle(StyleProperties* style, Range* range)
+{
+    Ref<MutableStyleProperties> mutableStyle(style->isMutable() ? static_cast<MutableStyleProperties&>(*style) : style->mutableCopy());
     return [[m_webView _editingDelegateForwarder] webView:m_webView
         shouldApplyStyle:kit(mutableStyle->ensureCSSStyleDeclaration()) toElementsInDOMRange:kit(range)];

trunk/Source/WebKit/mac/WebView/WebFrame.mm

@@ -93 +93 @@
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SmartReplace.h>
-#import <WebCore/StylePropertySet.h>
+#import <WebCore/StyleProperties.h>
 #import <WebCore/SubframeLoader.h>
 #import <WebCore/TextIterator.h>
@@ -782 +782 @@
     if (!_private->coreFrame)
         return nil;
-    RefPtr<MutableStylePropertySet> typingStyle = _private->coreFrame->selection().copyTypingStyle();
+    RefPtr<MutableStyleProperties> typingStyle = _private->coreFrame->selection().copyTypingStyle();
     if (!typingStyle)
         return nil;
@@ -793 +793 @@
         return;
     // FIXME: We shouldn't have to create a copy here.
-    Ref<MutableStylePropertySet> properties(core(style)->copyProperties());
+    Ref<MutableStyleProperties> properties(core(style)->copyProperties());
     _private->coreFrame->editor().computeAndSetTypingStyle(&properties.get(), undoAction);
 }

trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

@@ -115 +115 @@
 #import <WebCore/SharedBuffer.h>
 #import <WebCore/SimpleFontData.h>
-#import <WebCore/StylePropertySet.h>
+#import <WebCore/StyleProperties.h>
 #import <WebCore/Text.h>
 #import <WebCore/TextAlternativeWithRange.h>
@@ -4370 +4370 @@
 {
     if (Frame* coreFrame = core([self _frame])) {
-        // FIXME: We shouldn't have to make a copy here. We want callers of this function to work directly with StylePropertySet eventually.
-        Ref<MutableStylePropertySet> properties(core(style)->copyProperties());
+        // FIXME: We shouldn't have to make a copy here. We want callers of this function to work directly with StyleProperties eventually.
+        Ref<MutableStyleProperties> properties(core(style)->copyProperties());
         coreFrame->editor().applyStyleToSelection(&properties.get(), undoAction);
     }
@@ -4674 +4674 @@
         if (Frame* coreFrame = core([self _frame])) {
             // FIXME: We shouldn't have to make a copy here.
-            Ref<MutableStylePropertySet> properties(core(style)->copyProperties());
+            Ref<MutableStyleProperties> properties(core(style)->copyProperties());
             coreFrame->editor().applyStyle(&properties.get(), [self _undoActionFromColorPanelWithSelector:selector]);
         }

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -174 +174 @@
 #import <WebCore/SecurityPolicy.h>
 #import <WebCore/Settings.h>
-#import <WebCore/StylePropertySet.h>
+#import <WebCore/StyleProperties.h>
 #import <WebCore/SystemVersionMac.h>
 #import <WebCore/TextResourceDecoder.h>
@@ -5956 +5956 @@
     if (Frame* coreFrame = core(webFrame)) {
         // FIXME: We shouldn't have to make a copy here.
-        Ref<MutableStylePropertySet> properties(core(style)->copyProperties());
+        Ref<MutableStyleProperties> properties(core(style)->copyProperties());
         coreFrame->editor().applyStyle(&properties.get());
     }

trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp

@@ -284 +284 @@
 //{ notImplemented(); return false; }
 
-bool WebEditorClient::shouldApplyStyle(StylePropertySet* /*style*/, Range* /*toElementsInDOMRange*/)
+bool WebEditorClient::shouldApplyStyle(StyleProperties* /*style*/, Range* /*toElementsInDOMRange*/)
 { notImplemented(); return true; }
 
@@ -290 +290 @@
 { notImplemented(); return true; }
 
-bool WebEditorClient::shouldChangeTypingStyle(StylePropertySet* /*currentStyle*/, StylePropertySet* /*toProposedStyle*/)
+bool WebEditorClient::shouldChangeTypingStyle(StyleProperties* /*currentStyle*/, StyleProperties* /*toProposedStyle*/)
 { notImplemented(); return false; }
 

trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h

@@ -65 +65 @@
 
     bool shouldInsertNode(WebCore::Node*, WebCore::Range* replacingRange, WebCore::EditorInsertAction);
-    bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*);
+    bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*);
     bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*);
-    bool shouldChangeTypingStyle(WebCore::StylePropertySet* currentStyle, WebCore::StylePropertySet* toProposedStyle);
+    bool shouldChangeTypingStyle(WebCore::StyleProperties* currentStyle, WebCore::StyleProperties* toProposedStyle);
 
     void webViewDidChangeTypingStyle(WebNotification*);

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

@@ -47 +47 @@
 #include <WebCore/Page.h>
 #include <WebCore/SpellChecker.h>
-#include <WebCore/StylePropertySet.h>
+#include <WebCore/StyleProperties.h>
 #include <WebCore/TextIterator.h>
 #include <WebCore/UndoStep.h>
@@ -154 +154 @@
 }
     
-bool WebEditorClient::shouldApplyStyle(StylePropertySet* style, Range* range)
-{
-    Ref<MutableStylePropertySet> mutableStyle(style->isMutable() ? static_cast<MutableStylePropertySet&>(*style) : style->mutableCopy());
+bool WebEditorClient::shouldApplyStyle(StyleProperties* style, Range* range)
+{
+    Ref<MutableStyleProperties> mutableStyle(style->isMutable() ? static_cast<MutableStyleProperties&>(*style) : style->mutableCopy());
     bool result = m_page->injectedBundleEditorClient().shouldApplyStyle(m_page, mutableStyle->ensureCSSStyleDeclaration(), range);
     notImplemented();

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

@@ -59 +59 @@
     virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) OVERRIDE;
     
-    virtual bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*) OVERRIDE;
+    virtual bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*) OVERRIDE;
     virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*) OVERRIDE;
 

trunk/Tools/DumpRenderTree/efl/EditingCallbacks.cpp

@@ -36 +36 @@
 #include "Node.h"
 #include "Range.h"
-#include "StylePropertySet.h"
+#include "StyleProperties.h"
 #include "TestRunner.h"
 #include "TextAffinity.h"