<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159856] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159856">159856</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-11-28 12:53:22 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorCPPpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkSourceWebCorecssCSSAllInOnecpp">trunk/Source/WebCore/css/CSSAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationh">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceRulecpp">trunk/Source/WebCore/css/CSSFontFaceRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPageRulecpp">trunk/Source/WebCore/css/CSSPageRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleDeclarationh">trunk/Source/WebCore/css/CSSStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleRulecpp">trunk/Source/WebCore/css/CSSStyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDOMWindowCSScpp">trunk/Source/WebCore/css/DOMWindowCSS.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorh">trunk/Source/WebCore/css/ElementRuleCollector.h</a></li>
<li><a href="#trunkSourceWebCorecssFontLoadercpp">trunk/Source/WebCore/css/FontLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorecssPageRuleCollectorcpp">trunk/Source/WebCore/css/PageRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationh">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleRulecpp">trunk/Source/WebCore/css/StyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleh">trunk/Source/WebCore/css/StyleRule.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleSheetContentscpp">trunk/Source/WebCore/css/StyleSheetContents.cpp</a></li>
<li><a href="#trunkSourceWebCorecssViewportStyleResolvercpp">trunk/Source/WebCore/css/ViewportStyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssViewportStyleResolverh">trunk/Source/WebCore/css/ViewportStyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSFilterRulecpp">trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframeRulecpp">trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframeRuleh">trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframesRulecpp">trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSMatrixcpp">trunk/Source/WebCore/css/WebKitCSSMatrix.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSViewportRulecpp">trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp</a></li>
<li><a href="#trunkSourceWebCoredomAttrcpp">trunk/Source/WebCore/dom/Attr.cpp</a></li>
<li><a href="#trunkSourceWebCoredomAttrh">trunk/Source/WebCore/dom/Attr.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementDatacpp">trunk/Source/WebCore/dom/ElementData.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementDatah">trunk/Source/WebCore/dom/ElementData.h</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementh">trunk/Source/WebCore/dom/StyledElement.h</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteButtonControllercpp">trunk/Source/WebCore/editing/DeleteButtonController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStyleh">trunk/Source/WebCore/editing/EditingStyle.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorCommandcpp">trunk/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingRemoveCSSPropertyCommandcpp">trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingRemoveFormatCommandcpp">trunk/Source/WebCore/editing/RemoveFormatCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLBRElementcpp">trunk/Source/WebCore/html/HTMLBRElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLBRElementh">trunk/Source/WebCore/html/HTMLBRElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLBodyElementcpp">trunk/Source/WebCore/html/HTMLBodyElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLBodyElementh">trunk/Source/WebCore/html/HTMLBodyElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDivElementcpp">trunk/Source/WebCore/html/HTMLDivElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDivElementh">trunk/Source/WebCore/html/HTMLDivElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementh">trunk/Source/WebCore/html/HTMLElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLEmbedElementcpp">trunk/Source/WebCore/html/HTMLEmbedElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLEmbedElementh">trunk/Source/WebCore/html/HTMLEmbedElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFontElementcpp">trunk/Source/WebCore/html/HTMLFontElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFontElementh">trunk/Source/WebCore/html/HTMLFontElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameSetElementcpp">trunk/Source/WebCore/html/HTMLFrameSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameSetElementh">trunk/Source/WebCore/html/HTMLFrameSetElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLHRElementcpp">trunk/Source/WebCore/html/HTMLHRElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLHRElementh">trunk/Source/WebCore/html/HTMLHRElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLIFrameElementcpp">trunk/Source/WebCore/html/HTMLIFrameElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLIFrameElementh">trunk/Source/WebCore/html/HTMLIFrameElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementh">trunk/Source/WebCore/html/HTMLImageElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLIElementcpp">trunk/Source/WebCore/html/HTMLLIElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLIElementh">trunk/Source/WebCore/html/HTMLLIElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMarqueeElementcpp">trunk/Source/WebCore/html/HTMLMarqueeElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMarqueeElementh">trunk/Source/WebCore/html/HTMLMarqueeElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOListElementcpp">trunk/Source/WebCore/html/HTMLOListElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOListElementh">trunk/Source/WebCore/html/HTMLOListElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementcpp">trunk/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementh">trunk/Source/WebCore/html/HTMLObjectElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLParagraphElementcpp">trunk/Source/WebCore/html/HTMLParagraphElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLParagraphElementh">trunk/Source/WebCore/html/HTMLParagraphElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementcpp">trunk/Source/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementh">trunk/Source/WebCore/html/HTMLPlugInElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPreElementcpp">trunk/Source/WebCore/html/HTMLPreElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPreElementh">trunk/Source/WebCore/html/HTMLPreElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableCaptionElementcpp">trunk/Source/WebCore/html/HTMLTableCaptionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableCaptionElementh">trunk/Source/WebCore/html/HTMLTableCaptionElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableCellElementcpp">trunk/Source/WebCore/html/HTMLTableCellElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableCellElementh">trunk/Source/WebCore/html/HTMLTableCellElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableColElementcpp">trunk/Source/WebCore/html/HTMLTableColElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableColElementh">trunk/Source/WebCore/html/HTMLTableColElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableElementcpp">trunk/Source/WebCore/html/HTMLTableElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableElementh">trunk/Source/WebCore/html/HTMLTableElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTablePartElementcpp">trunk/Source/WebCore/html/HTMLTablePartElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTablePartElementh">trunk/Source/WebCore/html/HTMLTablePartElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableSectionElementcpp">trunk/Source/WebCore/html/HTMLTableSectionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableSectionElementh">trunk/Source/WebCore/html/HTMLTableSectionElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementcpp">trunk/Source/WebCore/html/HTMLTextAreaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextAreaElementh">trunk/Source/WebCore/html/HTMLTextAreaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLUListElementcpp">trunk/Source/WebCore/html/HTMLUListElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLUListElementh">trunk/Source/WebCore/html/HTMLUListElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementcpp">trunk/Source/WebCore/html/HTMLVideoElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementh">trunk/Source/WebCore/html/HTMLVideoElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasStylecpp">trunk/Source/WebCore/html/canvas/CanvasStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementTypescpp">trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMeterShadowElementcpp">trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementcpp">trunk/Source/WebCore/mathml/MathMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementh">trunk/Source/WebCore/mathml/MathMLElement.h</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEditorClienth">trunk/Source/WebCore/page/EditorClient.h</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializercpp">trunk/Source/WebCore/page/PageSerializer.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializerh">trunk/Source/WebCore/page/PageSerializer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/RenderTreeAsText.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimateElementcpp">trunk/Source/WebCore/svg/SVGAnimateElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementRareDatah">trunk/Source/WebCore/svg/SVGElementRareData.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontFaceElementcpp">trunk/Source/WebCore/svg/SVGFontFaceElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGImageElementcpp">trunk/Source/WebCore/svg/SVGImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGImageElementh">trunk/Source/WebCore/svg/SVGImageElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTextContentElementcpp">trunk/Source/WebCore/svg/SVGTextContentElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTextContentElementh">trunk/Source/WebCore/svg/SVGTextContentElement.h</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportEditorClientEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportEditorClientEflh">trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportEditorClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportEditorClientGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebEditorClienth">trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeeflEditingCallbackscpp">trunk/Tools/DumpRenderTree/efl/EditingCallbacks.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiesh">trunk/Source/WebCore/css/StyleProperties.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssStylePropertySetcpp">trunk/Source/WebCore/css/StylePropertySet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertySeth">trunk/Source/WebCore/css/StylePropertySet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -1087,7 +1087,7 @@
</span><span class="cx"> css/SelectorFilter.cpp
</span><span class="cx"> css/StyleInvalidationAnalysis.cpp
</span><span class="cx"> css/StyleMedia.cpp
</span><del>- css/StylePropertySet.cpp
</del><ins>+ css/StyleProperties.cpp
</ins><span class="cx"> css/StylePropertyShorthand.cpp
</span><span class="cx"> css/StyleResolver.cpp
</span><span class="cx"> css/StyleRule.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/ChangeLog 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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.
+
</ins><span class="cx"> 2013-11-28 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Nix Upstream: Adding EditorNix to WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -2674,8 +2674,8 @@
</span><span class="cx"> Source/WebCore/css/StyleInvalidationAnalysis.h \
</span><span class="cx"> Source/WebCore/css/StyleMedia.cpp \
</span><span class="cx"> Source/WebCore/css/StyleMedia.h \
</span><del>- Source/WebCore/css/StylePropertySet.cpp \
- Source/WebCore/css/StylePropertySet.h \
</del><ins>+ Source/WebCore/css/StyleProperties.cpp \
+ Source/WebCore/css/StyleProperties.h \
</ins><span class="cx"> Source/WebCore/css/StylePropertyShorthand.cpp \
</span><span class="cx"> Source/WebCore/css/StylePropertyShorthand.h \
</span><span class="cx"> Source/WebCore/css/StyleResolver.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -823,6 +823,8 @@
</span><span class="cx"> __ZN7WebCore21setPlatformStrategiesEPNS_18PlatformStrategiesE
</span><span class="cx"> __ZN7WebCore22HTMLPlugInImageElement24restartSnapshottedPlugInEv
</span><span class="cx"> __ZN7WebCore22HTMLPlugInImageElement29setIsPrimarySnapshottedPlugInEb
</span><ins>+__ZN7WebCore22MutableStyleProperties25ensureCSSStyleDeclarationEv
+__ZN7WebCore22MutableStylePropertiesD1Ev
</ins><span class="cx"> __ZN7WebCore22RuntimeEnabledFeatures14sharedFeaturesEv
</span><span class="cx"> __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
</span><span class="cx"> __ZN7WebCore22ScriptExecutionContext2vmEv
</span><span class="lines">@@ -847,8 +849,6 @@
</span><span class="cx"> __ZN7WebCore23ApplicationCacheStorage5emptyEv
</span><span class="cx"> __ZN7WebCore23AuthenticationChallenge23setAuthenticationClientEPNS_20AuthenticationClientE
</span><span class="cx"> __ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorE
</span><del>-__ZN7WebCore23MutableStylePropertySet25ensureCSSStyleDeclarationEv
-__ZN7WebCore23MutableStylePropertySetD1Ev
</del><span class="cx"> __ZN7WebCore23SynchronousLoaderClient24platformBadResponseErrorEv
</span><span class="cx"> __ZN7WebCore23dataForURLComponentTypeEP5NSURLl
</span><span class="cx"> __ZN7WebCore23decodeHostNameWithRangeEP8NSString8_NSRange
</span><span class="lines">@@ -865,6 +865,7 @@
</span><span class="cx"> __ZN7WebCore24FrameDestructionObserver14willDetachPageEv
</span><span class="cx"> __ZN7WebCore24FrameDestructionObserverC2EPNS_5FrameE
</span><span class="cx"> __ZN7WebCore24FrameDestructionObserverD2Ev
</span><ins>+__ZN7WebCore24ImmutableStylePropertiesD1Ev
</ins><span class="cx"> __ZN7WebCore24ReferenceFilterOperationC1ERKN3WTF6StringES4_NS_15FilterOperation13OperationTypeE
</span><span class="cx"> __ZN7WebCore24createFragmentFromMarkupERNS_8DocumentERKN3WTF6StringES5_NS_19ParserContentPolicyE
</span><span class="cx"> __ZN7WebCore24decodeURLEscapeSequencesERKN3WTF6StringE
</span><span class="lines">@@ -872,7 +873,6 @@
</span><span class="cx"> __ZN7WebCore24fileSystemRepresentationERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore24notifyHistoryItemChangedE
</span><span class="cx"> __ZN7WebCore24pathByAppendingComponentERKN3WTF6StringES3_
</span><del>-__ZN7WebCore25ImmutableStylePropertySetD1Ev
</del><span class="cx"> __ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
</span><span class="cx"> __ZN7WebCore25computeViewportAttributesENS_17ViewportArgumentsEiiifNS_7IntSizeE
</span><span class="cx"> __ZN7WebCore25createCanonicalUUIDStringEv
</span><span class="lines">@@ -1027,7 +1027,7 @@
</span><span class="cx"> __ZN7WebCore5RangeD1Ev
</span><span class="cx"> __ZN7WebCore6Chrome16setStatusbarTextEPNS_5FrameERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore6Chrome5printEPNS_5FrameE
</span><del>-__ZN7WebCore6Editor10applyStyleEPNS_16StylePropertySetENS_10EditActionE
</del><ins>+__ZN7WebCore6Editor10applyStyleEPNS_15StylePropertiesENS_10EditActionE
</ins><span class="cx"> __ZN7WebCore6Editor10findStringERKN3WTF6StringEj
</span><span class="cx"> __ZN7WebCore6Editor10insertTextERKN3WTF6StringEPNS_5EventE
</span><span class="cx"> __ZN7WebCore6Editor13performDeleteEv
</span><span class="lines">@@ -1044,9 +1044,9 @@
</span><span class="cx"> __ZN7WebCore6Editor19countMatchesForTextERKN3WTF6StringEPNS_5RangeEjjbPNS1_6VectorINS1_6RefPtrIS5_EELm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore6Editor19deleteWithDirectionENS_18SelectionDirectionENS_15TextGranularityEbb
</span><span class="cx"> __ZN7WebCore6Editor19insertUnorderedListEv
</span><del>-__ZN7WebCore6Editor21applyStyleToSelectionEPNS_16StylePropertySetENS_10EditActionE
</del><ins>+__ZN7WebCore6Editor21applyStyleToSelectionEPNS_15StylePropertiesENS_10EditActionE
</ins><span class="cx"> __ZN7WebCore6Editor23setBaseWritingDirectionE16WritingDirection
</span><del>-__ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_16StylePropertySetENS_10EditActionE
</del><ins>+__ZN7WebCore6Editor24computeAndSetTypingStyleEPNS_15StylePropertiesENS_10EditActionE
</ins><span class="cx"> __ZN7WebCore6Editor24isSelectionUngrammaticalEv
</span><span class="cx"> __ZN7WebCore6Editor24replaceSelectionWithTextERKN3WTF6StringEbb
</span><span class="cx"> __ZN7WebCore6Editor26decreaseSelectionListLevelEv
</span><span class="lines">@@ -1555,6 +1555,7 @@
</span><span class="cx"> __ZNK7WebCore15ProtectionSpace7isProxyEv
</span><span class="cx"> __ZNK7WebCore15ResourceRequest12cfURLRequestENS_20HTTPBodyUpdatePolicyE
</span><span class="cx"> __ZNK7WebCore15ResourceRequest12nsURLRequestENS_20HTTPBodyUpdatePolicyE
</span><ins>+__ZNK7WebCore15StyleProperties11mutableCopyEv
</ins><span class="cx"> __ZNK7WebCore15VisiblePosition14characterAfterEv
</span><span class="cx"> __ZNK7WebCore15VisiblePosition14localCaretRectERPNS_12RenderObjectE
</span><span class="cx"> __ZNK7WebCore15VisiblePosition19absoluteCaretBoundsEv
</span><span class="lines">@@ -1570,7 +1571,6 @@
</span><span class="cx"> __ZNK7WebCore16IconDatabaseBase12databasePathEv
</span><span class="cx"> __ZNK7WebCore16ResourceResponse13nsURLResponseEv
</span><span class="cx"> __ZNK7WebCore16ResourceResponse16certificateChainEv
</span><del>-__ZNK7WebCore16StylePropertySet11mutableCopyEv
</del><span class="cx"> __ZNK7WebCore16VisibleSelection17isContentEditableEv
</span><span class="cx"> __ZNK7WebCore16VisibleSelection17toNormalizedRangeEv
</span><span class="cx"> __ZNK7WebCore16VisibleSelection19rootEditableElementEv
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -9409,7 +9409,7 @@
</span><span class="cx"> <ClCompile Include="..\css\SelectorChecker.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\StyleInvalidationAnalysis.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\StyleMedia.cpp" />
</span><del>- <ClCompile Include="..\css\StylePropertySet.cpp">
</del><ins>+ <ClCompile Include="..\css\StyleProperties.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19784,7 +19784,7 @@
</span><span class="cx"> <ClInclude Include="..\css\SelectorChecker.h" />
</span><span class="cx"> <ClInclude Include="..\css\StyleInvalidationAnalysis.h" />
</span><span class="cx"> <ClInclude Include="..\css\StyleMedia.h" />
</span><del>- <ClInclude Include="..\css\StylePropertySet.h" />
</del><ins>+ <ClInclude Include="..\css\StyleProperties.h" />
</ins><span class="cx"> <ClInclude Include="..\css\StylePropertyShorthand.h" />
</span><span class="cx"> <ClInclude Include="..\css\StyleResolver.h" />
</span><span class="cx"> <ClInclude Include="..\css\StyleRule.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -183,6 +183,8 @@
</span><span class="cx"> 076970861463AD8700F502CF /* TextTrackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 076970841463AD8700F502CF /* TextTrackList.cpp */; };
</span><span class="cx"> 076970871463AD8700F502CF /* TextTrackList.h in Headers */ = {isa = PBXBuildFile; fileRef = 076970851463AD8700F502CF /* TextTrackList.h */; };
</span><span class="cx"> 076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */; };
</span><ins>+ 077664FC183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */; };
+ 077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */; };
</ins><span class="cx"> 0779BF0D18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0779BF0A18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp */; };
</span><span class="cx"> 0779BF0E18453168000B6AE7 /* HTMLMediaElementMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */; };
</span><span class="cx"> 0783228418013ED800999E0C /* MediaStreamAudioSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */; };
</span><span class="lines">@@ -190,8 +192,6 @@
</span><span class="cx"> 07846342145B151A00A58DF1 /* JSTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07846340145B151A00A58DF1 /* JSTrackEvent.cpp */; };
</span><span class="cx"> 07846343145B151A00A58DF1 /* JSTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07846341145B151A00A58DF1 /* JSTrackEvent.h */; };
</span><span class="cx"> 07846385145B1B8E00A58DF1 /* JSTrackCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 07846384145B1B8E00A58DF1 /* JSTrackCustom.h */; };
</span><del>- 077664FC183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */; };
- 077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 077664FB183E6B5C00133B92 /* JSQuickTimePluginReplacement.h */; };
</del><span class="cx"> 078E08FE17D14CEE00420AA1 /* MediaConstraintsImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B4A17CEC32700848E51 /* MediaConstraintsImpl.cpp */; };
</span><span class="cx"> 078E08FF17D14CEE00420AA1 /* MediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B4C17CEC32700848E51 /* MediaStream.cpp */; };
</span><span class="cx"> 078E090017D14CEE00420AA1 /* MediaStreamEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B4F17CEC32700848E51 /* MediaStreamEvent.cpp */; };
</span><span class="lines">@@ -3653,8 +3653,8 @@
</span><span class="cx"> A80E6D0B0A1989CA007FB8C5 /* DashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */; };
</span><span class="cx"> A80E6D0C0A1989CA007FB8C5 /* CSSStyleRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE20A1989CA007FB8C5 /* CSSStyleRule.h */; };
</span><span class="cx"> A80E6D0D0A1989CA007FB8C5 /* CSSRule.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6CE30A1989CA007FB8C5 /* CSSRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 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, ); }; };
</del><ins>+ 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, ); }; };
</ins><span class="cx"> A80E6E0F0A19911C007FB8C5 /* CSSStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E6E0D0A19911C007FB8C5 /* CSSStyleDeclaration.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A80E734F0A199C77007FB8C5 /* CSSSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A80E73480A199C77007FB8C5 /* CSSSelector.cpp */; };
</span><span class="cx"> A80E73520A199C77007FB8C5 /* CSSSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A80E734B0A199C77007FB8C5 /* CSSSelector.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -6807,13 +6807,13 @@
</span><span class="cx"> 076970851463AD8700F502CF /* TextTrackList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackList.h; sourceTree = "<group>"; };
</span><span class="cx"> 076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateAVFoundation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundation.h; sourceTree = "<group>"; };
</span><ins>+ 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>"; };
</ins><span class="cx"> 0779BF0A18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaElementMediaStream.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaElementMediaStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 0779BF0C18453168000B6AE7 /* HTMLMediaElementMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMediaElementMediaStream.idl; sourceTree = "<group>"; };
</span><span class="cx"> 0783228218013ED700999E0C /* MediaStreamAudioSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamAudioSource.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0783228318013ED800999E0C /* MediaStreamAudioSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamAudioSource.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> 07846340145B151A00A58DF1 /* JSTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07846341145B151A00A58DF1 /* JSTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTrackEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 07846384145B1B8E00A58DF1 /* JSTrackCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTrackCustom.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10468,8 +10468,8 @@
</span><span class="cx"> A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DashboardRegion.h; sourceTree = "<group>"; };
</span><span class="cx"> A80E6CE20A1989CA007FB8C5 /* CSSStyleRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSStyleRule.h; sourceTree = "<group>"; };
</span><span class="cx"> A80E6CE30A1989CA007FB8C5 /* CSSRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSRule.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><ins>+ 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>"; };
</ins><span class="cx"> A80E6E0D0A19911C007FB8C5 /* CSSStyleDeclaration.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSStyleDeclaration.h; sourceTree = "<group>"; };
</span><span class="cx"> A80E73480A199C77007FB8C5 /* CSSSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSSelector.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A80E734B0A199C77007FB8C5 /* CSSSelector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSSelector.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -20886,8 +20886,8 @@
</span><span class="cx"> 0FF5026E102BA9660066F39A /* StyleMedia.cpp */,
</span><span class="cx"> 0FF5026F102BA96A0066F39A /* StyleMedia.h */,
</span><span class="cx"> 0FF50270102BA96A0066F39A /* StyleMedia.idl */,
</span><del>- A80E6DF90A199067007FB8C5 /* StylePropertySet.cpp */,
- A80E6DFA0A199067007FB8C5 /* StylePropertySet.h */,
</del><ins>+ A80E6DF90A199067007FB8C5 /* StyleProperties.cpp */,
+ A80E6DFA0A199067007FB8C5 /* StyleProperties.h */,
</ins><span class="cx"> E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */,
</span><span class="cx"> E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */,
</span><span class="cx"> E139866115478474001E3F65 /* StyleResolver.cpp */,
</span><span class="lines">@@ -24634,7 +24634,7 @@
</span><span class="cx"> 51D719F6181106E00016DC51 /* IDBVersionChangeEvent.h in Headers */,
</span><span class="cx"> 0FF50272102BA96A0066F39A /* StyleMedia.h in Headers */,
</span><span class="cx"> BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */,
</span><del>- A80E6DFC0A199067007FB8C5 /* StylePropertySet.h in Headers */,
</del><ins>+ A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */,
</ins><span class="cx"> E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */,
</span><span class="cx"> BC2272E40E82EE9B00E7F975 /* StyleRareInheritedData.h in Headers */,
</span><span class="cx"> BC2272BD0E82EAAE00E7F975 /* StyleRareNonInheritedData.h in Headers */,
</span><span class="lines">@@ -27849,7 +27849,7 @@
</span><span class="cx"> BC5EB7290E81DE8100B25965 /* StyleMarqueeData.cpp in Sources */,
</span><span class="cx"> 0FF50271102BA96A0066F39A /* StyleMedia.cpp in Sources */,
</span><span class="cx"> BC5EB74D0E81E06700B25965 /* StyleMultiColData.cpp in Sources */,
</span><del>- A80E6DFB0A199067007FB8C5 /* StylePropertySet.cpp in Sources */,
</del><ins>+ A80E6DFB0A199067007FB8C5 /* StyleProperties.cpp in Sources */,
</ins><span class="cx"> E1B25106152A0BAF0069B779 /* StylePropertyShorthand.cpp in Sources */,
</span><span class="cx"> BC2272E30E82EE9B00E7F975 /* StyleRareInheritedData.cpp in Sources */,
</span><span class="cx"> BC2272BC0E82EAAE00E7F975 /* StyleRareNonInheritedData.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include <runtime/StringPrototype.h>
</span><span class="cx"> #include <wtf/ASCIICType.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorCPPpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $implIncludes{"Node.h"} = 1 if $type eq "NodeList";
</span><del>- $implIncludes{"StylePropertySet.h"} = 1 if $type eq "CSSStyleDeclaration";
</del><ins>+ $implIncludes{"StyleProperties.h"} = 1 if $type eq "CSSStyleDeclaration";
</ins><span class="cx">
</span><span class="cx"> # Default, include the same named file (the implementation) and the same name prefixed with "WebDOM".
</span><span class="cx"> $implIncludes{"$type.h"} = 1 unless $type eq "any";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -3478,7 +3478,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($type eq "CSSStyleDeclaration") {
</span><del>- AddToImplIncludes("StylePropertySet.h", $conditional);
</del><ins>+ AddToImplIncludes("StyleProperties.h", $conditional);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($type eq "NodeList") {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: won't compile without these
</span><span class="cx"> $implIncludes{"CSSImportRule.h"} = 1 if $type eq "CSSRule";
</span><del>- $implIncludes{"StylePropertySet.h"} = 1 if $type eq "CSSStyleDeclaration";
</del><ins>+ $implIncludes{"StyleProperties.h"} = 1 if $type eq "CSSStyleDeclaration";
</ins><span class="cx"> $implIncludes{"NameNodeList.h"} = 1 if $type eq "NodeList";
</span><span class="cx">
</span><span class="cx"> # Default, include the same named file (the implementation) and the same name prefixed with "DOM".
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSAllInOne.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSAllInOne.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSAllInOne.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> #include "RuleSet.cpp"
</span><span class="cx"> #include "SelectorCheckerFastPath.cpp"
</span><span class="cx"> #include "SelectorFilter.cpp"
</span><del>-#include "StylePropertySet.cpp"
</del><ins>+#include "StyleProperties.cpp"
</ins><span class="cx"> #include "StylePropertyShorthand.cpp"
</span><span class="cx"> #include "StyleResolver.cpp"
</span><span class="cx"> #include "StyleScopeResolver.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="lines">@@ -1709,7 +1709,7 @@
</span><span class="cx"> return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).propertyValue(propertyID, updateLayout);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties() const
</del><ins>+PassRef<MutableStyleProperties> CSSComputedStyleDeclaration::copyProperties() const
</ins><span class="cx"> {
</span><span class="cx"> return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).copyProperties();
</span><span class="cx"> }
</span><span class="lines">@@ -3180,7 +3180,7 @@
</span><span class="cx"> return computedValue && value && computedValue->equals(*value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<MutableStylePropertySet> ComputedStyleExtractor::copyProperties() const
</del><ins>+PassRef<MutableStyleProperties> ComputedStyleExtractor::copyProperties() const
</ins><span class="cx"> {
</span><span class="cx"> return copyPropertiesInSet(computedProperties, numComputedProperties);
</span><span class="cx"> }
</span><span class="lines">@@ -3233,7 +3233,7 @@
</span><span class="cx"> return list.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<MutableStylePropertySet> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
</del><ins>+PassRef<MutableStyleProperties> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
</ins><span class="cx"> {
</span><span class="cx"> Vector<CSSProperty, 256> list;
</span><span class="cx"> list.reserveInitialCapacity(length);
</span><span class="lines">@@ -3242,7 +3242,7 @@
</span><span class="cx"> if (value)
</span><span class="cx"> list.append(CSSProperty(set[i], value.release(), false));
</span><span class="cx"> }
</span><del>- return MutableStylePropertySet::create(list.data(), list.size());
</del><ins>+ return MutableStyleProperties::create(list.data(), list.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSRule* CSSComputedStyleDeclaration::parentRule() const
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx"> class CSSValueList;
</span><span class="cx"> class Color;
</span><span class="cx"> class FilterOperations;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx"> class Node;
</span><span class="cx"> class RenderObject;
</span><span class="cx"> class RenderStyle;
</span><span class="cx"> class SVGPaint;
</span><span class="cx"> class ShadowData;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx"> class StylePropertyShorthand;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> PassRefPtr<CSSValue> propertyValue(CSSPropertyID, EUpdateLayout = UpdateLayout) const;
</span><span class="cx">
</span><span class="cx"> // Helper methods for HTML editing.
</span><del>- PassRef<MutableStylePropertySet> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
- PassRef<MutableStylePropertySet> copyProperties() const;
</del><ins>+ PassRef<MutableStyleProperties> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
+ PassRef<MutableStyleProperties> copyProperties() const;
</ins><span class="cx"> PassRefPtr<CSSPrimitiveValue> getFontSizeCSSValuePreferringKeyword() const;
</span><span class="cx"> bool useFixedFontDefaultSize() const;
</span><span class="cx"> bool propertyMatches(CSSPropertyID, const CSSValue*) const;
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> virtual PassRefPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) OVERRIDE;
</span><span class="cx"> virtual String getPropertyValueInternal(CSSPropertyID) OVERRIDE;
</span><span class="cx"> virtual void setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) OVERRIDE;
</span><del>- virtual PassRef<MutableStylePropertySet> copyProperties() const OVERRIDE;
</del><ins>+ virtual PassRef<MutableStyleProperties> copyProperties() const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID, EUpdateLayout = UpdateLayout) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx">
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SimpleFontData.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "WebKitFontFamilyNames.h"
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule)
</span><span class="cx"> {
</span><span class="cx"> // Obtain the font-family property and the src property. Both must be defined.
</span><del>- const StylePropertySet& style = fontFaceRule->properties();
</del><ins>+ const StyleProperties& style = fontFaceRule->properties();
</ins><span class="cx"> RefPtr<CSSValue> fontFamily = style.getPropertyCSSValue(CSSPropertyFontFamily);
</span><span class="cx"> RefPtr<CSSValue> src = style.getPropertyCSSValue(CSSPropertySrc);
</span><span class="cx"> RefPtr<CSSValue> unicodeRange = style.getPropertyCSSValue(CSSPropertyUnicodeRange);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPageRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPageRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPageRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSPageRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "SVGParserUtilities.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleRuleImport.h"
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool parseColorValue(MutableStylePropertySet* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
</del><ins>+static bool parseColorValue(MutableStyleProperties* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!string.isEmpty());
</span><span class="cx"> bool strict = isStrictParserMode(cssParserMode);
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> return ok;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool parseSimpleLengthValue(MutableStylePropertySet* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
</del><ins>+static bool parseSimpleLengthValue(MutableStyleProperties* declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!string.isEmpty());
</span><span class="cx"> bool acceptsNegativeNumbers;
</span><span class="lines">@@ -1170,7 +1170,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool parseKeywordValue(MutableStylePropertySet* declaration, CSSPropertyID propertyId, const String& string, bool important, const CSSParserContext& parserContext)
</del><ins>+static bool parseKeywordValue(MutableStyleProperties* declaration, CSSPropertyID propertyId, const String& string, bool important, const CSSParserContext& parserContext)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!string.isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool parseTranslateTransformValue(MutableStylePropertySet* properties, CSSPropertyID propertyID, const String& string, bool important)
</del><ins>+static bool parseTranslateTransformValue(MutableStyleProperties* properties, CSSPropertyID propertyID, const String& string, bool important)
</ins><span class="cx"> {
</span><span class="cx"> if (propertyID != CSSPropertyWebkitTransform)
</span><span class="cx"> return false;
</span><span class="lines">@@ -1278,7 +1278,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (string.isEmpty())
</span><span class="cx"> return 0;
</span><del>- RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> dummyStyle = MutableStyleProperties::create();
</ins><span class="cx"> if (!parseValue(dummyStyle.get(), CSSPropertyFontFamily, string, false, CSSQuirksMode, 0))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -1288,7 +1288,7 @@
</span><span class="cx"> return static_pointer_cast<CSSValueList>(fontFamily.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
</del><ins>+bool CSSParser::parseValue(MutableStyleProperties* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!string.isEmpty());
</span><span class="cx"> if (parseSimpleLengthValue(declaration, propertyID, string, important, cssParserMode))
</span><span class="lines">@@ -1311,7 +1311,7 @@
</span><span class="cx"> return parser.parseValue(declaration, propertyID, string, important, contextStyleSheet);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, StyleSheetContents* contextStyleSheet)
</del><ins>+bool CSSParser::parseValue(MutableStyleProperties* declaration, CSSPropertyID propertyID, const String& string, bool important, StyleSheetContents* contextStyleSheet)
</ins><span class="cx"> {
</span><span class="cx"> setStyleSheet(contextStyleSheet);
</span><span class="cx">
</span><span class="lines">@@ -1397,14 +1397,14 @@
</span><span class="cx"> m_selectorListForParseSelector = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<ImmutableStylePropertySet> CSSParser::parseInlineStyleDeclaration(const String& string, Element* element)
</del><ins>+PassRef<ImmutableStyleProperties> CSSParser::parseInlineStyleDeclaration(const String& string, Element* element)
</ins><span class="cx"> {
</span><span class="cx"> CSSParserContext context = element->document().elementSheet().contents().parserContext();
</span><span class="cx"> context.mode = strictToCSSParserMode(element->isHTMLElement() && !element->document().inQuirksMode());
</span><span class="cx"> return CSSParser(context).parseDeclaration(string, &element->document().elementSheet().contents());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<ImmutableStylePropertySet> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
</del><ins>+PassRef<ImmutableStyleProperties> CSSParser::parseDeclaration(const String& string, StyleSheetContents* contextStyleSheet)
</ins><span class="cx"> {
</span><span class="cx"> setStyleSheet(contextStyleSheet);
</span><span class="cx">
</span><span class="lines">@@ -1415,13 +1415,13 @@
</span><span class="cx"> if (m_hasFontFaceOnlyValues)
</span><span class="cx"> deleteFontFaceOnlyValues();
</span><span class="cx">
</span><del>- PassRef<ImmutableStylePropertySet> style = createStylePropertySet();
</del><ins>+ PassRef<ImmutableStyleProperties> style = createStyleProperties();
</ins><span class="cx"> clearProperties();
</span><span class="cx"> return style;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-bool CSSParser::parseDeclaration(MutableStylePropertySet* declaration, const String& string, PassRefPtr<CSSRuleSourceData> prpRuleSourceData, StyleSheetContents* contextStyleSheet)
</del><ins>+bool CSSParser::parseDeclaration(MutableStyleProperties* declaration, const String& string, PassRefPtr<CSSRuleSourceData> prpRuleSourceData, StyleSheetContents* contextStyleSheet)
</ins><span class="cx"> {
</span><span class="cx"> // Length of the "@-webkit-decls{" prefix.
</span><span class="cx"> static const unsigned prefixLength = 15;
</span><span class="lines">@@ -1494,7 +1494,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<ImmutableStylePropertySet> CSSParser::createStylePropertySet()
</del><ins>+PassRef<ImmutableStyleProperties> CSSParser::createStyleProperties()
</ins><span class="cx"> {
</span><span class="cx"> BitArray<numCSSProperties> seenProperties;
</span><span class="cx"> size_t unusedEntries = m_parsedProperties.size();
</span><span class="lines">@@ -1506,7 +1506,7 @@
</span><span class="cx"> if (unusedEntries)
</span><span class="cx"> results.remove(0, unusedEntries);
</span><span class="cx">
</span><del>- return ImmutableStylePropertySet::create(results.data(), results.size(), m_context.mode);
</del><ins>+ return ImmutableStyleProperties::create(results.data(), results.size(), m_context.mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSParser::addPropertyWithPrefixingVariant(CSSPropertyID propId, PassRefPtr<CSSValue> value, bool important, bool implicit)
</span><span class="lines">@@ -9485,7 +9485,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleRuleBase> CSSParser::createFilterRule(const CSSParserString& filterName)
</span><span class="cx"> {
</span><del>- RefPtr<StyleRuleFilter> rule = StyleRuleFilter::create(filterName, createStylePropertySet());
</del><ins>+ RefPtr<StyleRuleFilter> rule = StyleRuleFilter::create(filterName, createStyleProperties());
</ins><span class="cx"> clearProperties();
</span><span class="cx"> processAndAddNewRuleToSourceTreeIfNeeded();
</span><span class="cx"> return rule.release();
</span><span class="lines">@@ -11902,7 +11902,7 @@
</span><span class="cx"> m_allowNamespaceDeclarations = false;
</span><span class="cx"> if (m_hasFontFaceOnlyValues)
</span><span class="cx"> deleteFontFaceOnlyValues();
</span><del>- rule = StyleRule::create(m_lastSelectorLineNumber, createStylePropertySet());
</del><ins>+ rule = StyleRule::create(m_lastSelectorLineNumber, createStyleProperties());
</ins><span class="cx"> rule->parserAdoptSelectorVector(*selectors);
</span><span class="cx"> processAndAddNewRuleToSourceTreeIfNeeded();
</span><span class="cx"> } else
</span><span class="lines">@@ -11928,7 +11928,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- RefPtr<StyleRuleFontFace> rule = StyleRuleFontFace::create(createStylePropertySet());
</del><ins>+ RefPtr<StyleRuleFontFace> rule = StyleRuleFontFace::create(createStyleProperties());
</ins><span class="cx"> clearProperties();
</span><span class="cx"> processAndAddNewRuleToSourceTreeIfNeeded();
</span><span class="cx"> return rule.release();
</span><span class="lines">@@ -12034,7 +12034,7 @@
</span><span class="cx"> m_allowImportRules = m_allowNamespaceDeclarations = false;
</span><span class="cx"> RefPtr<StyleRulePage> rule;
</span><span class="cx"> if (pageSelector) {
</span><del>- rule = StyleRulePage::create(createStylePropertySet());
</del><ins>+ rule = StyleRulePage::create(createStyleProperties());
</ins><span class="cx"> Vector<OwnPtr<CSSParserSelector>> selectorVector;
</span><span class="cx"> selectorVector.append(pageSelector);
</span><span class="cx"> rule->parserAdoptSelectorVector(selectorVector);
</span><span class="lines">@@ -12139,7 +12139,7 @@
</span><span class="cx"> keyString.append('%');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<StyleKeyframe> keyframe = StyleKeyframe::create(createStylePropertySet());
</del><ins>+ RefPtr<StyleKeyframe> keyframe = StyleKeyframe::create(createStyleProperties());
</ins><span class="cx"> keyframe->setKeyText(keyString.toString());
</span><span class="cx">
</span><span class="cx"> clearProperties();
</span><span class="lines">@@ -12356,7 +12356,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_allowImportRules = m_allowNamespaceDeclarations = false;
</span><span class="cx">
</span><del>- RefPtr<StyleRuleViewport> rule = StyleRuleViewport::create(createStylePropertySet());
</del><ins>+ RefPtr<StyleRuleViewport> rule = StyleRuleViewport::create(createStyleProperties());
</ins><span class="cx"> clearProperties();
</span><span class="cx">
</span><span class="cx"> processAndAddNewRuleToSourceTreeIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSParser.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,10 +54,10 @@
</span><span class="cx"> class CSSBasicShape;
</span><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span><del>-class ImmutableStylePropertySet;
</del><ins>+class ImmutableStyleProperties;
</ins><span class="cx"> class MediaQueryExp;
</span><span class="cx"> class MediaQuerySet;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx"> class StyleKeyframe;
</span><span class="cx"> class StylePropertyShorthand;
</span><span class="cx"> class StyleRuleBase;
</span><span class="lines">@@ -93,13 +93,13 @@
</span><span class="cx"> #if ENABLE(CSS3_CONDITIONAL_RULES)
</span><span class="cx"> bool parseSupportsCondition(const String&);
</span><span class="cx"> #endif
</span><del>- static bool parseValue(MutableStylePropertySet*, CSSPropertyID, const String&, bool important, CSSParserMode, StyleSheetContents*);
</del><ins>+ static bool parseValue(MutableStyleProperties*, CSSPropertyID, const String&, bool important, CSSParserMode, StyleSheetContents*);
</ins><span class="cx"> static bool parseColor(RGBA32& color, const String&, bool strict = false);
</span><span class="cx"> static bool parseSystemColor(RGBA32& color, const String&, Document*);
</span><span class="cx"> static PassRefPtr<CSSValueList> parseFontFaceValue(const AtomicString&);
</span><span class="cx"> PassRefPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*);
</span><del>- bool parseDeclaration(MutableStylePropertySet*, const String&, PassRefPtr<CSSRuleSourceData>, StyleSheetContents* contextStyleSheet);
- static PassRef<ImmutableStylePropertySet> parseInlineStyleDeclaration(const String&, Element*);
</del><ins>+ bool parseDeclaration(MutableStyleProperties*, const String&, PassRefPtr<CSSRuleSourceData>, StyleSheetContents* contextStyleSheet);
+ static PassRef<ImmutableStyleProperties> parseInlineStyleDeclaration(const String&, Element*);
</ins><span class="cx"> PassOwnPtr<MediaQuery> parseMediaQuery(const String&);
</span><span class="cx">
</span><span class="cx"> void addPropertyWithPrefixingVariant(CSSPropertyID, PassRefPtr<CSSValue>, bool important, bool implicit = false);
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">
</span><span class="cx"> void clearProperties();
</span><span class="cx">
</span><del>- PassRef<ImmutableStylePropertySet> createStylePropertySet();
</del><ins>+ PassRef<ImmutableStyleProperties> createStyleProperties();
</ins><span class="cx">
</span><span class="cx"> CSSParserContext m_context;
</span><span class="cx">
</span><span class="lines">@@ -526,8 +526,8 @@
</span><span class="cx"> bool isGeneratedImageValue(CSSParserValue*) const;
</span><span class="cx"> bool parseGeneratedImage(CSSParserValueList*, RefPtr<CSSValue>&);
</span><span class="cx">
</span><del>- bool parseValue(MutableStylePropertySet*, CSSPropertyID, const String&, bool important, StyleSheetContents* contextStyleSheet);
- PassRef<ImmutableStylePropertySet> parseDeclaration(const String&, StyleSheetContents* contextStyleSheet);
</del><ins>+ bool parseValue(MutableStyleProperties*, CSSPropertyID, const String&, bool important, StyleSheetContents* contextStyleSheet);
+ PassRef<ImmutableStyleProperties> parseDeclaration(const String&, StyleSheetContents* contextStyleSheet);
</ins><span class="cx">
</span><span class="cx"> enum SizeParameterType {
</span><span class="cx"> None,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleDeclaration.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleDeclaration.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSStyleDeclaration.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> class CSSRule;
</span><span class="cx"> class CSSStyleSheet;
</span><span class="cx"> class CSSValue;
</span><del>-class MutableStylePropertySet;
-class StylePropertySet;
</del><ins>+class MutableStyleProperties;
+class StyleProperties;
</ins><span class="cx"> class StyledElement;
</span><span class="cx">
</span><span class="cx"> typedef int ExceptionCode;
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> virtual String getPropertyValueInternal(CSSPropertyID) = 0;
</span><span class="cx"> virtual void setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) = 0;
</span><span class="cx">
</span><del>- virtual PassRef<MutableStylePropertySet> copyProperties() const = 0;
</del><ins>+ virtual PassRef<MutableStyleProperties> copyProperties() const = 0;
</ins><span class="cx">
</span><span class="cx"> virtual CSSStyleSheet* parentStyleSheet() const { return 0; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/CSSStyleRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><span class="cx"> #include "RuleSet.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssDOMWindowCSScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMWindowCSS.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMWindowCSS.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/DOMWindowCSS.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #if ENABLE(CSS3_CONDITIONAL_RULES)
</span><span class="cx">
</span><span class="cx"> #include "CSSParser.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> if (normalizedValue.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> dummyStyle = MutableStyleProperties::create();
</ins><span class="cx"> return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, CSSStrictMode, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -40,24 +40,24 @@
</span><span class="cx"> #include "RenderRegion.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SelectorCheckerFastPath.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyledElement.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const StylePropertySet& leftToRightDeclaration()
</del><ins>+static const StyleProperties& leftToRightDeclaration()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<Ref<MutableStylePropertySet>> leftToRightDecl(MutableStylePropertySet::create());
</del><ins>+ static NeverDestroyed<Ref<MutableStyleProperties>> leftToRightDecl(MutableStyleProperties::create());
</ins><span class="cx"> if (leftToRightDecl.get()->isEmpty())
</span><span class="cx"> leftToRightDecl.get()->setProperty(CSSPropertyDirection, CSSValueLtr);
</span><span class="cx"> return leftToRightDecl.get().get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const StylePropertySet& rightToLeftDeclaration()
</del><ins>+static const StyleProperties& rightToLeftDeclaration()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<Ref<MutableStylePropertySet>> rightToLeftDecl(MutableStylePropertySet::create());
</del><ins>+ static NeverDestroyed<Ref<MutableStyleProperties>> rightToLeftDecl(MutableStyleProperties::create());
</ins><span class="cx"> if (rightToLeftDecl.get()->isEmpty())
</span><span class="cx"> rightToLeftDecl.get()->setProperty(CSSPropertyDirection, CSSValueRtl);
</span><span class="cx"> return rightToLeftDecl.get().get();
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> m_matchedRules->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void ElementRuleCollector::addElementStyleProperties(const StylePropertySet* propertySet, bool isCacheable)
</del><ins>+inline void ElementRuleCollector::addElementStyleProperties(const StyleProperties* propertySet, bool isCacheable)
</ins><span class="cx"> {
</span><span class="cx"> if (!propertySet)
</span><span class="cx"> return;
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the rule has no properties to apply, then ignore it in the non-debug mode.
</span><del>- const StylePropertySet& properties = rule->properties();
</del><ins>+ const StyleProperties& properties = rule->properties();
</ins><span class="cx"> if (properties.isEmpty() && !matchRequest.includeEmptyRules) {
</span><span class="cx"> if (hasInspectorFrontends)
</span><span class="cx"> InspectorInstrumentation::didMatchRule(cookie, false);
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Document& document() { return m_state.document(); }
</span><del>- void addElementStyleProperties(const StylePropertySet*, bool isCacheable = true);
</del><ins>+ void addElementStyleProperties(const StyleProperties*, bool isCacheable = true);
</ins><span class="cx">
</span><span class="cx"> void matchUARules(RuleSet*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "Dictionary.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "FrameView.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void applyPropertyToCurrentStyle(StyleResolver* styleResolver, CSSPropertyID id, const RefPtr<StylePropertySet>& parsedStyle)
</del><ins>+static void applyPropertyToCurrentStyle(StyleResolver* styleResolver, CSSPropertyID id, const RefPtr<StyleProperties>& parsedStyle)
</ins><span class="cx"> {
</span><span class="cx"> styleResolver->applyPropertyToCurrentStyle(id, parsedStyle->getPropertyCSSValue(id).get());
</span><span class="cx"> }
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> bool FontLoader::resolveFontStyle(const String& fontString, Font& font)
</span><span class="cx"> {
</span><span class="cx"> // Interpret fontString in the same way as the 'font' attribute of CanvasRenderingContext2D.
</span><del>- RefPtr<MutableStylePropertySet> parsedStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> parsedStyle = MutableStyleProperties::create();
</ins><span class="cx"> CSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, fontString, true, CSSStrictMode, 0);
</span><span class="cx"> if (parsedStyle->isEmpty())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorecssPageRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PageRuleCollector.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PageRuleCollector.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/PageRuleCollector.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "PageRuleCollector.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSDefaultStyleSheets.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // If the rule has no properties to apply, then ignore it.
</span><del>- const StylePropertySet& properties = rule->properties();
</del><ins>+ const StyleProperties& properties = rule->properties();
</ins><span class="cx"> if (properties.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "MutationObserverInterestGroup.h"
</span><span class="cx"> #include "MutationRecord.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyledElement.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -288,12 +288,12 @@
</span><span class="cx"> return cssStyleSheet ? &cssStyleSheet->contents() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<MutableStylePropertySet> PropertySetCSSStyleDeclaration::copyProperties() const
</del><ins>+PassRef<MutableStyleProperties> PropertySetCSSStyleDeclaration::copyProperties() const
</ins><span class="cx"> {
</span><span class="cx"> return m_propertySet->mutableCopy();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStylePropertySet& propertySet, CSSRule& parentRule)
</del><ins>+StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStyleProperties& propertySet, CSSRule& parentRule)
</ins><span class="cx"> : PropertySetCSSStyleDeclaration(&propertySet)
</span><span class="cx"> , m_refCount(1)
</span><span class="cx"> , m_parentRule(&parentRule)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> return m_parentRule ? m_parentRule->parentStyleSheet() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleRuleCSSStyleDeclaration::reattach(MutableStylePropertySet& propertySet)
</del><ins>+void StyleRuleCSSStyleDeclaration::reattach(MutableStyleProperties& propertySet)
</ins><span class="cx"> {
</span><span class="cx"> m_propertySet->deref();
</span><span class="cx"> m_propertySet = &propertySet;
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> class CSSRule;
</span><span class="cx"> class CSSProperty;
</span><span class="cx"> class CSSValue;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx"> class StyleSheetContents;
</span><span class="cx"> class StyledElement;
</span><span class="cx">
</span><span class="cx"> class PropertySetCSSStyleDeclaration : public CSSStyleDeclaration {
</span><span class="cx"> public:
</span><del>- PropertySetCSSStyleDeclaration(MutableStylePropertySet* propertySet) : m_propertySet(propertySet) { }
</del><ins>+ PropertySetCSSStyleDeclaration(MutableStyleProperties* propertySet) : m_propertySet(propertySet) { }
</ins><span class="cx">
</span><span class="cx"> virtual StyledElement* parentElement() const { return 0; }
</span><span class="cx"> virtual void clearParentElement() { ASSERT_NOT_REACHED(); }
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> virtual String getPropertyValueInternal(CSSPropertyID) OVERRIDE;
</span><span class="cx"> virtual void setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) OVERRIDE;
</span><span class="cx">
</span><del>- virtual PassRef<MutableStylePropertySet> copyProperties() const OVERRIDE;
</del><ins>+ virtual PassRef<MutableStyleProperties> copyProperties() const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> CSSValue* cloneAndCacheForCSSOM(CSSValue*);
</span><span class="cx">
</span><span class="lines">@@ -77,14 +77,14 @@
</span><span class="cx"> virtual void willMutate() { }
</span><span class="cx"> virtual void didMutate(MutationType) { }
</span><span class="cx">
</span><del>- MutableStylePropertySet* m_propertySet;
</del><ins>+ MutableStyleProperties* m_propertySet;
</ins><span class="cx"> OwnPtr<HashMap<CSSValue*, RefPtr<CSSValue>>> m_cssomCSSValueClones;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StyleRuleCSSStyleDeclaration : public PropertySetCSSStyleDeclaration
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<StyleRuleCSSStyleDeclaration> create(MutableStylePropertySet& propertySet, CSSRule& parentRule)
</del><ins>+ static PassRefPtr<StyleRuleCSSStyleDeclaration> create(MutableStyleProperties& propertySet, CSSRule& parentRule)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new StyleRuleCSSStyleDeclaration(propertySet, parentRule));
</span><span class="cx"> }
</span><span class="lines">@@ -95,10 +95,10 @@
</span><span class="cx"> virtual void ref() OVERRIDE;
</span><span class="cx"> virtual void deref() OVERRIDE;
</span><span class="cx">
</span><del>- void reattach(MutableStylePropertySet&);
</del><ins>+ void reattach(MutableStyleProperties&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- StyleRuleCSSStyleDeclaration(MutableStylePropertySet&, CSSRule&);
</del><ins>+ StyleRuleCSSStyleDeclaration(MutableStyleProperties&, CSSRule&);
</ins><span class="cx">
</span><span class="cx"> virtual CSSStyleSheet* parentStyleSheet() const OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> class InlineCSSStyleDeclaration : public PropertySetCSSStyleDeclaration
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- InlineCSSStyleDeclaration(MutableStylePropertySet* propertySet, StyledElement* parentElement)
</del><ins>+ InlineCSSStyleDeclaration(MutableStyleProperties* propertySet, StyledElement* parentElement)
</ins><span class="cx"> : PropertySetCSSStyleDeclaration(propertySet)
</span><span class="cx"> , m_parentElement(parentElement)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescppfromrev159842trunkSourceWebCorecssStylePropertySetcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/StyleProperties.cpp (from rev 159842, trunk/Source/WebCore/css/StylePropertySet.cpp) (0 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp (rev 0)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -0,0 +1,1273 @@
</span><ins>+/*
+ * (C) 1999-2003 Lars Knoll (knoll@kde.org)
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "StyleProperties.h"
+
+#include "CSSComputedStyleDeclaration.h"
+#include "CSSParser.h"
+#include "CSSValueKeywords.h"
+#include "CSSValueList.h"
+#include "CSSValuePool.h"
+#include "Document.h"
+#include "PropertySetCSSStyleDeclaration.h"
+#include "StylePropertyShorthand.h"
+#include "StyleSheetContents.h"
+#include <wtf/BitArray.h>
+#include <wtf/text/StringBuilder.h>
+
+#ifndef NDEBUG
+#include <stdio.h>
+#include <wtf/ASCIICType.h>
+#include <wtf/text/CString.h>
+#endif
+
+namespace WebCore {
+
+static size_t sizeForImmutableStylePropertiesWithPropertyCount(unsigned count)
+{
+ return sizeof(ImmutableStyleProperties) - sizeof(void*) + sizeof(CSSValue*) * count + sizeof(StylePropertyMetadata) * count;
+}
+
+static bool isInitialOrInherit(const String& value)
+{
+ DEFINE_STATIC_LOCAL(String, initial, ("initial"));
+ DEFINE_STATIC_LOCAL(String, inherit, ("inherit"));
+ return value.length() == 7 && (value == initial || value == inherit);
+}
+
+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<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);
+ for (unsigned i = 0; i < length; ++i)
+ m_propertyVector.uncheckedAppend(properties[i]);
+}
+
+MutableStyleProperties::~MutableStyleProperties()
+{
+}
+
+ImmutableStyleProperties::ImmutableStyleProperties(const CSSProperty* properties, unsigned length, CSSParserMode cssParserMode)
+ : StyleProperties(cssParserMode, length)
+{
+ StylePropertyMetadata* metadataArray = const_cast<StylePropertyMetadata*>(this->metadataArray());
+ CSSValue** valueArray = const_cast<CSSValue**>(this->valueArray());
+ for (unsigned i = 0; i < length; ++i) {
+ metadataArray[i] = properties[i].metadata();
+ valueArray[i] = properties[i].value();
+ valueArray[i]->ref();
+ }
+}
+
+ImmutableStyleProperties::~ImmutableStyleProperties()
+{
+ CSSValue** valueArray = const_cast<CSSValue**>(this->valueArray());
+ for (unsigned i = 0; i < m_arraySize; ++i)
+ valueArray[i]->deref();
+}
+
+MutableStyleProperties::MutableStyleProperties(const StyleProperties& other)
+ : StyleProperties(other.cssParserMode())
+{
+ if (other.isMutable())
+ m_propertyVector = static_cast<const MutableStyleProperties&>(other).m_propertyVector;
+ else {
+ m_propertyVector.reserveInitialCapacity(other.propertyCount());
+ for (unsigned i = 0; i < other.propertyCount(); ++i)
+ m_propertyVector.uncheckedAppend(other.propertyAt(i).toCSSProperty());
+ }
+}
+
+String StyleProperties::getPropertyValue(CSSPropertyID propertyID) const
+{
+ RefPtr<CSSValue> value = getPropertyCSSValue(propertyID);
+ if (value)
+ return value->cssText();
+
+ // Shorthand and 4-values properties
+ switch (propertyID) {
+ case CSSPropertyBorderSpacing:
+ return borderSpacingValue(borderSpacingShorthand());
+ case CSSPropertyBackgroundPosition:
+ return getLayeredShorthandValue(backgroundPositionShorthand());
+ case CSSPropertyBackgroundRepeat:
+ return getLayeredShorthandValue(backgroundRepeatShorthand());
+ case CSSPropertyBackground:
+ return getLayeredShorthandValue(backgroundShorthand());
+ case CSSPropertyBorder:
+ return borderPropertyValue(OmitUncommonValues);
+ case CSSPropertyBorderTop:
+ return getShorthandValue(borderTopShorthand());
+ case CSSPropertyBorderRight:
+ return getShorthandValue(borderRightShorthand());
+ case CSSPropertyBorderBottom:
+ return getShorthandValue(borderBottomShorthand());
+ case CSSPropertyBorderLeft:
+ return getShorthandValue(borderLeftShorthand());
+ case CSSPropertyOutline:
+ return getShorthandValue(outlineShorthand());
+ case CSSPropertyBorderColor:
+ return get4Values(borderColorShorthand());
+ case CSSPropertyBorderWidth:
+ return get4Values(borderWidthShorthand());
+ case CSSPropertyBorderStyle:
+ return get4Values(borderStyleShorthand());
+ case CSSPropertyWebkitColumnRule:
+ return getShorthandValue(webkitColumnRuleShorthand());
+ case CSSPropertyWebkitColumns:
+ return getShorthandValue(webkitColumnsShorthand());
+ case CSSPropertyWebkitFlex:
+ return getShorthandValue(webkitFlexShorthand());
+ case CSSPropertyWebkitFlexFlow:
+ return getShorthandValue(webkitFlexFlowShorthand());
+ case CSSPropertyWebkitGridArea:
+ return getShorthandValue(webkitGridAreaShorthand());
+ case CSSPropertyWebkitGridColumn:
+ return getShorthandValue(webkitGridColumnShorthand());
+ case CSSPropertyWebkitGridRow:
+ return getShorthandValue(webkitGridRowShorthand());
+ case CSSPropertyFont:
+ return fontValue();
+ case CSSPropertyMargin:
+ return get4Values(marginShorthand());
+ case CSSPropertyWebkitMarginCollapse:
+ return getShorthandValue(webkitMarginCollapseShorthand());
+ case CSSPropertyOverflow:
+ return getCommonValue(overflowShorthand());
+ case CSSPropertyPadding:
+ return get4Values(paddingShorthand());
+ case CSSPropertyTransition:
+ return getLayeredShorthandValue(transitionShorthand());
+ case CSSPropertyListStyle:
+ return getShorthandValue(listStyleShorthand());
+ case CSSPropertyWebkitMarquee:
+ return getShorthandValue(webkitMarqueeShorthand());
+ case CSSPropertyWebkitMaskPosition:
+ return getLayeredShorthandValue(webkitMaskPositionShorthand());
+ case CSSPropertyWebkitMaskRepeat:
+ return getLayeredShorthandValue(webkitMaskRepeatShorthand());
+ case CSSPropertyWebkitMask:
+ return getLayeredShorthandValue(webkitMaskShorthand());
+ case CSSPropertyWebkitTextEmphasis:
+ return getShorthandValue(webkitTextEmphasisShorthand());
+ case CSSPropertyWebkitTextStroke:
+ return getShorthandValue(webkitTextStrokeShorthand());
+ case CSSPropertyWebkitTransformOrigin:
+ return getShorthandValue(webkitTransformOriginShorthand());
+ case CSSPropertyWebkitTransition:
+ return getLayeredShorthandValue(webkitTransitionShorthand());
+ case CSSPropertyWebkitAnimation:
+ return getLayeredShorthandValue(webkitAnimationShorthand());
+#if ENABLE(SVG)
+ case CSSPropertyMarker: {
+ RefPtr<CSSValue> value = getPropertyCSSValue(CSSPropertyMarkerStart);
+ if (value)
+ return value->cssText();
+ return String();
+ }
+#endif
+ case CSSPropertyBorderRadius:
+ return get4Values(borderRadiusShorthand());
+ default:
+ return String();
+ }
+}
+
+String StyleProperties::borderSpacingValue(const StylePropertyShorthand& shorthand) const
+{
+ RefPtr<CSSValue> horizontalValue = getPropertyCSSValue(shorthand.properties()[0]);
+ RefPtr<CSSValue> verticalValue = getPropertyCSSValue(shorthand.properties()[1]);
+
+ // While standard border-spacing property does not allow specifying border-spacing-vertical without
+ // specifying border-spacing-horizontal <http://www.w3.org/TR/CSS21/tables.html#separated-borders>,
+ // -webkit-border-spacing-vertical can be set without -webkit-border-spacing-horizontal.
+ if (!horizontalValue || !verticalValue)
+ return String();
+
+ String horizontalValueCSSText = horizontalValue->cssText();
+ String verticalValueCSSText = verticalValue->cssText();
+ if (horizontalValueCSSText == verticalValueCSSText)
+ return horizontalValueCSSText;
+ return horizontalValueCSSText + ' ' + verticalValueCSSText;
+}
+
+void StyleProperties::appendFontLonghandValueIfExplicit(CSSPropertyID propertyID, StringBuilder& result, String& commonValue) const
+{
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex == -1)
+ return; // All longhands must have at least implicit values if "font" is specified.
+
+ if (propertyAt(foundPropertyIndex).isImplicit()) {
+ commonValue = String();
+ return;
+ }
+
+ char prefix = '\0';
+ switch (propertyID) {
+ case CSSPropertyFontStyle:
+ break; // No prefix.
+ case CSSPropertyFontFamily:
+ case CSSPropertyFontVariant:
+ case CSSPropertyFontWeight:
+ prefix = ' ';
+ break;
+ case CSSPropertyLineHeight:
+ prefix = '/';
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ if (prefix && !result.isEmpty())
+ result.append(prefix);
+ String value = propertyAt(foundPropertyIndex).value()->cssText();
+ result.append(value);
+ if (!commonValue.isNull() && commonValue != value)
+ commonValue = String();
+}
+
+String StyleProperties::fontValue() const
+{
+ int fontSizePropertyIndex = findPropertyIndex(CSSPropertyFontSize);
+ int fontFamilyPropertyIndex = findPropertyIndex(CSSPropertyFontFamily);
+ if (fontSizePropertyIndex == -1 || fontFamilyPropertyIndex == -1)
+ return emptyString();
+
+ PropertyReference fontSizeProperty = propertyAt(fontSizePropertyIndex);
+ PropertyReference fontFamilyProperty = propertyAt(fontFamilyPropertyIndex);
+ if (fontSizeProperty.isImplicit() || fontFamilyProperty.isImplicit())
+ return emptyString();
+
+ String commonValue = fontSizeProperty.value()->cssText();
+ StringBuilder result;
+ appendFontLonghandValueIfExplicit(CSSPropertyFontStyle, result, commonValue);
+ appendFontLonghandValueIfExplicit(CSSPropertyFontVariant, result, commonValue);
+ appendFontLonghandValueIfExplicit(CSSPropertyFontWeight, result, commonValue);
+ if (!result.isEmpty())
+ result.append(' ');
+ result.append(fontSizeProperty.value()->cssText());
+ appendFontLonghandValueIfExplicit(CSSPropertyLineHeight, result, commonValue);
+ if (!result.isEmpty())
+ result.append(' ');
+ result.append(fontFamilyProperty.value()->cssText());
+ if (isInitialOrInherit(commonValue))
+ return commonValue;
+ return result.toString();
+}
+
+String StyleProperties::get4Values(const StylePropertyShorthand& shorthand) const
+{
+ // Assume the properties are in the usual order top, right, bottom, left.
+ int topValueIndex = findPropertyIndex(shorthand.properties()[0]);
+ int rightValueIndex = findPropertyIndex(shorthand.properties()[1]);
+ int bottomValueIndex = findPropertyIndex(shorthand.properties()[2]);
+ int leftValueIndex = findPropertyIndex(shorthand.properties()[3]);
+
+ if (topValueIndex == -1 || rightValueIndex == -1 || bottomValueIndex == -1 || leftValueIndex == -1)
+ return String();
+
+ PropertyReference top = propertyAt(topValueIndex);
+ PropertyReference right = propertyAt(rightValueIndex);
+ PropertyReference bottom = propertyAt(bottomValueIndex);
+ PropertyReference left = propertyAt(leftValueIndex);
+
+ // All 4 properties must be specified.
+ if (!top.value() || !right.value() || !bottom.value() || !left.value())
+ return String();
+
+ if (top.isInherited() && right.isInherited() && bottom.isInherited() && left.isInherited())
+ return getValueName(CSSValueInherit);
+
+ if (top.value()->isInitialValue() || right.value()->isInitialValue() || bottom.value()->isInitialValue() || left.value()->isInitialValue()) {
+ if (top.value()->isInitialValue() && right.value()->isInitialValue() && bottom.value()->isInitialValue() && left.value()->isInitialValue() && !top.isImplicit()) {
+ // All components are "initial" and "top" is not implicit.
+ return getValueName(CSSValueInitial);
+ }
+ return String();
+ }
+ if (top.isImportant() != right.isImportant() || right.isImportant() != bottom.isImportant() || bottom.isImportant() != left.isImportant())
+ return String();
+
+ bool showLeft = !right.value()->equals(*left.value());
+ bool showBottom = !top.value()->equals(*bottom.value()) || showLeft;
+ bool showRight = !top.value()->equals(*right.value()) || showBottom;
+
+ StringBuilder result;
+ result.append(top.value()->cssText());
+ if (showRight) {
+ result.append(' ');
+ result.append(right.value()->cssText());
+ }
+ if (showBottom) {
+ result.append(' ');
+ result.append(bottom.value()->cssText());
+ }
+ if (showLeft) {
+ result.append(' ');
+ result.append(left.value()->cssText());
+ }
+ return result.toString();
+}
+
+String StyleProperties::getLayeredShorthandValue(const StylePropertyShorthand& shorthand) const
+{
+ StringBuilder result;
+
+ const unsigned size = shorthand.length();
+ // Begin by collecting the properties into an array.
+ Vector< RefPtr<CSSValue>> values(size);
+ size_t numLayers = 0;
+
+ for (unsigned i = 0; i < size; ++i) {
+ values[i] = getPropertyCSSValue(shorthand.properties()[i]);
+ if (values[i]) {
+ if (values[i]->isBaseValueList())
+ numLayers = std::max(toCSSValueList(values[i].get())->length(), numLayers);
+ else
+ numLayers = std::max<size_t>(1U, numLayers);
+ }
+ }
+
+ String commonValue;
+ bool commonValueInitialized = false;
+
+ // 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++) {
+ StringBuilder layerResult;
+ bool useRepeatXShorthand = false;
+ bool useRepeatYShorthand = false;
+ bool useSingleWordShorthand = false;
+ bool foundPositionYCSSProperty = false;
+ for (unsigned j = 0; j < size; j++) {
+ RefPtr<CSSValue> value;
+ if (values[j]) {
+ if (values[j]->isBaseValueList())
+ value = toCSSValueList(values[j].get())->item(i);
+ else {
+ value = values[j];
+
+ // Color only belongs in the last layer.
+ if (shorthand.properties()[j] == CSSPropertyBackgroundColor) {
+ if (i != numLayers - 1)
+ value = 0;
+ } else if (i) // Other singletons only belong in the first layer.
+ value = 0;
+ }
+ }
+
+ // We need to report background-repeat as it was written in the CSS. If the property is implicit,
+ // then it was written with only one value. Here we figure out which value that was so we can
+ // report back correctly.
+ if ((shorthand.properties()[j] == CSSPropertyBackgroundRepeatX && isPropertyImplicit(shorthand.properties()[j]))
+ || (shorthand.properties()[j] == CSSPropertyWebkitMaskRepeatX && isPropertyImplicit(shorthand.properties()[j]))) {
+
+ // BUG 49055: make sure the value was not reset in the layer check just above.
+ if ((j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyBackgroundRepeatY && value)
+ || (j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyWebkitMaskRepeatY && value)) {
+ RefPtr<CSSValue> yValue;
+ RefPtr<CSSValue> nextValue = values[j + 1];
+ if (nextValue->isValueList())
+ yValue = toCSSValueList(nextValue.get())->itemWithoutBoundsCheck(i);
+ else
+ yValue = nextValue;
+
+ CSSValueID xId = toCSSPrimitiveValue(value.get())->getValueID();
+ CSSValueID yId = toCSSPrimitiveValue(yValue.get())->getValueID();
+ if (xId != yId) {
+ if (xId == CSSValueRepeat && yId == CSSValueNoRepeat) {
+ useRepeatXShorthand = true;
+ ++j;
+ } else if (xId == CSSValueNoRepeat && yId == CSSValueRepeat) {
+ useRepeatYShorthand = true;
+ continue;
+ }
+ } else {
+ useSingleWordShorthand = true;
+ ++j;
+ }
+ }
+ }
+
+ String valueText;
+ if (value && !value->isImplicitInitialValue()) {
+ if (!layerResult.isEmpty())
+ layerResult.append(' ');
+ if (foundPositionYCSSProperty
+ && (shorthand.properties()[j] == CSSPropertyBackgroundSize || shorthand.properties()[j] == CSSPropertyWebkitMaskSize))
+ layerResult.appendLiteral("/ ");
+ if (!foundPositionYCSSProperty
+ && (shorthand.properties()[j] == CSSPropertyBackgroundSize || shorthand.properties()[j] == CSSPropertyWebkitMaskSize))
+ continue;
+
+ if (useRepeatXShorthand) {
+ useRepeatXShorthand = false;
+ layerResult.append(getValueName(CSSValueRepeatX));
+ } else if (useRepeatYShorthand) {
+ useRepeatYShorthand = false;
+ layerResult.append(getValueName(CSSValueRepeatY));
+ } else {
+ if (useSingleWordShorthand)
+ useSingleWordShorthand = false;
+ valueText = value->cssText();
+ layerResult.append(valueText);
+ }
+
+ if (shorthand.properties()[j] == CSSPropertyBackgroundPositionY
+ || shorthand.properties()[j] == CSSPropertyWebkitMaskPositionY) {
+ foundPositionYCSSProperty = true;
+
+ // background-position is a special case: if only the first offset is specified,
+ // the second one defaults to "center", not the same value.
+ if (commonValueInitialized && commonValue != "initial" && commonValue != "inherit")
+ commonValue = String();
+ }
+ }
+
+ if (!commonValueInitialized) {
+ commonValue = valueText;
+ commonValueInitialized = true;
+ } else if (!commonValue.isNull() && commonValue != valueText)
+ commonValue = String();
+ }
+
+ if (!layerResult.isEmpty()) {
+ if (!result.isEmpty())
+ result.appendLiteral(", ");
+ result.append(layerResult);
+ }
+ }
+
+ if (isInitialOrInherit(commonValue))
+ return commonValue;
+
+ if (result.isEmpty())
+ return String();
+ return result.toString();
+}
+
+String StyleProperties::getShorthandValue(const StylePropertyShorthand& shorthand) const
+{
+ String commonValue;
+ StringBuilder result;
+ for (unsigned i = 0; i < shorthand.length(); ++i) {
+ if (!isPropertyImplicit(shorthand.properties()[i])) {
+ RefPtr<CSSValue> value = getPropertyCSSValue(shorthand.properties()[i]);
+ if (!value)
+ return String();
+ String valueText = value->cssText();
+ if (!i)
+ commonValue = valueText;
+ else if (!commonValue.isNull() && commonValue != valueText)
+ commonValue = String();
+ if (value->isInitialValue())
+ continue;
+ if (!result.isEmpty())
+ result.append(' ');
+ result.append(valueText);
+ } else
+ commonValue = String();
+ }
+ if (isInitialOrInherit(commonValue))
+ return commonValue;
+ if (result.isEmpty())
+ return String();
+ return result.toString();
+}
+
+// only returns a non-null value if all properties have the same, non-null value
+String StyleProperties::getCommonValue(const StylePropertyShorthand& shorthand) const
+{
+ String res;
+ bool lastPropertyWasImportant = false;
+ for (unsigned i = 0; i < shorthand.length(); ++i) {
+ RefPtr<CSSValue> value = getPropertyCSSValue(shorthand.properties()[i]);
+ // FIXME: CSSInitialValue::cssText should generate the right value.
+ if (!value)
+ return String();
+ String text = value->cssText();
+ if (text.isNull())
+ return String();
+ if (res.isNull())
+ res = text;
+ else if (res != text)
+ return String();
+
+ bool currentPropertyIsImportant = propertyIsImportant(shorthand.properties()[i]);
+ if (i && lastPropertyWasImportant != currentPropertyIsImportant)
+ return String();
+ lastPropertyWasImportant = currentPropertyIsImportant;
+ }
+ return res;
+}
+
+String StyleProperties::borderPropertyValue(CommonValueMode valueMode) const
+{
+ const StylePropertyShorthand properties[3] = { borderWidthShorthand(), borderStyleShorthand(), borderColorShorthand() };
+ String commonValue;
+ StringBuilder result;
+ for (size_t i = 0; i < WTF_ARRAY_LENGTH(properties); ++i) {
+ String value = getCommonValue(properties[i]);
+ if (value.isNull()) {
+ if (valueMode == ReturnNullOnUncommonValues)
+ return String();
+ ASSERT(valueMode == OmitUncommonValues);
+ continue;
+ }
+ if (!i)
+ commonValue = value;
+ else if (!commonValue.isNull() && commonValue != value)
+ commonValue = String();
+ if (value == "initial")
+ continue;
+ if (!result.isEmpty())
+ result.append(' ');
+ result.append(value);
+ }
+ if (isInitialOrInherit(commonValue))
+ return commonValue;
+ return result.isEmpty() ? String() : result.toString();
+}
+
+PassRefPtr<CSSValue> StyleProperties::getPropertyCSSValue(CSSPropertyID propertyID) const
+{
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex == -1)
+ return 0;
+ return propertyAt(foundPropertyIndex).value();
+}
+
+bool MutableStyleProperties::removeShorthandProperty(CSSPropertyID propertyID)
+{
+ StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
+ if (!shorthand.length())
+ return false;
+
+ bool ret = removePropertiesInSet(shorthand.properties(), shorthand.length());
+
+ CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
+ if (prefixingVariant == propertyID)
+ return ret;
+
+ StylePropertyShorthand shorthandPrefixingVariant = shorthandForProperty(prefixingVariant);
+ return removePropertiesInSet(shorthandPrefixingVariant.properties(), shorthandPrefixingVariant.length());
+}
+
+bool MutableStyleProperties::removeProperty(CSSPropertyID propertyID, String* returnText)
+{
+ if (removeShorthandProperty(propertyID)) {
+ // FIXME: Return an equivalent shorthand when possible.
+ if (returnText)
+ *returnText = "";
+ return true;
+ }
+
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex == -1) {
+ if (returnText)
+ *returnText = "";
+ return false;
+ }
+
+ if (returnText)
+ *returnText = propertyAt(foundPropertyIndex).value()->cssText();
+
+ // A more efficient removal strategy would involve marking entries as empty
+ // and sweeping them when the vector grows too big.
+ m_propertyVector.remove(foundPropertyIndex);
+
+ removePrefixedOrUnprefixedProperty(propertyID);
+
+ return true;
+}
+
+void MutableStyleProperties::removePrefixedOrUnprefixedProperty(CSSPropertyID propertyID)
+{
+ int foundPropertyIndex = findPropertyIndex(prefixingVariantForPropertyId(propertyID));
+ if (foundPropertyIndex == -1)
+ return;
+ m_propertyVector.remove(foundPropertyIndex);
+}
+
+bool StyleProperties::propertyIsImportant(CSSPropertyID propertyID) const
+{
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex != -1)
+ return propertyAt(foundPropertyIndex).isImportant();
+
+ StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
+ if (!shorthand.length())
+ return false;
+
+ for (unsigned i = 0; i < shorthand.length(); ++i) {
+ if (!propertyIsImportant(shorthand.properties()[i]))
+ return false;
+ }
+ return true;
+}
+
+String StyleProperties::getPropertyShorthand(CSSPropertyID propertyID) const
+{
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex == -1)
+ return String();
+ return getPropertyNameString(propertyAt(foundPropertyIndex).shorthandID());
+}
+
+bool StyleProperties::isPropertyImplicit(CSSPropertyID propertyID) const
+{
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex == -1)
+ return false;
+ return propertyAt(foundPropertyIndex).isImplicit();
+}
+
+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.
+ // Setting it to null seems to produce less consistent results, but we treat it just the same.
+ if (value.isEmpty())
+ return removeProperty(propertyID);
+
+ // When replacing an existing property value, this moves the property to the end of the list.
+ // Firefox preserves the position, and MSIE moves the property to the beginning.
+ return CSSParser::parseValue(this, propertyID, value, important, cssParserMode(), contextStyleSheet);
+}
+
+void MutableStyleProperties::setProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> prpValue, bool important)
+{
+ StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
+ if (!shorthand.length()) {
+ setProperty(CSSProperty(propertyID, prpValue, important));
+ return;
+ }
+
+ removePropertiesInSet(shorthand.properties(), shorthand.length());
+
+ RefPtr<CSSValue> value = prpValue;
+ for (unsigned i = 0; i < shorthand.length(); ++i)
+ m_propertyVector.append(CSSProperty(shorthand.properties()[i], value, important));
+}
+
+void MutableStyleProperties::setProperty(const CSSProperty& property, CSSProperty* slot)
+{
+ if (!removeShorthandProperty(property.id())) {
+ CSSProperty* toReplace = slot ? slot : findCSSPropertyWithID(property.id());
+ if (toReplace) {
+ *toReplace = property;
+ setPrefixingVariantProperty(property);
+ return;
+ }
+ }
+ appendPrefixingVariantProperty(property);
+}
+
+static unsigned getIndexInShorthandVectorForPrefixingVariant(const CSSProperty& property, CSSPropertyID prefixingVariant)
+{
+ if (!property.isSetFromShorthand())
+ return 0;
+
+ CSSPropertyID prefixedShorthand = prefixingVariantForPropertyId(property.shorthandID());
+ return indexOfShorthandForLonghand(prefixedShorthand, matchingShorthandsForLonghand(prefixingVariant));
+}
+
+void MutableStyleProperties::appendPrefixingVariantProperty(const CSSProperty& property)
+{
+ m_propertyVector.append(property);
+ CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
+ if (prefixingVariant == property.id())
+ return;
+
+ m_propertyVector.append(CSSProperty(prefixingVariant, property.value(), property.isImportant(), property.isSetFromShorthand(), getIndexInShorthandVectorForPrefixingVariant(property, prefixingVariant), property.metadata().m_implicit));
+}
+
+void MutableStyleProperties::setPrefixingVariantProperty(const CSSProperty& property)
+{
+ CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
+ CSSProperty* toReplace = findCSSPropertyWithID(prefixingVariant);
+ if (toReplace && prefixingVariant != property.id())
+ *toReplace = CSSProperty(prefixingVariant, property.value(), property.isImportant(), property.isSetFromShorthand(), getIndexInShorthandVectorForPrefixingVariant(property, prefixingVariant), property.metadata().m_implicit);
+}
+
+bool MutableStyleProperties::setProperty(CSSPropertyID propertyID, CSSValueID identifier, bool important)
+{
+ setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important));
+ return true;
+}
+
+bool MutableStyleProperties::setProperty(CSSPropertyID propertyID, CSSPropertyID identifier, bool important)
+{
+ setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important));
+ return true;
+}
+
+void MutableStyleProperties::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
+{
+ m_propertyVector.clear();
+
+ CSSParserContext context(cssParserMode());
+ if (contextStyleSheet) {
+ context = contextStyleSheet->parserContext();
+ context.mode = cssParserMode();
+ }
+ CSSParser parser(context);
+ parser.parseDeclaration(this, styleDeclaration, 0, contextStyleSheet);
+}
+
+void MutableStyleProperties::addParsedProperties(const Vector<CSSProperty>& properties)
+{
+ m_propertyVector.reserveCapacity(m_propertyVector.size() + properties.size());
+ for (unsigned i = 0; i < properties.size(); ++i)
+ addParsedProperty(properties[i]);
+}
+
+void MutableStyleProperties::addParsedProperty(const CSSProperty& property)
+{
+ // Only add properties that have no !important counterpart present
+ if (!propertyIsImportant(property.id()) || property.isImportant())
+ setProperty(property);
+}
+
+String StyleProperties::asText() const
+{
+ StringBuilder result;
+
+ int positionXPropertyIndex = -1;
+ int positionYPropertyIndex = -1;
+ int repeatXPropertyIndex = -1;
+ int repeatYPropertyIndex = -1;
+
+ BitArray<numCSSProperties> shorthandPropertyUsed;
+ BitArray<numCSSProperties> shorthandPropertyAppeared;
+
+ unsigned size = propertyCount();
+ unsigned numDecls = 0;
+ for (unsigned n = 0; n < size; ++n) {
+ PropertyReference property = propertyAt(n);
+ CSSPropertyID propertyID = property.id();
+ CSSPropertyID shorthandPropertyID = CSSPropertyInvalid;
+ CSSPropertyID borderFallbackShorthandProperty = CSSPropertyInvalid;
+ String value;
+
+ switch (propertyID) {
+ case CSSPropertyBackgroundPositionX:
+ positionXPropertyIndex = n;
+ continue;
+ case CSSPropertyBackgroundPositionY:
+ positionYPropertyIndex = n;
+ continue;
+ case CSSPropertyBackgroundRepeatX:
+ repeatXPropertyIndex = n;
+ continue;
+ case CSSPropertyBackgroundRepeatY:
+ repeatYPropertyIndex = n;
+ continue;
+ case CSSPropertyBorderTopWidth:
+ case CSSPropertyBorderRightWidth:
+ case CSSPropertyBorderBottomWidth:
+ case CSSPropertyBorderLeftWidth:
+ if (!borderFallbackShorthandProperty)
+ borderFallbackShorthandProperty = CSSPropertyBorderWidth;
+ case CSSPropertyBorderTopStyle:
+ case CSSPropertyBorderRightStyle:
+ case CSSPropertyBorderBottomStyle:
+ case CSSPropertyBorderLeftStyle:
+ if (!borderFallbackShorthandProperty)
+ borderFallbackShorthandProperty = CSSPropertyBorderStyle;
+ case CSSPropertyBorderTopColor:
+ case CSSPropertyBorderRightColor:
+ case CSSPropertyBorderBottomColor:
+ case CSSPropertyBorderLeftColor:
+ if (!borderFallbackShorthandProperty)
+ borderFallbackShorthandProperty = CSSPropertyBorderColor;
+
+ // FIXME: Deal with cases where only some of border-(top|right|bottom|left) are specified.
+ if (!shorthandPropertyAppeared.get(CSSPropertyBorder - firstCSSProperty)) {
+ value = borderPropertyValue(ReturnNullOnUncommonValues);
+ if (value.isNull())
+ shorthandPropertyAppeared.set(CSSPropertyBorder - firstCSSProperty);
+ else
+ shorthandPropertyID = CSSPropertyBorder;
+ } else if (shorthandPropertyUsed.get(CSSPropertyBorder - firstCSSProperty))
+ shorthandPropertyID = CSSPropertyBorder;
+ if (!shorthandPropertyID)
+ shorthandPropertyID = borderFallbackShorthandProperty;
+ break;
+ case CSSPropertyWebkitBorderHorizontalSpacing:
+ case CSSPropertyWebkitBorderVerticalSpacing:
+ shorthandPropertyID = CSSPropertyBorderSpacing;
+ break;
+ case CSSPropertyFontFamily:
+ case CSSPropertyLineHeight:
+ case CSSPropertyFontSize:
+ case CSSPropertyFontStyle:
+ case CSSPropertyFontVariant:
+ case CSSPropertyFontWeight:
+ // Don't use CSSPropertyFont because old UAs can't recognize them but are important for editing.
+ break;
+ case CSSPropertyListStyleType:
+ case CSSPropertyListStylePosition:
+ case CSSPropertyListStyleImage:
+ shorthandPropertyID = CSSPropertyListStyle;
+ break;
+ case CSSPropertyMarginTop:
+ case CSSPropertyMarginRight:
+ case CSSPropertyMarginBottom:
+ case CSSPropertyMarginLeft:
+ shorthandPropertyID = CSSPropertyMargin;
+ break;
+ case CSSPropertyOutlineWidth:
+ case CSSPropertyOutlineStyle:
+ case CSSPropertyOutlineColor:
+ shorthandPropertyID = CSSPropertyOutline;
+ break;
+ case CSSPropertyOverflowX:
+ case CSSPropertyOverflowY:
+ shorthandPropertyID = CSSPropertyOverflow;
+ break;
+ case CSSPropertyPaddingTop:
+ case CSSPropertyPaddingRight:
+ case CSSPropertyPaddingBottom:
+ case CSSPropertyPaddingLeft:
+ shorthandPropertyID = CSSPropertyPadding;
+ break;
+ case CSSPropertyTransitionProperty:
+ case CSSPropertyTransitionDuration:
+ case CSSPropertyTransitionTimingFunction:
+ case CSSPropertyTransitionDelay:
+ shorthandPropertyID = CSSPropertyTransition;
+ break;
+ case CSSPropertyWebkitAnimationName:
+ case CSSPropertyWebkitAnimationDuration:
+ case CSSPropertyWebkitAnimationTimingFunction:
+ case CSSPropertyWebkitAnimationDelay:
+ case CSSPropertyWebkitAnimationIterationCount:
+ case CSSPropertyWebkitAnimationDirection:
+ case CSSPropertyWebkitAnimationFillMode:
+ shorthandPropertyID = CSSPropertyWebkitAnimation;
+ break;
+ case CSSPropertyWebkitFlexDirection:
+ case CSSPropertyWebkitFlexWrap:
+ shorthandPropertyID = CSSPropertyWebkitFlexFlow;
+ break;
+ case CSSPropertyWebkitFlexBasis:
+ case CSSPropertyWebkitFlexGrow:
+ case CSSPropertyWebkitFlexShrink:
+ shorthandPropertyID = CSSPropertyWebkitFlex;
+ break;
+ case CSSPropertyWebkitMaskPositionX:
+ case CSSPropertyWebkitMaskPositionY:
+ case CSSPropertyWebkitMaskRepeatX:
+ case CSSPropertyWebkitMaskRepeatY:
+ case CSSPropertyWebkitMaskImage:
+ case CSSPropertyWebkitMaskRepeat:
+ case CSSPropertyWebkitMaskPosition:
+ case CSSPropertyWebkitMaskClip:
+ case CSSPropertyWebkitMaskOrigin:
+ shorthandPropertyID = CSSPropertyWebkitMask;
+ break;
+ case CSSPropertyWebkitTransformOriginX:
+ case CSSPropertyWebkitTransformOriginY:
+ case CSSPropertyWebkitTransformOriginZ:
+ shorthandPropertyID = CSSPropertyWebkitTransformOrigin;
+ break;
+ case CSSPropertyWebkitTransitionProperty:
+ case CSSPropertyWebkitTransitionDuration:
+ case CSSPropertyWebkitTransitionTimingFunction:
+ case CSSPropertyWebkitTransitionDelay:
+ shorthandPropertyID = CSSPropertyWebkitTransition;
+ break;
+ default:
+ break;
+ }
+
+ unsigned shortPropertyIndex = shorthandPropertyID - firstCSSProperty;
+ if (shorthandPropertyID) {
+ if (shorthandPropertyUsed.get(shortPropertyIndex))
+ continue;
+ if (!shorthandPropertyAppeared.get(shortPropertyIndex) && value.isNull())
+ value = getPropertyValue(shorthandPropertyID);
+ shorthandPropertyAppeared.set(shortPropertyIndex);
+ }
+
+ if (!value.isNull()) {
+ propertyID = shorthandPropertyID;
+ shorthandPropertyUsed.set(shortPropertyIndex);
+ } else
+ value = property.value()->cssText();
+
+ if (value == "initial" && !CSSProperty::isInheritedProperty(propertyID))
+ continue;
+
+ if (numDecls++)
+ result.append(' ');
+ result.append(getPropertyName(propertyID));
+ result.appendLiteral(": ");
+ result.append(value);
+ if (property.isImportant())
+ result.appendLiteral(" !important");
+ result.append(';');
+ }
+
+ // FIXME: This is a not-so-nice way to turn x/y positions into single background-position in output.
+ // It is required because background-position-x/y are non-standard properties and WebKit generated output
+ // would not work in Firefox (<rdar://problem/5143183>)
+ // It would be a better solution if background-position was CSS_PAIR.
+ if (positionXPropertyIndex != -1 && positionYPropertyIndex != -1 && propertyAt(positionXPropertyIndex).isImportant() == propertyAt(positionYPropertyIndex).isImportant()) {
+ PropertyReference positionXProperty = propertyAt(positionXPropertyIndex);
+ PropertyReference positionYProperty = propertyAt(positionYPropertyIndex);
+
+ if (numDecls++)
+ result.append(' ');
+ result.appendLiteral("background-position: ");
+ if (positionXProperty.value()->isValueList() || positionYProperty.value()->isValueList())
+ result.append(getLayeredShorthandValue(backgroundPositionShorthand()));
+ else {
+ result.append(positionXProperty.value()->cssText());
+ result.append(' ');
+ result.append(positionYProperty.value()->cssText());
+ }
+ if (positionXProperty.isImportant())
+ result.appendLiteral(" !important");
+ result.append(';');
+ } else {
+ if (positionXPropertyIndex != -1) {
+ if (numDecls++)
+ result.append(' ');
+ result.append(propertyAt(positionXPropertyIndex).cssText());
+ }
+ if (positionYPropertyIndex != -1) {
+ if (numDecls++)
+ result.append(' ');
+ result.append(propertyAt(positionYPropertyIndex).cssText());
+ }
+ }
+
+ // FIXME: We need to do the same for background-repeat.
+ if (repeatXPropertyIndex != -1 && repeatYPropertyIndex != -1 && propertyAt(repeatXPropertyIndex).isImportant() == propertyAt(repeatYPropertyIndex).isImportant()) {
+ PropertyReference repeatXProperty = propertyAt(repeatXPropertyIndex);
+ PropertyReference repeatYProperty = propertyAt(repeatYPropertyIndex);
+
+ if (numDecls++)
+ result.append(' ');
+ result.appendLiteral("background-repeat: ");
+ if (repeatXProperty.value()->isValueList() || repeatYProperty.value()->isValueList())
+ result.append(getLayeredShorthandValue(backgroundRepeatShorthand()));
+ else {
+ result.append(repeatXProperty.value()->cssText());
+ result.append(' ');
+ result.append(repeatYProperty.value()->cssText());
+ }
+ if (repeatXProperty.isImportant())
+ result.appendLiteral(" !important");
+ result.append(';');
+ } else {
+ if (repeatXPropertyIndex != -1) {
+ if (numDecls++)
+ result.append(' ');
+ result.append(propertyAt(repeatXPropertyIndex).cssText());
+ }
+ if (repeatYPropertyIndex != -1) {
+ if (numDecls++)
+ result.append(' ');
+ result.append(propertyAt(repeatYPropertyIndex).cssText());
+ }
+ }
+
+ ASSERT(!numDecls ^ !result.isEmpty());
+ return result.toString();
+}
+
+bool StyleProperties::hasCSSOMWrapper() const
+{
+ return m_isMutable && static_cast<const MutableStyleProperties*>(this)->m_cssomWrapper;
+}
+
+void MutableStyleProperties::mergeAndOverrideOnConflict(const StyleProperties& other)
+{
+ unsigned size = other.propertyCount();
+ for (unsigned i = 0; i < size; ++i)
+ addParsedProperty(other.propertyAt(i).toCSSProperty());
+}
+
+void StyleProperties::addSubresourceStyleURLs(ListHashSet<URL>& urls, StyleSheetContents* contextStyleSheet) const
+{
+ unsigned size = propertyCount();
+ for (unsigned i = 0; i < size; ++i)
+ propertyAt(i).value()->addSubresourceStyleURLs(urls, contextStyleSheet);
+}
+
+bool StyleProperties::hasFailedOrCanceledSubresources() const
+{
+ unsigned size = propertyCount();
+ for (unsigned i = 0; i < size; ++i) {
+ if (propertyAt(i).value()->hasFailedOrCanceledSubresources())
+ return true;
+ }
+ return false;
+}
+
+// This is the list of properties we want to copy in the copyBlockProperties() function.
+// It is the list of CSS properties that apply specially to block-level elements.
+static const CSSPropertyID blockProperties[] = {
+ CSSPropertyOrphans,
+ CSSPropertyOverflow, // This can be also be applied to replaced elements
+ CSSPropertyWebkitAspectRatio,
+ CSSPropertyWebkitColumnCount,
+ CSSPropertyWebkitColumnGap,
+ CSSPropertyWebkitColumnRuleColor,
+ CSSPropertyWebkitColumnRuleStyle,
+ CSSPropertyWebkitColumnRuleWidth,
+ CSSPropertyWebkitColumnBreakBefore,
+ CSSPropertyWebkitColumnBreakAfter,
+ CSSPropertyWebkitColumnBreakInside,
+ CSSPropertyWebkitColumnWidth,
+ CSSPropertyPageBreakAfter,
+ CSSPropertyPageBreakBefore,
+ CSSPropertyPageBreakInside,
+#if ENABLE(CSS_REGIONS)
+ CSSPropertyWebkitRegionBreakAfter,
+ CSSPropertyWebkitRegionBreakBefore,
+ CSSPropertyWebkitRegionBreakInside,
+#endif
+ CSSPropertyTextAlign,
+#if ENABLE(CSS3_TEXT)
+ CSSPropertyWebkitTextAlignLast,
+ CSSPropertyWebkitTextJustify,
+#endif // CSS3_TEXT
+ CSSPropertyTextIndent,
+ CSSPropertyWidows
+};
+
+void MutableStyleProperties::clear()
+{
+ m_propertyVector.clear();
+}
+
+const unsigned numBlockProperties = WTF_ARRAY_LENGTH(blockProperties);
+
+PassRef<MutableStyleProperties> StyleProperties::copyBlockProperties() const
+{
+ return copyPropertiesInSet(blockProperties, numBlockProperties);
+}
+
+void MutableStyleProperties::removeBlockProperties()
+{
+ removePropertiesInSet(blockProperties, numBlockProperties);
+}
+
+bool MutableStyleProperties::removePropertiesInSet(const CSSPropertyID* set, unsigned length)
+{
+ if (m_propertyVector.isEmpty())
+ return false;
+
+ // FIXME: This is always used with static sets and in that case constructing the hash repeatedly is pretty pointless.
+ HashSet<CSSPropertyID> toRemove;
+ for (unsigned i = 0; i < length; ++i)
+ toRemove.add(set[i]);
+
+ Vector<CSSProperty> newProperties;
+ newProperties.reserveInitialCapacity(m_propertyVector.size());
+
+ unsigned size = m_propertyVector.size();
+ for (unsigned n = 0; n < size; ++n) {
+ const CSSProperty& property = m_propertyVector.at(n);
+ // Not quite sure if the isImportant test is needed but it matches the existing behavior.
+ if (!property.isImportant()) {
+ if (toRemove.contains(property.id()))
+ continue;
+ }
+ newProperties.append(property);
+ }
+
+ bool changed = newProperties.size() != m_propertyVector.size();
+ m_propertyVector = newProperties;
+ return changed;
+}
+
+int StyleProperties::findPropertyIndex(CSSPropertyID propertyID) const
+{
+ // Convert here propertyID into an uint16_t to compare it with the metadata's m_propertyID to avoid
+ // the compiler converting it to an int multiple times in the loop.
+ uint16_t id = static_cast<uint16_t>(propertyID);
+ for (int n = propertyCount() - 1 ; n >= 0; --n) {
+ if (id == propertyAt(n).propertyMetadata().m_propertyID)
+ return n;
+ }
+ return -1;
+}
+
+CSSProperty* MutableStyleProperties::findCSSPropertyWithID(CSSPropertyID propertyID)
+{
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex == -1)
+ return 0;
+ return &m_propertyVector.at(foundPropertyIndex);
+}
+
+bool StyleProperties::propertyMatches(CSSPropertyID propertyID, const CSSValue* propertyValue) const
+{
+ int foundPropertyIndex = findPropertyIndex(propertyID);
+ if (foundPropertyIndex == -1)
+ return false;
+ return propertyAt(foundPropertyIndex).value()->equals(*propertyValue);
+}
+
+void MutableStyleProperties::removeEquivalentProperties(const StyleProperties* style)
+{
+ Vector<CSSPropertyID> propertiesToRemove;
+ unsigned size = m_propertyVector.size();
+ for (unsigned i = 0; i < size; ++i) {
+ PropertyReference property = propertyAt(i);
+ if (style->propertyMatches(property.id(), property.value()))
+ propertiesToRemove.append(property.id());
+ }
+ // FIXME: This should use mass removal.
+ for (unsigned i = 0; i < propertiesToRemove.size(); ++i)
+ removeProperty(propertiesToRemove[i]);
+}
+
+void MutableStyleProperties::removeEquivalentProperties(const ComputedStyleExtractor* computedStyle)
+{
+ Vector<CSSPropertyID> propertiesToRemove;
+ unsigned size = m_propertyVector.size();
+ for (unsigned i = 0; i < size; ++i) {
+ PropertyReference property = propertyAt(i);
+ if (computedStyle->propertyMatches(property.id(), property.value()))
+ propertiesToRemove.append(property.id());
+ }
+ // FIXME: This should use mass removal.
+ for (unsigned i = 0; i < propertiesToRemove.size(); ++i)
+ removeProperty(propertiesToRemove[i]);
+}
+
+PassRef<MutableStyleProperties> StyleProperties::mutableCopy() const
+{
+ return adoptRef(*new MutableStyleProperties(*this));
+}
+
+PassRef<MutableStyleProperties> StyleProperties::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
+{
+ Vector<CSSProperty, 256> list;
+ list.reserveInitialCapacity(length);
+ for (unsigned i = 0; i < length; ++i) {
+ RefPtr<CSSValue> value = getPropertyCSSValue(set[i]);
+ if (value)
+ list.append(CSSProperty(set[i], value.release(), false));
+ }
+ return MutableStyleProperties::create(list.data(), list.size());
+}
+
+PropertySetCSSStyleDeclaration* MutableStyleProperties::cssStyleDeclaration()
+{
+ return m_cssomWrapper.get();
+}
+
+CSSStyleDeclaration* MutableStyleProperties::ensureCSSStyleDeclaration()
+{
+ if (m_cssomWrapper) {
+ ASSERT(!static_cast<CSSStyleDeclaration*>(m_cssomWrapper.get())->parentRule());
+ ASSERT(!m_cssomWrapper->parentElement());
+ return m_cssomWrapper.get();
+ }
+ m_cssomWrapper = adoptPtr(new PropertySetCSSStyleDeclaration(this));
+ return m_cssomWrapper.get();
+}
+
+CSSStyleDeclaration* MutableStyleProperties::ensureInlineCSSStyleDeclaration(StyledElement* parentElement)
+{
+ if (m_cssomWrapper) {
+ ASSERT(m_cssomWrapper->parentElement() == parentElement);
+ return m_cssomWrapper.get();
+ }
+ m_cssomWrapper = adoptPtr(new InlineCSSStyleDeclaration(this, parentElement));
+ return m_cssomWrapper.get();
+}
+
+unsigned StyleProperties::averageSizeInBytes()
+{
+ // Please update this if the storage scheme changes so that this longer reflects the actual size.
+ return sizeForImmutableStylePropertiesWithPropertyCount(4);
+}
+
+// See the function above if you need to update this.
+struct SameSizeAsStyleProperties : public RefCounted<SameSizeAsStyleProperties> {
+ unsigned bitfield;
+};
+COMPILE_ASSERT(sizeof(StyleProperties) == sizeof(SameSizeAsStyleProperties), style_property_set_should_stay_small);
+
+#ifndef NDEBUG
+void StyleProperties::showStyle()
+{
+ fprintf(stderr, "%s\n", asText().ascii().data());
+}
+#endif
+
+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 StyleProperties::PropertyReference::cssText() const
+{
+ StringBuilder result;
+ result.append(cssName());
+ result.appendLiteral(": ");
+ result.append(propertyValue()->cssText());
+ if (isImportant())
+ result.appendLiteral(" !important");
+ result.append(';');
+ return result.toString();
+}
+
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertieshfromrev159841trunkSourceWebCorecssStylePropertySeth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/StyleProperties.h (from rev 159841, trunk/Source/WebCore/css/StylePropertySet.h) (0 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.h (rev 0)
+++ trunk/Source/WebCore/css/StyleProperties.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -0,0 +1,277 @@
</span><ins>+/*
+ * (C) 1999-2003 Lars Knoll (knoll@kde.org)
+ * Copyright (C) 2004, 2005, 2006, 2008, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef StyleProperties_h
+#define StyleProperties_h
+
+#include "CSSParserMode.h"
+#include "CSSPrimitiveValue.h"
+#include "CSSProperty.h"
+#include "CSSPropertyNames.h"
+#include "CSSValueKeywords.h"
+#include <wtf/ListHashSet.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class CSSRule;
+class CSSStyleDeclaration;
+class ComputedStyleExtractor;
+class ImmutableStyleProperties;
+class URL;
+class MutableStyleProperties;
+class PropertySetCSSStyleDeclaration;
+class StyledElement;
+class StylePropertyShorthand;
+class StyleSheetContents;
+
+class StyleProperties : public RefCounted<StyleProperties> {
+ friend class PropertyReference;
+public:
+ // Override RefCounted's deref() to ensure operator delete is called on
+ // the appropriate subclass type.
+ void deref();
+
+ class PropertyReference {
+ public:
+ PropertyReference(const StyleProperties& propertySet, unsigned index)
+ : m_propertySet(propertySet)
+ , m_index(index)
+ {
+ }
+
+ CSSPropertyID id() const { return static_cast<CSSPropertyID>(propertyMetadata().m_propertyID); }
+ CSSPropertyID shorthandID() const { return propertyMetadata().shorthandID(); }
+
+ bool isImportant() const { return propertyMetadata().m_important; }
+ bool isInherited() const { return propertyMetadata().m_inherited; }
+ bool isImplicit() const { return propertyMetadata().m_implicit; }
+
+ String cssName() const;
+ String cssText() const;
+
+ const CSSValue* value() const { return propertyValue(); }
+ // FIXME: We should try to remove this mutable overload.
+ CSSValue* value() { return const_cast<CSSValue*>(propertyValue()); }
+
+ // FIXME: Remove this.
+ CSSProperty toCSSProperty() const { return CSSProperty(propertyMetadata(), const_cast<CSSValue*>(propertyValue())); }
+ const StylePropertyMetadata& propertyMetadata() const;
+
+ private:
+ const CSSValue* propertyValue() const;
+
+ const StyleProperties& m_propertySet;
+ unsigned m_index;
+ };
+
+ unsigned propertyCount() const;
+ bool isEmpty() const;
+ PropertyReference propertyAt(unsigned index) const { return PropertyReference(*this, index); }
+
+ PassRefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
+ String getPropertyValue(CSSPropertyID) const;
+ bool propertyIsImportant(CSSPropertyID) const;
+ String getPropertyShorthand(CSSPropertyID) const;
+ bool isPropertyImplicit(CSSPropertyID) const;
+
+ PassRef<MutableStyleProperties> copyBlockProperties() const;
+
+ CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cssParserMode); }
+
+ void addSubresourceStyleURLs(ListHashSet<URL>&, StyleSheetContents* contextStyleSheet) const;
+
+ PassRef<MutableStyleProperties> mutableCopy() const;
+ PassRef<ImmutableStyleProperties> immutableCopyIfNeeded() const;
+
+ PassRef<MutableStyleProperties> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
+
+ String asText() const;
+
+ bool isMutable() const { return m_isMutable; }
+ bool hasCSSOMWrapper() const;
+
+ bool hasFailedOrCanceledSubresources() const;
+
+ static unsigned averageSizeInBytes();
+
+#ifndef NDEBUG
+ void showStyle();
+#endif
+
+ bool propertyMatches(CSSPropertyID, const CSSValue*) const;
+
+protected:
+ StyleProperties(CSSParserMode cssParserMode)
+ : m_cssParserMode(cssParserMode)
+ , m_isMutable(true)
+ , m_arraySize(0)
+ { }
+
+ StyleProperties(CSSParserMode cssParserMode, unsigned immutableArraySize)
+ : m_cssParserMode(cssParserMode)
+ , m_isMutable(false)
+ , m_arraySize(immutableArraySize)
+ { }
+
+ int findPropertyIndex(CSSPropertyID) const;
+
+ unsigned m_cssParserMode : 2;
+ mutable unsigned m_isMutable : 1;
+ unsigned m_arraySize : 29;
+
+private:
+ String getShorthandValue(const StylePropertyShorthand&) const;
+ String getCommonValue(const StylePropertyShorthand&) const;
+ enum CommonValueMode { OmitUncommonValues, ReturnNullOnUncommonValues };
+ String borderPropertyValue(CommonValueMode) const;
+ String getLayeredShorthandValue(const StylePropertyShorthand&) const;
+ String get4Values(const StylePropertyShorthand&) const;
+ String borderSpacingValue(const StylePropertyShorthand&) const;
+ String fontValue() const;
+ void appendFontLonghandValueIfExplicit(CSSPropertyID, StringBuilder& result, String& value) const;
+
+ friend class PropertySetCSSStyleDeclaration;
+};
+
+class ImmutableStyleProperties : public StyleProperties {
+public:
+ ~ImmutableStyleProperties();
+ static PassRef<ImmutableStyleProperties> create(const CSSProperty* properties, unsigned count, CSSParserMode);
+
+ unsigned propertyCount() const { return m_arraySize; }
+
+ const CSSValue** valueArray() const;
+ const StylePropertyMetadata* metadataArray() const;
+
+ void* m_storage;
+
+private:
+ ImmutableStyleProperties(const CSSProperty*, unsigned count, CSSParserMode);
+};
+
+inline const CSSValue** ImmutableStyleProperties::valueArray() const
+{
+ return reinterpret_cast<const CSSValue**>(const_cast<const void**>((&(this->m_storage))));
+}
+
+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 MutableStyleProperties : public StyleProperties {
+public:
+ static PassRef<MutableStyleProperties> create(CSSParserMode = CSSQuirksMode);
+ static PassRef<MutableStyleProperties> create(const CSSProperty* properties, unsigned count);
+
+ ~MutableStyleProperties();
+
+ unsigned propertyCount() const { return m_propertyVector.size(); }
+
+ PropertySetCSSStyleDeclaration* cssStyleDeclaration();
+
+ void addParsedProperties(const Vector<CSSProperty>&);
+ void addParsedProperty(const CSSProperty&);
+
+ // These expand shorthand properties into multiple properties.
+ bool setProperty(CSSPropertyID, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
+ void setProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important = false);
+
+ // These do not. FIXME: This is too messy, we can do better.
+ bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
+ bool setProperty(CSSPropertyID, CSSPropertyID identifier, bool important = false);
+ void appendPrefixingVariantProperty(const CSSProperty&);
+ void setPrefixingVariantProperty(const CSSProperty&);
+ void setProperty(const CSSProperty&, CSSProperty* slot = 0);
+
+ bool removeProperty(CSSPropertyID, String* returnText = 0);
+ void removePrefixedOrUnprefixedProperty(CSSPropertyID);
+ void removeBlockProperties();
+ bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
+
+ // FIXME: These two can be moved to EditingStyle.cpp
+ void removeEquivalentProperties(const StyleProperties*);
+ void removeEquivalentProperties(const ComputedStyleExtractor*);
+
+ void mergeAndOverrideOnConflict(const StyleProperties&);
+
+ void clear();
+ void parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
+
+ CSSStyleDeclaration* ensureCSSStyleDeclaration();
+ CSSStyleDeclaration* ensureInlineCSSStyleDeclaration(StyledElement* parentElement);
+
+ Vector<CSSProperty, 4> m_propertyVector;
+
+private:
+ explicit MutableStyleProperties(CSSParserMode);
+ explicit MutableStyleProperties(const StyleProperties&);
+ MutableStyleProperties(const CSSProperty* properties, unsigned count);
+
+ bool removeShorthandProperty(CSSPropertyID);
+ CSSProperty* findCSSPropertyWithID(CSSPropertyID);
+ OwnPtr<PropertySetCSSStyleDeclaration> m_cssomWrapper;
+
+ friend class StyleProperties;
+};
+
+inline const StylePropertyMetadata& StyleProperties::PropertyReference::propertyMetadata() const
+{
+ if (m_propertySet.isMutable())
+ 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 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 MutableStyleProperties*>(this)->m_propertyVector.size();
+ return m_arraySize;
+}
+
+inline bool StyleProperties::isEmpty() const
+{
+ return !propertyCount();
+}
+
+inline void StyleProperties::deref()
+{
+ if (!derefBase())
+ return;
+
+ if (m_isMutable)
+ delete static_cast<MutableStyleProperties*>(this);
+ else
+ delete static_cast<ImmutableStyleProperties*>(this);
+}
+
+} // namespace WebCore
+
+#endif // StyleProperties_h
</ins></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertySetcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/StylePropertySet.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertySet.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/StylePropertySet.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -1,1273 +0,0 @@
</span><del>-/*
- * (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "StylePropertySet.h"
-
-#include "CSSComputedStyleDeclaration.h"
-#include "CSSParser.h"
-#include "CSSValueKeywords.h"
-#include "CSSValueList.h"
-#include "CSSValuePool.h"
-#include "Document.h"
-#include "PropertySetCSSStyleDeclaration.h"
-#include "StylePropertyShorthand.h"
-#include "StyleSheetContents.h"
-#include <wtf/BitArray.h>
-#include <wtf/text/StringBuilder.h>
-
-#ifndef NDEBUG
-#include <stdio.h>
-#include <wtf/ASCIICType.h>
-#include <wtf/text/CString.h>
-#endif
-
-namespace WebCore {
-
-static size_t sizeForImmutableStylePropertySetWithPropertyCount(unsigned count)
-{
- return sizeof(ImmutableStylePropertySet) - sizeof(void*) + sizeof(CSSValue*) * count + sizeof(StylePropertyMetadata) * count;
-}
-
-static bool isInitialOrInherit(const String& value)
-{
- DEFINE_STATIC_LOCAL(String, initial, ("initial"));
- DEFINE_STATIC_LOCAL(String, inherit, ("inherit"));
- return value.length() == 7 && (value == initial || value == inherit);
-}
-
-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
-{
- 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)
-{
- m_propertyVector.reserveInitialCapacity(length);
- for (unsigned i = 0; i < length; ++i)
- m_propertyVector.uncheckedAppend(properties[i]);
-}
-
-MutableStylePropertySet::~MutableStylePropertySet()
-{
-}
-
-ImmutableStylePropertySet::ImmutableStylePropertySet(const CSSProperty* properties, unsigned length, CSSParserMode cssParserMode)
- : StylePropertySet(cssParserMode, length)
-{
- StylePropertyMetadata* metadataArray = const_cast<StylePropertyMetadata*>(this->metadataArray());
- CSSValue** valueArray = const_cast<CSSValue**>(this->valueArray());
- for (unsigned i = 0; i < length; ++i) {
- metadataArray[i] = properties[i].metadata();
- valueArray[i] = properties[i].value();
- valueArray[i]->ref();
- }
-}
-
-ImmutableStylePropertySet::~ImmutableStylePropertySet()
-{
- CSSValue** valueArray = const_cast<CSSValue**>(this->valueArray());
- for (unsigned i = 0; i < m_arraySize; ++i)
- valueArray[i]->deref();
-}
-
-MutableStylePropertySet::MutableStylePropertySet(const StylePropertySet& other)
- : StylePropertySet(other.cssParserMode())
-{
- if (other.isMutable())
- m_propertyVector = static_cast<const MutableStylePropertySet&>(other).m_propertyVector;
- else {
- m_propertyVector.reserveInitialCapacity(other.propertyCount());
- for (unsigned i = 0; i < other.propertyCount(); ++i)
- m_propertyVector.uncheckedAppend(other.propertyAt(i).toCSSProperty());
- }
-}
-
-String StylePropertySet::getPropertyValue(CSSPropertyID propertyID) const
-{
- RefPtr<CSSValue> value = getPropertyCSSValue(propertyID);
- if (value)
- return value->cssText();
-
- // Shorthand and 4-values properties
- switch (propertyID) {
- case CSSPropertyBorderSpacing:
- return borderSpacingValue(borderSpacingShorthand());
- case CSSPropertyBackgroundPosition:
- return getLayeredShorthandValue(backgroundPositionShorthand());
- case CSSPropertyBackgroundRepeat:
- return getLayeredShorthandValue(backgroundRepeatShorthand());
- case CSSPropertyBackground:
- return getLayeredShorthandValue(backgroundShorthand());
- case CSSPropertyBorder:
- return borderPropertyValue(OmitUncommonValues);
- case CSSPropertyBorderTop:
- return getShorthandValue(borderTopShorthand());
- case CSSPropertyBorderRight:
- return getShorthandValue(borderRightShorthand());
- case CSSPropertyBorderBottom:
- return getShorthandValue(borderBottomShorthand());
- case CSSPropertyBorderLeft:
- return getShorthandValue(borderLeftShorthand());
- case CSSPropertyOutline:
- return getShorthandValue(outlineShorthand());
- case CSSPropertyBorderColor:
- return get4Values(borderColorShorthand());
- case CSSPropertyBorderWidth:
- return get4Values(borderWidthShorthand());
- case CSSPropertyBorderStyle:
- return get4Values(borderStyleShorthand());
- case CSSPropertyWebkitColumnRule:
- return getShorthandValue(webkitColumnRuleShorthand());
- case CSSPropertyWebkitColumns:
- return getShorthandValue(webkitColumnsShorthand());
- case CSSPropertyWebkitFlex:
- return getShorthandValue(webkitFlexShorthand());
- case CSSPropertyWebkitFlexFlow:
- return getShorthandValue(webkitFlexFlowShorthand());
- case CSSPropertyWebkitGridArea:
- return getShorthandValue(webkitGridAreaShorthand());
- case CSSPropertyWebkitGridColumn:
- return getShorthandValue(webkitGridColumnShorthand());
- case CSSPropertyWebkitGridRow:
- return getShorthandValue(webkitGridRowShorthand());
- case CSSPropertyFont:
- return fontValue();
- case CSSPropertyMargin:
- return get4Values(marginShorthand());
- case CSSPropertyWebkitMarginCollapse:
- return getShorthandValue(webkitMarginCollapseShorthand());
- case CSSPropertyOverflow:
- return getCommonValue(overflowShorthand());
- case CSSPropertyPadding:
- return get4Values(paddingShorthand());
- case CSSPropertyTransition:
- return getLayeredShorthandValue(transitionShorthand());
- case CSSPropertyListStyle:
- return getShorthandValue(listStyleShorthand());
- case CSSPropertyWebkitMarquee:
- return getShorthandValue(webkitMarqueeShorthand());
- case CSSPropertyWebkitMaskPosition:
- return getLayeredShorthandValue(webkitMaskPositionShorthand());
- case CSSPropertyWebkitMaskRepeat:
- return getLayeredShorthandValue(webkitMaskRepeatShorthand());
- case CSSPropertyWebkitMask:
- return getLayeredShorthandValue(webkitMaskShorthand());
- case CSSPropertyWebkitTextEmphasis:
- return getShorthandValue(webkitTextEmphasisShorthand());
- case CSSPropertyWebkitTextStroke:
- return getShorthandValue(webkitTextStrokeShorthand());
- case CSSPropertyWebkitTransformOrigin:
- return getShorthandValue(webkitTransformOriginShorthand());
- case CSSPropertyWebkitTransition:
- return getLayeredShorthandValue(webkitTransitionShorthand());
- case CSSPropertyWebkitAnimation:
- return getLayeredShorthandValue(webkitAnimationShorthand());
-#if ENABLE(SVG)
- case CSSPropertyMarker: {
- RefPtr<CSSValue> value = getPropertyCSSValue(CSSPropertyMarkerStart);
- if (value)
- return value->cssText();
- return String();
- }
-#endif
- case CSSPropertyBorderRadius:
- return get4Values(borderRadiusShorthand());
- default:
- return String();
- }
-}
-
-String StylePropertySet::borderSpacingValue(const StylePropertyShorthand& shorthand) const
-{
- RefPtr<CSSValue> horizontalValue = getPropertyCSSValue(shorthand.properties()[0]);
- RefPtr<CSSValue> verticalValue = getPropertyCSSValue(shorthand.properties()[1]);
-
- // While standard border-spacing property does not allow specifying border-spacing-vertical without
- // specifying border-spacing-horizontal <http://www.w3.org/TR/CSS21/tables.html#separated-borders>,
- // -webkit-border-spacing-vertical can be set without -webkit-border-spacing-horizontal.
- if (!horizontalValue || !verticalValue)
- return String();
-
- String horizontalValueCSSText = horizontalValue->cssText();
- String verticalValueCSSText = verticalValue->cssText();
- if (horizontalValueCSSText == verticalValueCSSText)
- return horizontalValueCSSText;
- return horizontalValueCSSText + ' ' + verticalValueCSSText;
-}
-
-void StylePropertySet::appendFontLonghandValueIfExplicit(CSSPropertyID propertyID, StringBuilder& result, String& commonValue) const
-{
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex == -1)
- return; // All longhands must have at least implicit values if "font" is specified.
-
- if (propertyAt(foundPropertyIndex).isImplicit()) {
- commonValue = String();
- return;
- }
-
- char prefix = '\0';
- switch (propertyID) {
- case CSSPropertyFontStyle:
- break; // No prefix.
- case CSSPropertyFontFamily:
- case CSSPropertyFontVariant:
- case CSSPropertyFontWeight:
- prefix = ' ';
- break;
- case CSSPropertyLineHeight:
- prefix = '/';
- break;
- default:
- ASSERT_NOT_REACHED();
- }
-
- if (prefix && !result.isEmpty())
- result.append(prefix);
- String value = propertyAt(foundPropertyIndex).value()->cssText();
- result.append(value);
- if (!commonValue.isNull() && commonValue != value)
- commonValue = String();
-}
-
-String StylePropertySet::fontValue() const
-{
- int fontSizePropertyIndex = findPropertyIndex(CSSPropertyFontSize);
- int fontFamilyPropertyIndex = findPropertyIndex(CSSPropertyFontFamily);
- if (fontSizePropertyIndex == -1 || fontFamilyPropertyIndex == -1)
- return emptyString();
-
- PropertyReference fontSizeProperty = propertyAt(fontSizePropertyIndex);
- PropertyReference fontFamilyProperty = propertyAt(fontFamilyPropertyIndex);
- if (fontSizeProperty.isImplicit() || fontFamilyProperty.isImplicit())
- return emptyString();
-
- String commonValue = fontSizeProperty.value()->cssText();
- StringBuilder result;
- appendFontLonghandValueIfExplicit(CSSPropertyFontStyle, result, commonValue);
- appendFontLonghandValueIfExplicit(CSSPropertyFontVariant, result, commonValue);
- appendFontLonghandValueIfExplicit(CSSPropertyFontWeight, result, commonValue);
- if (!result.isEmpty())
- result.append(' ');
- result.append(fontSizeProperty.value()->cssText());
- appendFontLonghandValueIfExplicit(CSSPropertyLineHeight, result, commonValue);
- if (!result.isEmpty())
- result.append(' ');
- result.append(fontFamilyProperty.value()->cssText());
- if (isInitialOrInherit(commonValue))
- return commonValue;
- return result.toString();
-}
-
-String StylePropertySet::get4Values(const StylePropertyShorthand& shorthand) const
-{
- // Assume the properties are in the usual order top, right, bottom, left.
- int topValueIndex = findPropertyIndex(shorthand.properties()[0]);
- int rightValueIndex = findPropertyIndex(shorthand.properties()[1]);
- int bottomValueIndex = findPropertyIndex(shorthand.properties()[2]);
- int leftValueIndex = findPropertyIndex(shorthand.properties()[3]);
-
- if (topValueIndex == -1 || rightValueIndex == -1 || bottomValueIndex == -1 || leftValueIndex == -1)
- return String();
-
- PropertyReference top = propertyAt(topValueIndex);
- PropertyReference right = propertyAt(rightValueIndex);
- PropertyReference bottom = propertyAt(bottomValueIndex);
- PropertyReference left = propertyAt(leftValueIndex);
-
- // All 4 properties must be specified.
- if (!top.value() || !right.value() || !bottom.value() || !left.value())
- return String();
-
- if (top.isInherited() && right.isInherited() && bottom.isInherited() && left.isInherited())
- return getValueName(CSSValueInherit);
-
- if (top.value()->isInitialValue() || right.value()->isInitialValue() || bottom.value()->isInitialValue() || left.value()->isInitialValue()) {
- if (top.value()->isInitialValue() && right.value()->isInitialValue() && bottom.value()->isInitialValue() && left.value()->isInitialValue() && !top.isImplicit()) {
- // All components are "initial" and "top" is not implicit.
- return getValueName(CSSValueInitial);
- }
- return String();
- }
- if (top.isImportant() != right.isImportant() || right.isImportant() != bottom.isImportant() || bottom.isImportant() != left.isImportant())
- return String();
-
- bool showLeft = !right.value()->equals(*left.value());
- bool showBottom = !top.value()->equals(*bottom.value()) || showLeft;
- bool showRight = !top.value()->equals(*right.value()) || showBottom;
-
- StringBuilder result;
- result.append(top.value()->cssText());
- if (showRight) {
- result.append(' ');
- result.append(right.value()->cssText());
- }
- if (showBottom) {
- result.append(' ');
- result.append(bottom.value()->cssText());
- }
- if (showLeft) {
- result.append(' ');
- result.append(left.value()->cssText());
- }
- return result.toString();
-}
-
-String StylePropertySet::getLayeredShorthandValue(const StylePropertyShorthand& shorthand) const
-{
- StringBuilder result;
-
- const unsigned size = shorthand.length();
- // Begin by collecting the properties into an array.
- Vector< RefPtr<CSSValue>> values(size);
- size_t numLayers = 0;
-
- for (unsigned i = 0; i < size; ++i) {
- values[i] = getPropertyCSSValue(shorthand.properties()[i]);
- if (values[i]) {
- if (values[i]->isBaseValueList())
- numLayers = std::max(toCSSValueList(values[i].get())->length(), numLayers);
- else
- numLayers = std::max<size_t>(1U, numLayers);
- }
- }
-
- String commonValue;
- bool commonValueInitialized = false;
-
- // 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++) {
- StringBuilder layerResult;
- bool useRepeatXShorthand = false;
- bool useRepeatYShorthand = false;
- bool useSingleWordShorthand = false;
- bool foundPositionYCSSProperty = false;
- for (unsigned j = 0; j < size; j++) {
- RefPtr<CSSValue> value;
- if (values[j]) {
- if (values[j]->isBaseValueList())
- value = toCSSValueList(values[j].get())->item(i);
- else {
- value = values[j];
-
- // Color only belongs in the last layer.
- if (shorthand.properties()[j] == CSSPropertyBackgroundColor) {
- if (i != numLayers - 1)
- value = 0;
- } else if (i != 0) // Other singletons only belong in the first layer.
- value = 0;
- }
- }
-
- // We need to report background-repeat as it was written in the CSS. If the property is implicit,
- // then it was written with only one value. Here we figure out which value that was so we can
- // report back correctly.
- if ((shorthand.properties()[j] == CSSPropertyBackgroundRepeatX && isPropertyImplicit(shorthand.properties()[j]))
- || (shorthand.properties()[j] == CSSPropertyWebkitMaskRepeatX && isPropertyImplicit(shorthand.properties()[j]))) {
-
- // BUG 49055: make sure the value was not reset in the layer check just above.
- if ((j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyBackgroundRepeatY && value)
- || (j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyWebkitMaskRepeatY && value)) {
- RefPtr<CSSValue> yValue;
- RefPtr<CSSValue> nextValue = values[j + 1];
- if (nextValue->isValueList())
- yValue = toCSSValueList(nextValue.get())->itemWithoutBoundsCheck(i);
- else
- yValue = nextValue;
-
- CSSValueID xId = toCSSPrimitiveValue(value.get())->getValueID();
- CSSValueID yId = toCSSPrimitiveValue(yValue.get())->getValueID();
- if (xId != yId) {
- if (xId == CSSValueRepeat && yId == CSSValueNoRepeat) {
- useRepeatXShorthand = true;
- ++j;
- } else if (xId == CSSValueNoRepeat && yId == CSSValueRepeat) {
- useRepeatYShorthand = true;
- continue;
- }
- } else {
- useSingleWordShorthand = true;
- ++j;
- }
- }
- }
-
- String valueText;
- if (value && !value->isImplicitInitialValue()) {
- if (!layerResult.isEmpty())
- layerResult.append(' ');
- if (foundPositionYCSSProperty
- && (shorthand.properties()[j] == CSSPropertyBackgroundSize || shorthand.properties()[j] == CSSPropertyWebkitMaskSize))
- layerResult.appendLiteral("/ ");
- if (!foundPositionYCSSProperty
- && (shorthand.properties()[j] == CSSPropertyBackgroundSize || shorthand.properties()[j] == CSSPropertyWebkitMaskSize))
- continue;
-
- if (useRepeatXShorthand) {
- useRepeatXShorthand = false;
- layerResult.append(getValueName(CSSValueRepeatX));
- } else if (useRepeatYShorthand) {
- useRepeatYShorthand = false;
- layerResult.append(getValueName(CSSValueRepeatY));
- } else {
- if (useSingleWordShorthand)
- useSingleWordShorthand = false;
- valueText = value->cssText();
- layerResult.append(valueText);
- }
-
- if (shorthand.properties()[j] == CSSPropertyBackgroundPositionY
- || shorthand.properties()[j] == CSSPropertyWebkitMaskPositionY) {
- foundPositionYCSSProperty = true;
-
- // background-position is a special case: if only the first offset is specified,
- // the second one defaults to "center", not the same value.
- if (commonValueInitialized && commonValue != "initial" && commonValue != "inherit")
- commonValue = String();
- }
- }
-
- if (!commonValueInitialized) {
- commonValue = valueText;
- commonValueInitialized = true;
- } else if (!commonValue.isNull() && commonValue != valueText)
- commonValue = String();
- }
-
- if (!layerResult.isEmpty()) {
- if (!result.isEmpty())
- result.appendLiteral(", ");
- result.append(layerResult);
- }
- }
-
- if (isInitialOrInherit(commonValue))
- return commonValue;
-
- if (result.isEmpty())
- return String();
- return result.toString();
-}
-
-String StylePropertySet::getShorthandValue(const StylePropertyShorthand& shorthand) const
-{
- String commonValue;
- StringBuilder result;
- for (unsigned i = 0; i < shorthand.length(); ++i) {
- if (!isPropertyImplicit(shorthand.properties()[i])) {
- RefPtr<CSSValue> value = getPropertyCSSValue(shorthand.properties()[i]);
- if (!value)
- return String();
- String valueText = value->cssText();
- if (!i)
- commonValue = valueText;
- else if (!commonValue.isNull() && commonValue != valueText)
- commonValue = String();
- if (value->isInitialValue())
- continue;
- if (!result.isEmpty())
- result.append(' ');
- result.append(valueText);
- } else
- commonValue = String();
- }
- if (isInitialOrInherit(commonValue))
- return commonValue;
- if (result.isEmpty())
- return String();
- return result.toString();
-}
-
-// only returns a non-null value if all properties have the same, non-null value
-String StylePropertySet::getCommonValue(const StylePropertyShorthand& shorthand) const
-{
- String res;
- bool lastPropertyWasImportant = false;
- for (unsigned i = 0; i < shorthand.length(); ++i) {
- RefPtr<CSSValue> value = getPropertyCSSValue(shorthand.properties()[i]);
- // FIXME: CSSInitialValue::cssText should generate the right value.
- if (!value)
- return String();
- String text = value->cssText();
- if (text.isNull())
- return String();
- if (res.isNull())
- res = text;
- else if (res != text)
- return String();
-
- bool currentPropertyIsImportant = propertyIsImportant(shorthand.properties()[i]);
- if (i && lastPropertyWasImportant != currentPropertyIsImportant)
- return String();
- lastPropertyWasImportant = currentPropertyIsImportant;
- }
- return res;
-}
-
-String StylePropertySet::borderPropertyValue(CommonValueMode valueMode) const
-{
- const StylePropertyShorthand properties[3] = { borderWidthShorthand(), borderStyleShorthand(), borderColorShorthand() };
- String commonValue;
- StringBuilder result;
- for (size_t i = 0; i < WTF_ARRAY_LENGTH(properties); ++i) {
- String value = getCommonValue(properties[i]);
- if (value.isNull()) {
- if (valueMode == ReturnNullOnUncommonValues)
- return String();
- ASSERT(valueMode == OmitUncommonValues);
- continue;
- }
- if (!i)
- commonValue = value;
- else if (!commonValue.isNull() && commonValue != value)
- commonValue = String();
- if (value == "initial")
- continue;
- if (!result.isEmpty())
- result.append(' ');
- result.append(value);
- }
- if (isInitialOrInherit(commonValue))
- return commonValue;
- return result.isEmpty() ? String() : result.toString();
-}
-
-PassRefPtr<CSSValue> StylePropertySet::getPropertyCSSValue(CSSPropertyID propertyID) const
-{
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex == -1)
- return 0;
- return propertyAt(foundPropertyIndex).value();
-}
-
-bool MutableStylePropertySet::removeShorthandProperty(CSSPropertyID propertyID)
-{
- StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
- if (!shorthand.length())
- return false;
-
- bool ret = removePropertiesInSet(shorthand.properties(), shorthand.length());
-
- CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(propertyID);
- if (prefixingVariant == propertyID)
- return ret;
-
- StylePropertyShorthand shorthandPrefixingVariant = shorthandForProperty(prefixingVariant);
- return removePropertiesInSet(shorthandPrefixingVariant.properties(), shorthandPrefixingVariant.length());
-}
-
-bool MutableStylePropertySet::removeProperty(CSSPropertyID propertyID, String* returnText)
-{
- if (removeShorthandProperty(propertyID)) {
- // FIXME: Return an equivalent shorthand when possible.
- if (returnText)
- *returnText = "";
- return true;
- }
-
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex == -1) {
- if (returnText)
- *returnText = "";
- return false;
- }
-
- if (returnText)
- *returnText = propertyAt(foundPropertyIndex).value()->cssText();
-
- // A more efficient removal strategy would involve marking entries as empty
- // and sweeping them when the vector grows too big.
- m_propertyVector.remove(foundPropertyIndex);
-
- removePrefixedOrUnprefixedProperty(propertyID);
-
- return true;
-}
-
-void MutableStylePropertySet::removePrefixedOrUnprefixedProperty(CSSPropertyID propertyID)
-{
- int foundPropertyIndex = findPropertyIndex(prefixingVariantForPropertyId(propertyID));
- if (foundPropertyIndex == -1)
- return;
- m_propertyVector.remove(foundPropertyIndex);
-}
-
-bool StylePropertySet::propertyIsImportant(CSSPropertyID propertyID) const
-{
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex != -1)
- return propertyAt(foundPropertyIndex).isImportant();
-
- StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
- if (!shorthand.length())
- return false;
-
- for (unsigned i = 0; i < shorthand.length(); ++i) {
- if (!propertyIsImportant(shorthand.properties()[i]))
- return false;
- }
- return true;
-}
-
-String StylePropertySet::getPropertyShorthand(CSSPropertyID propertyID) const
-{
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex == -1)
- return String();
- return getPropertyNameString(propertyAt(foundPropertyIndex).shorthandID());
-}
-
-bool StylePropertySet::isPropertyImplicit(CSSPropertyID propertyID) const
-{
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex == -1)
- return false;
- return propertyAt(foundPropertyIndex).isImplicit();
-}
-
-bool MutableStylePropertySet::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.
- // Setting it to null seems to produce less consistent results, but we treat it just the same.
- if (value.isEmpty())
- return removeProperty(propertyID);
-
- // When replacing an existing property value, this moves the property to the end of the list.
- // Firefox preserves the position, and MSIE moves the property to the beginning.
- return CSSParser::parseValue(this, propertyID, value, important, cssParserMode(), contextStyleSheet);
-}
-
-void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, PassRefPtr<CSSValue> prpValue, bool important)
-{
- StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
- if (!shorthand.length()) {
- setProperty(CSSProperty(propertyID, prpValue, important));
- return;
- }
-
- removePropertiesInSet(shorthand.properties(), shorthand.length());
-
- RefPtr<CSSValue> value = prpValue;
- for (unsigned i = 0; i < shorthand.length(); ++i)
- m_propertyVector.append(CSSProperty(shorthand.properties()[i], value, important));
-}
-
-void MutableStylePropertySet::setProperty(const CSSProperty& property, CSSProperty* slot)
-{
- if (!removeShorthandProperty(property.id())) {
- CSSProperty* toReplace = slot ? slot : findCSSPropertyWithID(property.id());
- if (toReplace) {
- *toReplace = property;
- setPrefixingVariantProperty(property);
- return;
- }
- }
- appendPrefixingVariantProperty(property);
-}
-
-static unsigned getIndexInShorthandVectorForPrefixingVariant(const CSSProperty& property, CSSPropertyID prefixingVariant)
-{
- if (!property.isSetFromShorthand())
- return 0;
-
- CSSPropertyID prefixedShorthand = prefixingVariantForPropertyId(property.shorthandID());
- return indexOfShorthandForLonghand(prefixedShorthand, matchingShorthandsForLonghand(prefixingVariant));
-}
-
-void MutableStylePropertySet::appendPrefixingVariantProperty(const CSSProperty& property)
-{
- m_propertyVector.append(property);
- CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
- if (prefixingVariant == property.id())
- return;
-
- m_propertyVector.append(CSSProperty(prefixingVariant, property.value(), property.isImportant(), property.isSetFromShorthand(), getIndexInShorthandVectorForPrefixingVariant(property, prefixingVariant), property.metadata().m_implicit));
-}
-
-void MutableStylePropertySet::setPrefixingVariantProperty(const CSSProperty& property)
-{
- CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
- CSSProperty* toReplace = findCSSPropertyWithID(prefixingVariant);
- if (toReplace && prefixingVariant != property.id())
- *toReplace = CSSProperty(prefixingVariant, property.value(), property.isImportant(), property.isSetFromShorthand(), getIndexInShorthandVectorForPrefixingVariant(property, prefixingVariant), property.metadata().m_implicit);
-}
-
-bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSValueID identifier, bool important)
-{
- setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important));
- return true;
-}
-
-bool MutableStylePropertySet::setProperty(CSSPropertyID propertyID, CSSPropertyID identifier, bool important)
-{
- setProperty(CSSProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important));
- return true;
-}
-
-void MutableStylePropertySet::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
-{
- m_propertyVector.clear();
-
- CSSParserContext context(cssParserMode());
- if (contextStyleSheet) {
- context = contextStyleSheet->parserContext();
- context.mode = cssParserMode();
- }
- CSSParser parser(context);
- parser.parseDeclaration(this, styleDeclaration, 0, contextStyleSheet);
-}
-
-void MutableStylePropertySet::addParsedProperties(const Vector<CSSProperty>& properties)
-{
- m_propertyVector.reserveCapacity(m_propertyVector.size() + properties.size());
- for (unsigned i = 0; i < properties.size(); ++i)
- addParsedProperty(properties[i]);
-}
-
-void MutableStylePropertySet::addParsedProperty(const CSSProperty& property)
-{
- // Only add properties that have no !important counterpart present
- if (!propertyIsImportant(property.id()) || property.isImportant())
- setProperty(property);
-}
-
-String StylePropertySet::asText() const
-{
- StringBuilder result;
-
- int positionXPropertyIndex = -1;
- int positionYPropertyIndex = -1;
- int repeatXPropertyIndex = -1;
- int repeatYPropertyIndex = -1;
-
- BitArray<numCSSProperties> shorthandPropertyUsed;
- BitArray<numCSSProperties> shorthandPropertyAppeared;
-
- unsigned size = propertyCount();
- unsigned numDecls = 0;
- for (unsigned n = 0; n < size; ++n) {
- PropertyReference property = propertyAt(n);
- CSSPropertyID propertyID = property.id();
- CSSPropertyID shorthandPropertyID = CSSPropertyInvalid;
- CSSPropertyID borderFallbackShorthandProperty = CSSPropertyInvalid;
- String value;
-
- switch (propertyID) {
- case CSSPropertyBackgroundPositionX:
- positionXPropertyIndex = n;
- continue;
- case CSSPropertyBackgroundPositionY:
- positionYPropertyIndex = n;
- continue;
- case CSSPropertyBackgroundRepeatX:
- repeatXPropertyIndex = n;
- continue;
- case CSSPropertyBackgroundRepeatY:
- repeatYPropertyIndex = n;
- continue;
- case CSSPropertyBorderTopWidth:
- case CSSPropertyBorderRightWidth:
- case CSSPropertyBorderBottomWidth:
- case CSSPropertyBorderLeftWidth:
- if (!borderFallbackShorthandProperty)
- borderFallbackShorthandProperty = CSSPropertyBorderWidth;
- case CSSPropertyBorderTopStyle:
- case CSSPropertyBorderRightStyle:
- case CSSPropertyBorderBottomStyle:
- case CSSPropertyBorderLeftStyle:
- if (!borderFallbackShorthandProperty)
- borderFallbackShorthandProperty = CSSPropertyBorderStyle;
- case CSSPropertyBorderTopColor:
- case CSSPropertyBorderRightColor:
- case CSSPropertyBorderBottomColor:
- case CSSPropertyBorderLeftColor:
- if (!borderFallbackShorthandProperty)
- borderFallbackShorthandProperty = CSSPropertyBorderColor;
-
- // FIXME: Deal with cases where only some of border-(top|right|bottom|left) are specified.
- if (!shorthandPropertyAppeared.get(CSSPropertyBorder - firstCSSProperty)) {
- value = borderPropertyValue(ReturnNullOnUncommonValues);
- if (value.isNull())
- shorthandPropertyAppeared.set(CSSPropertyBorder - firstCSSProperty);
- else
- shorthandPropertyID = CSSPropertyBorder;
- } else if (shorthandPropertyUsed.get(CSSPropertyBorder - firstCSSProperty))
- shorthandPropertyID = CSSPropertyBorder;
- if (!shorthandPropertyID)
- shorthandPropertyID = borderFallbackShorthandProperty;
- break;
- case CSSPropertyWebkitBorderHorizontalSpacing:
- case CSSPropertyWebkitBorderVerticalSpacing:
- shorthandPropertyID = CSSPropertyBorderSpacing;
- break;
- case CSSPropertyFontFamily:
- case CSSPropertyLineHeight:
- case CSSPropertyFontSize:
- case CSSPropertyFontStyle:
- case CSSPropertyFontVariant:
- case CSSPropertyFontWeight:
- // Don't use CSSPropertyFont because old UAs can't recognize them but are important for editing.
- break;
- case CSSPropertyListStyleType:
- case CSSPropertyListStylePosition:
- case CSSPropertyListStyleImage:
- shorthandPropertyID = CSSPropertyListStyle;
- break;
- case CSSPropertyMarginTop:
- case CSSPropertyMarginRight:
- case CSSPropertyMarginBottom:
- case CSSPropertyMarginLeft:
- shorthandPropertyID = CSSPropertyMargin;
- break;
- case CSSPropertyOutlineWidth:
- case CSSPropertyOutlineStyle:
- case CSSPropertyOutlineColor:
- shorthandPropertyID = CSSPropertyOutline;
- break;
- case CSSPropertyOverflowX:
- case CSSPropertyOverflowY:
- shorthandPropertyID = CSSPropertyOverflow;
- break;
- case CSSPropertyPaddingTop:
- case CSSPropertyPaddingRight:
- case CSSPropertyPaddingBottom:
- case CSSPropertyPaddingLeft:
- shorthandPropertyID = CSSPropertyPadding;
- break;
- case CSSPropertyTransitionProperty:
- case CSSPropertyTransitionDuration:
- case CSSPropertyTransitionTimingFunction:
- case CSSPropertyTransitionDelay:
- shorthandPropertyID = CSSPropertyTransition;
- break;
- case CSSPropertyWebkitAnimationName:
- case CSSPropertyWebkitAnimationDuration:
- case CSSPropertyWebkitAnimationTimingFunction:
- case CSSPropertyWebkitAnimationDelay:
- case CSSPropertyWebkitAnimationIterationCount:
- case CSSPropertyWebkitAnimationDirection:
- case CSSPropertyWebkitAnimationFillMode:
- shorthandPropertyID = CSSPropertyWebkitAnimation;
- break;
- case CSSPropertyWebkitFlexDirection:
- case CSSPropertyWebkitFlexWrap:
- shorthandPropertyID = CSSPropertyWebkitFlexFlow;
- break;
- case CSSPropertyWebkitFlexBasis:
- case CSSPropertyWebkitFlexGrow:
- case CSSPropertyWebkitFlexShrink:
- shorthandPropertyID = CSSPropertyWebkitFlex;
- break;
- case CSSPropertyWebkitMaskPositionX:
- case CSSPropertyWebkitMaskPositionY:
- case CSSPropertyWebkitMaskRepeatX:
- case CSSPropertyWebkitMaskRepeatY:
- case CSSPropertyWebkitMaskImage:
- case CSSPropertyWebkitMaskRepeat:
- case CSSPropertyWebkitMaskPosition:
- case CSSPropertyWebkitMaskClip:
- case CSSPropertyWebkitMaskOrigin:
- shorthandPropertyID = CSSPropertyWebkitMask;
- break;
- case CSSPropertyWebkitTransformOriginX:
- case CSSPropertyWebkitTransformOriginY:
- case CSSPropertyWebkitTransformOriginZ:
- shorthandPropertyID = CSSPropertyWebkitTransformOrigin;
- break;
- case CSSPropertyWebkitTransitionProperty:
- case CSSPropertyWebkitTransitionDuration:
- case CSSPropertyWebkitTransitionTimingFunction:
- case CSSPropertyWebkitTransitionDelay:
- shorthandPropertyID = CSSPropertyWebkitTransition;
- break;
- default:
- break;
- }
-
- unsigned shortPropertyIndex = shorthandPropertyID - firstCSSProperty;
- if (shorthandPropertyID) {
- if (shorthandPropertyUsed.get(shortPropertyIndex))
- continue;
- if (!shorthandPropertyAppeared.get(shortPropertyIndex) && value.isNull())
- value = getPropertyValue(shorthandPropertyID);
- shorthandPropertyAppeared.set(shortPropertyIndex);
- }
-
- if (!value.isNull()) {
- propertyID = shorthandPropertyID;
- shorthandPropertyUsed.set(shortPropertyIndex);
- } else
- value = property.value()->cssText();
-
- if (value == "initial" && !CSSProperty::isInheritedProperty(propertyID))
- continue;
-
- if (numDecls++)
- result.append(' ');
- result.append(getPropertyName(propertyID));
- result.appendLiteral(": ");
- result.append(value);
- if (property.isImportant())
- result.appendLiteral(" !important");
- result.append(';');
- }
-
- // FIXME: This is a not-so-nice way to turn x/y positions into single background-position in output.
- // It is required because background-position-x/y are non-standard properties and WebKit generated output
- // would not work in Firefox (<rdar://problem/5143183>)
- // It would be a better solution if background-position was CSS_PAIR.
- if (positionXPropertyIndex != -1 && positionYPropertyIndex != -1 && propertyAt(positionXPropertyIndex).isImportant() == propertyAt(positionYPropertyIndex).isImportant()) {
- PropertyReference positionXProperty = propertyAt(positionXPropertyIndex);
- PropertyReference positionYProperty = propertyAt(positionYPropertyIndex);
-
- if (numDecls++)
- result.append(' ');
- result.appendLiteral("background-position: ");
- if (positionXProperty.value()->isValueList() || positionYProperty.value()->isValueList())
- result.append(getLayeredShorthandValue(backgroundPositionShorthand()));
- else {
- result.append(positionXProperty.value()->cssText());
- result.append(' ');
- result.append(positionYProperty.value()->cssText());
- }
- if (positionXProperty.isImportant())
- result.appendLiteral(" !important");
- result.append(';');
- } else {
- if (positionXPropertyIndex != -1) {
- if (numDecls++)
- result.append(' ');
- result.append(propertyAt(positionXPropertyIndex).cssText());
- }
- if (positionYPropertyIndex != -1) {
- if (numDecls++)
- result.append(' ');
- result.append(propertyAt(positionYPropertyIndex).cssText());
- }
- }
-
- // FIXME: We need to do the same for background-repeat.
- if (repeatXPropertyIndex != -1 && repeatYPropertyIndex != -1 && propertyAt(repeatXPropertyIndex).isImportant() == propertyAt(repeatYPropertyIndex).isImportant()) {
- PropertyReference repeatXProperty = propertyAt(repeatXPropertyIndex);
- PropertyReference repeatYProperty = propertyAt(repeatYPropertyIndex);
-
- if (numDecls++)
- result.append(' ');
- result.appendLiteral("background-repeat: ");
- if (repeatXProperty.value()->isValueList() || repeatYProperty.value()->isValueList())
- result.append(getLayeredShorthandValue(backgroundRepeatShorthand()));
- else {
- result.append(repeatXProperty.value()->cssText());
- result.append(' ');
- result.append(repeatYProperty.value()->cssText());
- }
- if (repeatXProperty.isImportant())
- result.appendLiteral(" !important");
- result.append(';');
- } else {
- if (repeatXPropertyIndex != -1) {
- if (numDecls++)
- result.append(' ');
- result.append(propertyAt(repeatXPropertyIndex).cssText());
- }
- if (repeatYPropertyIndex != -1) {
- if (numDecls++)
- result.append(' ');
- result.append(propertyAt(repeatYPropertyIndex).cssText());
- }
- }
-
- ASSERT(!numDecls ^ !result.isEmpty());
- return result.toString();
-}
-
-bool StylePropertySet::hasCSSOMWrapper() const
-{
- return m_isMutable && static_cast<const MutableStylePropertySet*>(this)->m_cssomWrapper;
-}
-
-void MutableStylePropertySet::mergeAndOverrideOnConflict(const StylePropertySet& other)
-{
- unsigned size = other.propertyCount();
- for (unsigned i = 0; i < size; ++i)
- addParsedProperty(other.propertyAt(i).toCSSProperty());
-}
-
-void StylePropertySet::addSubresourceStyleURLs(ListHashSet<URL>& urls, StyleSheetContents* contextStyleSheet) const
-{
- unsigned size = propertyCount();
- for (unsigned i = 0; i < size; ++i)
- propertyAt(i).value()->addSubresourceStyleURLs(urls, contextStyleSheet);
-}
-
-bool StylePropertySet::hasFailedOrCanceledSubresources() const
-{
- unsigned size = propertyCount();
- for (unsigned i = 0; i < size; ++i) {
- if (propertyAt(i).value()->hasFailedOrCanceledSubresources())
- return true;
- }
- return false;
-}
-
-// This is the list of properties we want to copy in the copyBlockProperties() function.
-// It is the list of CSS properties that apply specially to block-level elements.
-static const CSSPropertyID blockProperties[] = {
- CSSPropertyOrphans,
- CSSPropertyOverflow, // This can be also be applied to replaced elements
- CSSPropertyWebkitAspectRatio,
- CSSPropertyWebkitColumnCount,
- CSSPropertyWebkitColumnGap,
- CSSPropertyWebkitColumnRuleColor,
- CSSPropertyWebkitColumnRuleStyle,
- CSSPropertyWebkitColumnRuleWidth,
- CSSPropertyWebkitColumnBreakBefore,
- CSSPropertyWebkitColumnBreakAfter,
- CSSPropertyWebkitColumnBreakInside,
- CSSPropertyWebkitColumnWidth,
- CSSPropertyPageBreakAfter,
- CSSPropertyPageBreakBefore,
- CSSPropertyPageBreakInside,
-#if ENABLE(CSS_REGIONS)
- CSSPropertyWebkitRegionBreakAfter,
- CSSPropertyWebkitRegionBreakBefore,
- CSSPropertyWebkitRegionBreakInside,
-#endif
- CSSPropertyTextAlign,
-#if ENABLE(CSS3_TEXT)
- CSSPropertyWebkitTextAlignLast,
- CSSPropertyWebkitTextJustify,
-#endif // CSS3_TEXT
- CSSPropertyTextIndent,
- CSSPropertyWidows
-};
-
-void MutableStylePropertySet::clear()
-{
- m_propertyVector.clear();
-}
-
-const unsigned numBlockProperties = WTF_ARRAY_LENGTH(blockProperties);
-
-PassRef<MutableStylePropertySet> StylePropertySet::copyBlockProperties() const
-{
- return copyPropertiesInSet(blockProperties, numBlockProperties);
-}
-
-void MutableStylePropertySet::removeBlockProperties()
-{
- removePropertiesInSet(blockProperties, numBlockProperties);
-}
-
-bool MutableStylePropertySet::removePropertiesInSet(const CSSPropertyID* set, unsigned length)
-{
- if (m_propertyVector.isEmpty())
- return false;
-
- // FIXME: This is always used with static sets and in that case constructing the hash repeatedly is pretty pointless.
- HashSet<CSSPropertyID> toRemove;
- for (unsigned i = 0; i < length; ++i)
- toRemove.add(set[i]);
-
- Vector<CSSProperty> newProperties;
- newProperties.reserveInitialCapacity(m_propertyVector.size());
-
- unsigned size = m_propertyVector.size();
- for (unsigned n = 0; n < size; ++n) {
- const CSSProperty& property = m_propertyVector.at(n);
- // Not quite sure if the isImportant test is needed but it matches the existing behavior.
- if (!property.isImportant()) {
- if (toRemove.contains(property.id()))
- continue;
- }
- newProperties.append(property);
- }
-
- bool changed = newProperties.size() != m_propertyVector.size();
- m_propertyVector = newProperties;
- return changed;
-}
-
-int StylePropertySet::findPropertyIndex(CSSPropertyID propertyID) const
-{
- // Convert here propertyID into an uint16_t to compare it with the metadata's m_propertyID to avoid
- // the compiler converting it to an int multiple times in the loop.
- uint16_t id = static_cast<uint16_t>(propertyID);
- for (int n = propertyCount() - 1 ; n >= 0; --n) {
- if (id == propertyAt(n).propertyMetadata().m_propertyID)
- return n;
- }
- return -1;
-}
-
-CSSProperty* MutableStylePropertySet::findCSSPropertyWithID(CSSPropertyID propertyID)
-{
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex == -1)
- return 0;
- return &m_propertyVector.at(foundPropertyIndex);
-}
-
-bool StylePropertySet::propertyMatches(CSSPropertyID propertyID, const CSSValue* propertyValue) const
-{
- int foundPropertyIndex = findPropertyIndex(propertyID);
- if (foundPropertyIndex == -1)
- return false;
- return propertyAt(foundPropertyIndex).value()->equals(*propertyValue);
-}
-
-void MutableStylePropertySet::removeEquivalentProperties(const StylePropertySet* style)
-{
- Vector<CSSPropertyID> propertiesToRemove;
- unsigned size = m_propertyVector.size();
- for (unsigned i = 0; i < size; ++i) {
- PropertyReference property = propertyAt(i);
- if (style->propertyMatches(property.id(), property.value()))
- propertiesToRemove.append(property.id());
- }
- // FIXME: This should use mass removal.
- for (unsigned i = 0; i < propertiesToRemove.size(); ++i)
- removeProperty(propertiesToRemove[i]);
-}
-
-void MutableStylePropertySet::removeEquivalentProperties(const ComputedStyleExtractor* computedStyle)
-{
- Vector<CSSPropertyID> propertiesToRemove;
- unsigned size = m_propertyVector.size();
- for (unsigned i = 0; i < size; ++i) {
- PropertyReference property = propertyAt(i);
- if (computedStyle->propertyMatches(property.id(), property.value()))
- propertiesToRemove.append(property.id());
- }
- // FIXME: This should use mass removal.
- for (unsigned i = 0; i < propertiesToRemove.size(); ++i)
- removeProperty(propertiesToRemove[i]);
-}
-
-PassRef<MutableStylePropertySet> StylePropertySet::mutableCopy() const
-{
- return adoptRef(*new MutableStylePropertySet(*this));
-}
-
-PassRef<MutableStylePropertySet> StylePropertySet::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const
-{
- Vector<CSSProperty, 256> list;
- list.reserveInitialCapacity(length);
- for (unsigned i = 0; i < length; ++i) {
- RefPtr<CSSValue> value = getPropertyCSSValue(set[i]);
- if (value)
- list.append(CSSProperty(set[i], value.release(), false));
- }
- return MutableStylePropertySet::create(list.data(), list.size());
-}
-
-PropertySetCSSStyleDeclaration* MutableStylePropertySet::cssStyleDeclaration()
-{
- return m_cssomWrapper.get();
-}
-
-CSSStyleDeclaration* MutableStylePropertySet::ensureCSSStyleDeclaration()
-{
- if (m_cssomWrapper) {
- ASSERT(!static_cast<CSSStyleDeclaration*>(m_cssomWrapper.get())->parentRule());
- ASSERT(!m_cssomWrapper->parentElement());
- return m_cssomWrapper.get();
- }
- m_cssomWrapper = adoptPtr(new PropertySetCSSStyleDeclaration(this));
- return m_cssomWrapper.get();
-}
-
-CSSStyleDeclaration* MutableStylePropertySet::ensureInlineCSSStyleDeclaration(StyledElement* parentElement)
-{
- if (m_cssomWrapper) {
- ASSERT(m_cssomWrapper->parentElement() == parentElement);
- return m_cssomWrapper.get();
- }
- m_cssomWrapper = adoptPtr(new InlineCSSStyleDeclaration(this, parentElement));
- return m_cssomWrapper.get();
-}
-
-unsigned StylePropertySet::averageSizeInBytes()
-{
- // Please update this if the storage scheme changes so that this longer reflects the actual size.
- return sizeForImmutableStylePropertySetWithPropertyCount(4);
-}
-
-// See the function above if you need to update this.
-struct SameSizeAsStylePropertySet : public RefCounted<SameSizeAsStylePropertySet> {
- unsigned bitfield;
-};
-COMPILE_ASSERT(sizeof(StylePropertySet) == sizeof(SameSizeAsStylePropertySet), style_property_set_should_stay_small);
-
-#ifndef NDEBUG
-void StylePropertySet::showStyle()
-{
- fprintf(stderr, "%s\n", asText().ascii().data());
-}
-#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
-{
- return getPropertyNameString(id());
-}
-
-String StylePropertySet::PropertyReference::cssText() const
-{
- StringBuilder result;
- result.append(cssName());
- result.appendLiteral(": ");
- result.append(propertyValue()->cssText());
- if (isImportant())
- result.appendLiteral(" !important");
- result.append(';');
- return result.toString();
-}
-
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertySeth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/StylePropertySet.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertySet.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/StylePropertySet.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -1,277 +0,0 @@
</span><del>-/*
- * (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2008, 2012, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef StylePropertySet_h
-#define StylePropertySet_h
-
-#include "CSSParserMode.h"
-#include "CSSPrimitiveValue.h"
-#include "CSSProperty.h"
-#include "CSSPropertyNames.h"
-#include "CSSValueKeywords.h"
-#include <wtf/ListHashSet.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class CSSRule;
-class CSSStyleDeclaration;
-class ComputedStyleExtractor;
-class ImmutableStylePropertySet;
-class URL;
-class MutableStylePropertySet;
-class PropertySetCSSStyleDeclaration;
-class StyledElement;
-class StylePropertyShorthand;
-class StyleSheetContents;
-
-class StylePropertySet : public RefCounted<StylePropertySet> {
- friend class PropertyReference;
-public:
- // Override RefCounted's deref() to ensure operator delete is called on
- // the appropriate subclass type.
- void deref();
-
- class PropertyReference {
- public:
- PropertyReference(const StylePropertySet& propertySet, unsigned index)
- : m_propertySet(propertySet)
- , m_index(index)
- {
- }
-
- CSSPropertyID id() const { return static_cast<CSSPropertyID>(propertyMetadata().m_propertyID); }
- CSSPropertyID shorthandID() const { return propertyMetadata().shorthandID(); }
-
- bool isImportant() const { return propertyMetadata().m_important; }
- bool isInherited() const { return propertyMetadata().m_inherited; }
- bool isImplicit() const { return propertyMetadata().m_implicit; }
-
- String cssName() const;
- String cssText() const;
-
- const CSSValue* value() const { return propertyValue(); }
- // FIXME: We should try to remove this mutable overload.
- CSSValue* value() { return const_cast<CSSValue*>(propertyValue()); }
-
- // FIXME: Remove this.
- CSSProperty toCSSProperty() const { return CSSProperty(propertyMetadata(), const_cast<CSSValue*>(propertyValue())); }
- const StylePropertyMetadata& propertyMetadata() const;
-
- private:
- const CSSValue* propertyValue() const;
-
- const StylePropertySet& m_propertySet;
- unsigned m_index;
- };
-
- unsigned propertyCount() const;
- bool isEmpty() const;
- PropertyReference propertyAt(unsigned index) const { return PropertyReference(*this, index); }
-
- PassRefPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
- String getPropertyValue(CSSPropertyID) const;
- bool propertyIsImportant(CSSPropertyID) const;
- String getPropertyShorthand(CSSPropertyID) const;
- bool isPropertyImplicit(CSSPropertyID) const;
-
- PassRef<MutableStylePropertySet> copyBlockProperties() const;
-
- CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cssParserMode); }
-
- void addSubresourceStyleURLs(ListHashSet<URL>&, StyleSheetContents* contextStyleSheet) const;
-
- PassRef<MutableStylePropertySet> mutableCopy() const;
- PassRef<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
-
- PassRef<MutableStylePropertySet> copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const;
-
- String asText() const;
-
- bool isMutable() const { return m_isMutable; }
- bool hasCSSOMWrapper() const;
-
- bool hasFailedOrCanceledSubresources() const;
-
- static unsigned averageSizeInBytes();
-
-#ifndef NDEBUG
- void showStyle();
-#endif
-
- bool propertyMatches(CSSPropertyID, const CSSValue*) const;
-
-protected:
- StylePropertySet(CSSParserMode cssParserMode)
- : m_cssParserMode(cssParserMode)
- , m_isMutable(true)
- , m_arraySize(0)
- { }
-
- StylePropertySet(CSSParserMode cssParserMode, unsigned immutableArraySize)
- : m_cssParserMode(cssParserMode)
- , m_isMutable(false)
- , m_arraySize(immutableArraySize)
- { }
-
- int findPropertyIndex(CSSPropertyID) const;
-
- unsigned m_cssParserMode : 2;
- mutable unsigned m_isMutable : 1;
- unsigned m_arraySize : 29;
-
-private:
- String getShorthandValue(const StylePropertyShorthand&) const;
- String getCommonValue(const StylePropertyShorthand&) const;
- enum CommonValueMode { OmitUncommonValues, ReturnNullOnUncommonValues };
- String borderPropertyValue(CommonValueMode) const;
- String getLayeredShorthandValue(const StylePropertyShorthand&) const;
- String get4Values(const StylePropertyShorthand&) const;
- String borderSpacingValue(const StylePropertyShorthand&) const;
- String fontValue() const;
- void appendFontLonghandValueIfExplicit(CSSPropertyID, StringBuilder& result, String& value) const;
-
- friend class PropertySetCSSStyleDeclaration;
-};
-
-class ImmutableStylePropertySet : public StylePropertySet {
-public:
- ~ImmutableStylePropertySet();
- static PassRef<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
-
- unsigned propertyCount() const { return m_arraySize; }
-
- const CSSValue** valueArray() const;
- const StylePropertyMetadata* metadataArray() const;
-
- void* m_storage;
-
-private:
- ImmutableStylePropertySet(const CSSProperty*, unsigned count, CSSParserMode);
-};
-
-inline const CSSValue** ImmutableStylePropertySet::valueArray() const
-{
- return reinterpret_cast<const CSSValue**>(const_cast<const void**>((&(this->m_storage))));
-}
-
-inline const StylePropertyMetadata* ImmutableStylePropertySet::metadataArray() const
-{
- return reinterpret_cast_ptr<const StylePropertyMetadata*>(&reinterpret_cast_ptr<const char*>(&(this->m_storage))[m_arraySize * sizeof(CSSValue*)]);
-}
-
-class MutableStylePropertySet : public StylePropertySet {
-public:
- static PassRef<MutableStylePropertySet> create(CSSParserMode = CSSQuirksMode);
- static PassRef<MutableStylePropertySet> create(const CSSProperty* properties, unsigned count);
-
- ~MutableStylePropertySet();
-
- unsigned propertyCount() const { return m_propertyVector.size(); }
-
- PropertySetCSSStyleDeclaration* cssStyleDeclaration();
-
- void addParsedProperties(const Vector<CSSProperty>&);
- void addParsedProperty(const CSSProperty&);
-
- // These expand shorthand properties into multiple properties.
- bool setProperty(CSSPropertyID, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
- void setProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important = false);
-
- // These do not. FIXME: This is too messy, we can do better.
- bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
- bool setProperty(CSSPropertyID, CSSPropertyID identifier, bool important = false);
- void appendPrefixingVariantProperty(const CSSProperty&);
- void setPrefixingVariantProperty(const CSSProperty&);
- void setProperty(const CSSProperty&, CSSProperty* slot = 0);
-
- bool removeProperty(CSSPropertyID, String* returnText = 0);
- void removePrefixedOrUnprefixedProperty(CSSPropertyID);
- void removeBlockProperties();
- bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
-
- // FIXME: These two can be moved to EditingStyle.cpp
- void removeEquivalentProperties(const StylePropertySet*);
- void removeEquivalentProperties(const ComputedStyleExtractor*);
-
- void mergeAndOverrideOnConflict(const StylePropertySet&);
-
- void clear();
- void parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
-
- CSSStyleDeclaration* ensureCSSStyleDeclaration();
- CSSStyleDeclaration* ensureInlineCSSStyleDeclaration(StyledElement* parentElement);
-
- Vector<CSSProperty, 4> m_propertyVector;
-
-private:
- explicit MutableStylePropertySet(CSSParserMode);
- explicit MutableStylePropertySet(const StylePropertySet&);
- MutableStylePropertySet(const CSSProperty* properties, unsigned count);
-
- bool removeShorthandProperty(CSSPropertyID);
- CSSProperty* findCSSPropertyWithID(CSSPropertyID);
- OwnPtr<PropertySetCSSStyleDeclaration> m_cssomWrapper;
-
- friend class StylePropertySet;
-};
-
-inline const StylePropertyMetadata& StylePropertySet::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
-{
- 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
-{
- if (m_isMutable)
- return static_cast<const MutableStylePropertySet*>(this)->m_propertyVector.size();
- return m_arraySize;
-}
-
-inline bool StylePropertySet::isEmpty() const
-{
- return !propertyCount();
-}
-
-inline void StylePropertySet::deref()
-{
- if (!derefBase())
- return;
-
- if (m_isMutable)
- delete static_cast<MutableStylePropertySet*>(this);
- else
- delete static_cast<ImmutableStylePropertySet*>(this);
-}
-
-} // namespace WebCore
-
-#endif // StylePropertySet_h
</del></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> #include "StyleFontSizeFunctions.h"
</span><span class="cx"> #include "StyleGeneratedImage.h"
</span><span class="cx"> #include "StylePendingImage.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleRuleImport.h"
</span><span class="lines">@@ -232,11 +232,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::MatchResult::addMatchedProperties(const StylePropertySet& properties, StyleRule* rule, unsigned linkMatchType, PropertyWhitelistType propertyWhitelistType)
</del><ins>+void StyleResolver::MatchResult::addMatchedProperties(const StyleProperties& properties, StyleRule* rule, unsigned linkMatchType, PropertyWhitelistType propertyWhitelistType)
</ins><span class="cx"> {
</span><span class="cx"> matchedProperties.grow(matchedProperties.size() + 1);
</span><span class="cx"> StyleResolver::MatchedProperties& newProperties = matchedProperties.last();
</span><del>- newProperties.properties = const_cast<StylePropertySet*>(&properties);
</del><ins>+ newProperties.properties = const_cast<StyleProperties*>(&properties);
</ins><span class="cx"> newProperties.linkMatchType = linkMatchType;
</span><span class="cx"> newProperties.whitelistType = propertyWhitelistType;
</span><span class="cx"> matchedRules.append(rule);
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx"> if (initialListSize > 0 && list[0].key()) {
</span><span class="cx"> static StyleKeyframe* zeroPercentKeyframe;
</span><span class="cx"> if (!zeroPercentKeyframe) {
</span><del>- zeroPercentKeyframe = StyleKeyframe::create(MutableStylePropertySet::create()).leakRef();
</del><ins>+ zeroPercentKeyframe = StyleKeyframe::create(MutableStyleProperties::create()).leakRef();
</ins><span class="cx"> zeroPercentKeyframe->setKeyText("0%");
</span><span class="cx"> }
</span><span class="cx"> KeyframeValue keyframeValue(0, 0);
</span><span class="lines">@@ -958,7 +958,7 @@
</span><span class="cx"> if (initialListSize > 0 && (list[list.size() - 1].key() != 1)) {
</span><span class="cx"> static StyleKeyframe* hundredPercentKeyframe;
</span><span class="cx"> if (!hundredPercentKeyframe) {
</span><del>- hundredPercentKeyframe = StyleKeyframe::create(MutableStylePropertySet::create()).leakRef();
</del><ins>+ hundredPercentKeyframe = StyleKeyframe::create(MutableStyleProperties::create()).leakRef();
</ins><span class="cx"> hundredPercentKeyframe->setKeyText("100%");
</span><span class="cx"> }
</span><span class="cx"> KeyframeValue keyframeValue(1, 0);
</span><span class="lines">@@ -1521,14 +1521,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <StyleResolver::StyleApplicationPass pass>
</span><del>-void StyleResolver::applyProperties(const StylePropertySet* properties, StyleRule* rule, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType)
</del><ins>+void StyleResolver::applyProperties(const StyleProperties* properties, StyleRule* rule, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT((propertyWhitelistType != PropertyWhitelistRegion) || m_state.regionForStyling());
</span><span class="cx"> InspectorInstrumentationCookie cookie = InspectorInstrumentation::willProcessRule(&document(), rule, *this);
</span><span class="cx">
</span><span class="cx"> unsigned propertyCount = properties->propertyCount();
</span><span class="cx"> for (unsigned i = 0; i < propertyCount; ++i) {
</span><del>- StylePropertySet::PropertyReference current = properties->propertyAt(i);
</del><ins>+ StyleProperties::PropertyReference current = properties->propertyAt(i);
</ins><span class="cx"> if (isImportant != current.isImportant())
</span><span class="cx"> continue;
</span><span class="cx"> if (inheritedOnly && !current.isInherited()) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/StyleResolver.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> class StyleImage;
</span><span class="cx"> class StyleKeyframe;
</span><span class="cx"> class StylePendingImage;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx"> class StyleRule;
</span><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="cx"> class StyleRuleHost;
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> MatchedProperties();
</span><span class="cx"> ~MatchedProperties();
</span><span class="cx">
</span><del>- RefPtr<StylePropertySet> properties;
</del><ins>+ RefPtr<StyleProperties> properties;
</ins><span class="cx"> union {
</span><span class="cx"> struct {
</span><span class="cx"> unsigned linkMatchType : 2;
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> MatchRanges ranges;
</span><span class="cx"> bool isCacheable;
</span><span class="cx">
</span><del>- void addMatchedProperties(const StylePropertySet& properties, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
</del><ins>+ void addMatchedProperties(const StyleProperties&, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> template <StyleApplicationPass pass>
</span><span class="cx"> void applyMatchedProperties(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
</span><span class="cx"> template <StyleApplicationPass pass>
</span><del>- void applyProperties(const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
</del><ins>+ void applyProperties(const StyleProperties*, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
</ins><span class="cx"> static bool isValidRegionStyleProperty(CSSPropertyID);
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> static bool isValidCueStyleProperty(CSSPropertyID);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="cx"> #include "CSSSupportsRule.h"
</span><span class="cx"> #include "CSSUnknownRule.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRuleImport.h"
</span><span class="cx"> #include "WebKitCSSFilterRule.h"
</span><span class="cx"> #include "WebKitCSSKeyframeRule.h"
</span><span class="lines">@@ -228,10 +228,10 @@
</span><span class="cx">
</span><span class="cx"> unsigned StyleRule::averageSizeInBytes()
</span><span class="cx"> {
</span><del>- return sizeof(StyleRule) + sizeof(CSSSelector) + StylePropertySet::averageSizeInBytes();
</del><ins>+ return sizeof(StyleRule) + sizeof(CSSSelector) + StyleProperties::averageSizeInBytes();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-StyleRule::StyleRule(int sourceLine, PassRef<StylePropertySet> properties)
</del><ins>+StyleRule::StyleRule(int sourceLine, PassRef<StyleProperties> properties)
</ins><span class="cx"> : StyleRuleBase(Style, sourceLine)
</span><span class="cx"> , m_properties(std::move(properties))
</span><span class="cx"> {
</span><span class="lines">@@ -248,14 +248,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& StyleRule::mutableProperties()
</del><ins>+MutableStyleProperties& StyleRule::mutableProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_properties->isMutable())
</span><span class="cx"> m_properties = m_properties->mutableCopy();
</span><del>- return static_cast<MutableStylePropertySet&>(m_properties.get());
</del><ins>+ return static_cast<MutableStyleProperties&>(m_properties.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRef<StyleRule> StyleRule::create(int sourceLine, const Vector<const CSSSelector*>& selectors, PassRef<StylePropertySet> properties)
</del><ins>+PassRef<StyleRule> StyleRule::create(int sourceLine, const Vector<const CSSSelector*>& selectors, PassRef<StyleProperties> properties)
</ins><span class="cx"> {
</span><span class="cx"> CSSSelector* selectorListArray = reinterpret_cast<CSSSelector*>(fastMalloc(sizeof(CSSSelector) * selectors.size()));
</span><span class="cx"> for (unsigned i = 0; i < selectors.size(); ++i)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> componentsInThisSelector.append(component);
</span><span class="cx">
</span><span class="cx"> if (componentsInThisSelector.size() + componentsSinceLastSplit.size() > maxCount) {
</span><del>- rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StylePropertySet&>(m_properties.get())));
</del><ins>+ rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StyleProperties&>(m_properties.get())));
</ins><span class="cx"> componentsSinceLastSplit.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -287,12 +287,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!componentsSinceLastSplit.isEmpty())
</span><del>- rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StylePropertySet&>(m_properties.get())));
</del><ins>+ rules.append(create(sourceLine(), componentsSinceLastSplit, const_cast<StyleProperties&>(m_properties.get())));
</ins><span class="cx">
</span><span class="cx"> return rules;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleRulePage::StyleRulePage(PassRef<StylePropertySet> properties)
</del><ins>+StyleRulePage::StyleRulePage(PassRef<StyleProperties> properties)
</ins><span class="cx"> : StyleRuleBase(Page)
</span><span class="cx"> , m_properties(std::move(properties))
</span><span class="cx"> {
</span><span class="lines">@@ -309,14 +309,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& StyleRulePage::mutableProperties()
</del><ins>+MutableStyleProperties& StyleRulePage::mutableProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_properties->isMutable())
</span><span class="cx"> m_properties = m_properties->mutableCopy();
</span><del>- return static_cast<MutableStylePropertySet&>(m_properties.get());
</del><ins>+ return static_cast<MutableStyleProperties&>(m_properties.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-StyleRuleFontFace::StyleRuleFontFace(PassRef<StylePropertySet> properties)
</del><ins>+StyleRuleFontFace::StyleRuleFontFace(PassRef<StyleProperties> properties)
</ins><span class="cx"> : StyleRuleBase(FontFace, 0)
</span><span class="cx"> , m_properties(std::move(properties))
</span><span class="cx"> {
</span><span class="lines">@@ -332,11 +332,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& StyleRuleFontFace::mutableProperties()
</del><ins>+MutableStyleProperties& StyleRuleFontFace::mutableProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_properties->isMutable())
</span><span class="cx"> m_properties = m_properties->mutableCopy();
</span><del>- return static_cast<MutableStylePropertySet&>(m_properties.get());
</del><ins>+ return static_cast<MutableStyleProperties&>(m_properties.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StyleRuleGroup::StyleRuleGroup(Type type, Vector<RefPtr<StyleRuleBase>>& adoptRule)
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><del>-StyleRuleViewport::StyleRuleViewport(PassRef<StylePropertySet> properties)
</del><ins>+StyleRuleViewport::StyleRuleViewport(PassRef<StyleProperties> properties)
</ins><span class="cx"> : StyleRuleBase(Viewport, 0)
</span><span class="cx"> , m_properties(std::move(properties))
</span><span class="cx"> {
</span><span class="lines">@@ -424,16 +424,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& StyleRuleViewport::mutableProperties()
</del><ins>+MutableStyleProperties& StyleRuleViewport::mutableProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_properties->isMutable())
</span><span class="cx"> m_properties = m_properties->mutableCopy();
</span><del>- return static_cast<MutableStylePropertySet&>(m_properties.get());
</del><ins>+ return static_cast<MutableStyleProperties&>(m_properties.get());
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><del>-StyleRuleFilter::StyleRuleFilter(const String& filterName, PassRef<StylePropertySet> properties)
</del><ins>+StyleRuleFilter::StyleRuleFilter(const String& filterName, PassRef<StyleProperties> properties)
</ins><span class="cx"> : StyleRuleBase(Filter, 0)
</span><span class="cx"> , m_filterName(filterName)
</span><span class="cx"> , m_properties(std::move(properties))
</span><span class="lines">@@ -451,11 +451,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& StyleRuleFilter::mutableProperties()
</del><ins>+MutableStyleProperties& StyleRuleFilter::mutableProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_properties->isMutable())
</span><span class="cx"> m_properties = m_properties->mutableCopy();
</span><del>- return static_cast<MutableStylePropertySet&>(m_properties.get());
</del><ins>+ return static_cast<MutableStyleProperties&>(m_properties.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CSS_SHADERS)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/StyleRule.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSSelectorList.h"
</span><span class="cx"> #include "MediaList.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> class CSSRule;
</span><span class="cx"> class CSSStyleRule;
</span><span class="cx"> class CSSStyleSheet;
</span><del>-class MutableStylePropertySet;
-class StylePropertySet;
</del><ins>+class MutableStyleProperties;
+class StyleProperties;
</ins><span class="cx">
</span><span class="cx"> class StyleRuleBase : public WTF::RefCountedBase {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> class StyleRule : public StyleRuleBase {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassRef<StyleRule> create(int sourceLine, PassRef<StylePropertySet> properties)
</del><ins>+ static PassRef<StyleRule> create(int sourceLine, PassRef<StyleProperties> properties)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new StyleRule(sourceLine, std::move(properties)));
</span><span class="cx"> }
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> ~StyleRule();
</span><span class="cx">
</span><span class="cx"> const CSSSelectorList& selectorList() const { return m_selectorList; }
</span><del>- const StylePropertySet& properties() const { return m_properties.get(); }
- MutableStylePropertySet& mutableProperties();
</del><ins>+ const StyleProperties& properties() const { return m_properties.get(); }
+ MutableStyleProperties& mutableProperties();
</ins><span class="cx">
</span><span class="cx"> void parserAdoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectors) { m_selectorList.adoptSelectorVector(selectors); }
</span><span class="cx"> void wrapperAdoptSelectorList(CSSSelectorList& selectors) { m_selectorList.adopt(selectors); }
</span><span class="lines">@@ -140,12 +140,12 @@
</span><span class="cx"> static unsigned averageSizeInBytes();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StyleRule(int sourceLine, PassRef<StylePropertySet>);
</del><ins>+ StyleRule(int sourceLine, PassRef<StyleProperties>);
</ins><span class="cx"> StyleRule(const StyleRule&);
</span><span class="cx">
</span><del>- static PassRef<StyleRule> create(int sourceLine, const Vector<const CSSSelector*>&, PassRef<StylePropertySet>);
</del><ins>+ static PassRef<StyleRule> create(int sourceLine, const Vector<const CSSSelector*>&, PassRef<StyleProperties>);
</ins><span class="cx">
</span><del>- Ref<StylePropertySet> m_properties;
</del><ins>+ Ref<StyleProperties> m_properties;
</ins><span class="cx"> CSSSelectorList m_selectorList;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -157,32 +157,32 @@
</span><span class="cx">
</span><span class="cx"> class StyleRuleFontFace : public StyleRuleBase {
</span><span class="cx"> public:
</span><del>- static PassRef<StyleRuleFontFace> create(PassRef<StylePropertySet> properties) { return adoptRef(*new StyleRuleFontFace(std::move(properties))); }
</del><ins>+ static PassRef<StyleRuleFontFace> create(PassRef<StyleProperties> properties) { return adoptRef(*new StyleRuleFontFace(std::move(properties))); }
</ins><span class="cx">
</span><span class="cx"> ~StyleRuleFontFace();
</span><span class="cx">
</span><del>- const StylePropertySet& properties() const { return m_properties.get(); }
- MutableStylePropertySet& mutableProperties();
</del><ins>+ const StyleProperties& properties() const { return m_properties.get(); }
+ MutableStyleProperties& mutableProperties();
</ins><span class="cx">
</span><span class="cx"> PassRef<StyleRuleFontFace> copy() const { return adoptRef(*new StyleRuleFontFace(*this)); }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StyleRuleFontFace(PassRef<StylePropertySet>);
</del><ins>+ StyleRuleFontFace(PassRef<StyleProperties>);
</ins><span class="cx"> StyleRuleFontFace(const StyleRuleFontFace&);
</span><span class="cx">
</span><del>- Ref<StylePropertySet> m_properties;
</del><ins>+ Ref<StyleProperties> m_properties;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StyleRulePage : public StyleRuleBase {
</span><span class="cx"> public:
</span><del>- static PassRef<StyleRulePage> create(PassRef<StylePropertySet> properties) { return adoptRef(*new StyleRulePage(std::move(properties))); }
</del><ins>+ static PassRef<StyleRulePage> create(PassRef<StyleProperties> properties) { return adoptRef(*new StyleRulePage(std::move(properties))); }
</ins><span class="cx">
</span><span class="cx"> ~StyleRulePage();
</span><span class="cx">
</span><span class="cx"> const CSSSelector* selector() const { return m_selectorList.first(); }
</span><del>- const StylePropertySet& properties() const { return m_properties.get(); }
- MutableStylePropertySet& mutableProperties();
</del><ins>+ const StyleProperties& properties() const { return m_properties.get(); }
+ MutableStyleProperties& mutableProperties();
</ins><span class="cx">
</span><span class="cx"> void parserAdoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectors) { m_selectorList.adoptSelectorVector(selectors); }
</span><span class="cx"> void wrapperAdoptSelectorList(CSSSelectorList& selectors) { m_selectorList.adopt(selectors); }
</span><span class="lines">@@ -190,10 +190,10 @@
</span><span class="cx"> PassRef<StyleRulePage> copy() const { return adoptRef(*new StyleRulePage(*this)); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StyleRulePage(PassRef<StylePropertySet>);
</del><ins>+ StyleRulePage(PassRef<StyleProperties>);
</ins><span class="cx"> StyleRulePage(const StyleRulePage&);
</span><span class="cx">
</span><del>- Ref<StylePropertySet> m_properties;
</del><ins>+ Ref<StyleProperties> m_properties;
</ins><span class="cx"> CSSSelectorList m_selectorList;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -288,20 +288,20 @@
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> class StyleRuleViewport : public StyleRuleBase {
</span><span class="cx"> public:
</span><del>- static PassRef<StyleRuleViewport> create(PassRef<StylePropertySet> properties) { return adoptRef(*new StyleRuleViewport(std::move(properties))); }
</del><ins>+ static PassRef<StyleRuleViewport> create(PassRef<StyleProperties> properties) { return adoptRef(*new StyleRuleViewport(std::move(properties))); }
</ins><span class="cx">
</span><span class="cx"> ~StyleRuleViewport();
</span><span class="cx">
</span><del>- const StylePropertySet& properties() const { return m_properties.get(); }
- MutableStylePropertySet& mutableProperties();
</del><ins>+ const StyleProperties& properties() const { return m_properties.get(); }
+ MutableStyleProperties& mutableProperties();
</ins><span class="cx">
</span><span class="cx"> PassRef<StyleRuleViewport> copy() const { return adoptRef(*new StyleRuleViewport(*this)); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StyleRuleViewport(PassRef<StylePropertySet>);
</del><ins>+ StyleRuleViewport(PassRef<StyleProperties>);
</ins><span class="cx"> StyleRuleViewport(const StyleRuleViewport&);
</span><span class="cx">
</span><del>- Ref<StylePropertySet> m_properties;
</del><ins>+ Ref<StyleProperties> m_properties;
</ins><span class="cx"> };
</span><span class="cx"> #endif // ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><span class="cx"> class StyleRuleFilter : public StyleRuleBase {
</span><span class="cx"> public:
</span><del>- static PassRef<StyleRuleFilter> create(const String& filterName, PassRef<StylePropertySet> properties)
</del><ins>+ static PassRef<StyleRuleFilter> create(const String& filterName, PassRef<StyleProperties> properties)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new StyleRuleFilter(filterName, std::move(properties)));
</span><span class="cx"> }
</span><span class="lines">@@ -337,17 +337,17 @@
</span><span class="cx">
</span><span class="cx"> const String& filterName() const { return m_filterName; }
</span><span class="cx">
</span><del>- const StylePropertySet& properties() const { return m_properties.get(); }
- MutableStylePropertySet& mutableProperties();
</del><ins>+ const StyleProperties& properties() const { return m_properties.get(); }
+ MutableStyleProperties& mutableProperties();
</ins><span class="cx">
</span><span class="cx"> PassRef<StyleRuleFilter> copy() const { return adoptRef(*new StyleRuleFilter(*this)); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StyleRuleFilter(const String&, PassRef<StylePropertySet>);
</del><ins>+ StyleRuleFilter(const String&, PassRef<StyleProperties>);
</ins><span class="cx"> StyleRuleFilter(const StyleRuleFilter&);
</span><span class="cx">
</span><span class="cx"> String m_filterName;
</span><del>- Ref<StylePropertySet> m_properties;
</del><ins>+ Ref<StyleProperties> m_properties;
</ins><span class="cx"> };
</span><span class="cx"> #endif // ENABLE(CSS_SHADERS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheetContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheetContents.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheetContents.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/StyleSheetContents.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "Node.h"
</span><span class="cx"> #include "RuleSet.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleRuleImport.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecssViewportStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ViewportStyleResolver.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ViewportStyleResolver.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/ViewportStyleResolver.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderView.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "ViewportArguments.h"
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> void ViewportStyleResolver::addViewportRule(StyleRuleViewport* viewportRule)
</span><span class="cx"> {
</span><del>- StylePropertySet& propertySet = viewportRule->mutableProperties();
</del><ins>+ StyleProperties& propertySet = viewportRule->mutableProperties();
</ins><span class="cx">
</span><span class="cx"> unsigned propertyCount = propertySet.propertyCount();
</span><span class="cx"> if (!propertyCount)
</span></span></pre></div>
<a id="trunkSourceWebCorecssViewportStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ViewportStyleResolver.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ViewportStyleResolver.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/ViewportStyleResolver.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class CSSPrimitiveValue;
</span><span class="cx"> class Document;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx"> class StyleRuleViewport;
</span><span class="cx">
</span><span class="cx"> class ViewportStyleResolver : public RefCounted<ViewportStyleResolver> {
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> float getViewportArgumentValue(CSSPropertyID) const;
</span><span class="cx">
</span><span class="cx"> Document* m_document;
</span><del>- RefPtr<MutableStylePropertySet> m_propertySet;
</del><ins>+ RefPtr<MutableStyleProperties> m_propertySet;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSFilterRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/WebKitCSSFilterRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #if ENABLE(CSS_SHADERS)
</span><span class="cx">
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframeRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -27,13 +27,13 @@
</span><span class="cx"> #include "WebKitCSSKeyframeRule.h"
</span><span class="cx">
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "WebKitCSSKeyframesRule.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-StyleKeyframe::StyleKeyframe(PassRef<StylePropertySet> properties)
</del><ins>+StyleKeyframe::StyleKeyframe(PassRef<StyleProperties> properties)
</ins><span class="cx"> : m_properties(std::move(properties))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& StyleKeyframe::mutableProperties()
</del><ins>+MutableStyleProperties& StyleKeyframe::mutableProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_properties->isMutable())
</span><span class="cx"> m_properties = m_properties->mutableCopy();
</span><del>- return static_cast<MutableStylePropertySet&>(m_properties.get());
</del><ins>+ return static_cast<MutableStyleProperties&>(m_properties.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* static */
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframeRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WebKitCSSKeyframeRule_h
</span><span class="cx">
</span><span class="cx"> #include "CSSRule.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> class StyleKeyframe : public RefCounted<StyleKeyframe> {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassRefPtr<StyleKeyframe> create(PassRef<StylePropertySet> properties)
</del><ins>+ static PassRefPtr<StyleKeyframe> create(PassRef<StyleProperties> properties)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new StyleKeyframe(std::move(properties)));
</span><span class="cx"> }
</span><span class="lines">@@ -49,17 +49,17 @@
</span><span class="cx">
</span><span class="cx"> void getKeys(Vector<double>& keys) const { parseKeyString(m_key, keys); }
</span><span class="cx">
</span><del>- const StylePropertySet& properties() const { return m_properties.get(); }
- MutableStylePropertySet& mutableProperties();
</del><ins>+ const StyleProperties& properties() const { return m_properties.get(); }
+ MutableStyleProperties& mutableProperties();
</ins><span class="cx">
</span><span class="cx"> String cssText() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit StyleKeyframe(PassRef<StylePropertySet>);
</del><ins>+ explicit StyleKeyframe(PassRef<StyleProperties>);
</ins><span class="cx">
</span><span class="cx"> static void parseKeyString(const String&, Vector<double>& keys);
</span><span class="cx">
</span><del>- Ref<StylePropertySet> m_properties;
</del><ins>+ Ref<StyleProperties> m_properties;
</ins><span class="cx"> // FIXME: This should be a parsed vector of floats.
</span><span class="cx"> // comma separated list of keys
</span><span class="cx"> String m_key;
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframesRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSRuleList.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleSheet.h"
</span><span class="cx"> #include "WebKitCSSKeyframeRule.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSMatrix.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSMatrix.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/WebKitCSSMatrix.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TransformFunctions.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> if (string.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> styleDeclaration = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> styleDeclaration = MutableStyleProperties::create();
</ins><span class="cx"> if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform, string, true, CSSStrictMode, 0)) {
</span><span class="cx"> // Convert to TransformOperations. This can fail if a property
</span><span class="cx"> // requires style (i.e., param uses 'ems' or 'exs')
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSViewportRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomAttrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Attr.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Attr.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/Attr.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ScopedEventQueue.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyledElement.h"
</span><span class="cx"> #include "TextNodeTraversal.h"
</span><span class="cx"> #include "XMLNSNames.h"
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> // This function only exists to support the Obj-C bindings.
</span><span class="cx"> if (!m_element || !m_element->isStyledElement())
</span><span class="cx"> return nullptr;
</span><del>- m_style = MutableStylePropertySet::create();
</del><ins>+ m_style = MutableStyleProperties::create();
</ins><span class="cx"> toStyledElement(m_element)->collectStyleForPresentationAttribute(qualifiedName(), value(), *m_style);
</span><span class="cx"> return m_style->ensureCSSStyleDeclaration();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomAttrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Attr.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Attr.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/Attr.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSStyleDeclaration;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx">
</span><span class="cx"> // Attr can have Text and EntityReference children
</span><span class="cx"> // therefore it has to be a fullblown Node. The plan
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> QualifiedName m_name;
</span><span class="cx"> AtomicString m_standaloneValue;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> m_style;
</del><ins>+ RefPtr<MutableStyleProperties> m_style;
</ins><span class="cx"> unsigned m_ignoreChildrenChanged;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> #include "SelectorQuery.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "StyleSheetList.h"
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSStyleDeclaration> Document::createCSSStyleDeclaration()
</span><span class="cx"> {
</span><del>- Ref<MutableStylePropertySet> propertySet(MutableStylePropertySet::create());
</del><ins>+ Ref<MutableStyleProperties> propertySet(MutableStyleProperties::create());
</ins><span class="cx"> return propertySet->ensureCSSStyleDeclaration();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/Element.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="cx"> #include "SelectorQuery.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "VoidCallback.h"
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementData.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementData.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/ElementData.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "ElementData.h"
</span><span class="cx">
</span><span class="cx"> #include "Attr.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> UniqueElementData::UniqueElementData(const ShareableElementData& other)
</span><span class="cx"> : ElementData(other, true)
</span><span class="cx"> {
</span><del>- // An ShareableElementData should never have a mutable inline StylePropertySet attached.
</del><ins>+ // An ShareableElementData should never have a mutable inline StyleProperties attached.
</ins><span class="cx"> ASSERT(!other.m_inlineStyle || !other.m_inlineStyle->isMutable());
</span><span class="cx"> m_inlineStyle = other.m_inlineStyle;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementData.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementData.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/ElementData.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> class Attr;
</span><span class="cx"> class ShareableElementData;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx"> class UniqueElementData;
</span><span class="cx">
</span><span class="cx"> class ElementData : public RefCounted<ElementData> {
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> const AtomicString& idForStyleResolution() const { return m_idForStyleResolution; }
</span><span class="cx"> void setIdForStyleResolution(const AtomicString& newId) const { m_idForStyleResolution = newId; }
</span><span class="cx">
</span><del>- const StylePropertySet* inlineStyle() const { return m_inlineStyle.get(); }
- const StylePropertySet* presentationAttributeStyle() const;
</del><ins>+ const StyleProperties* inlineStyle() const { return m_inlineStyle.get(); }
+ const StyleProperties* presentationAttributeStyle() const;
</ins><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><span class="cx"> bool isEmpty() const { return !length(); }
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> mutable unsigned m_animatedSVGAttributesAreDirty : 1;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- mutable RefPtr<StylePropertySet> m_inlineStyle;
</del><ins>+ mutable RefPtr<StyleProperties> m_inlineStyle;
</ins><span class="cx"> mutable SpaceSplitString m_classNames;
</span><span class="cx"> mutable AtomicString m_idForStyleResolution;
</span><span class="cx">
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> explicit UniqueElementData(const ShareableElementData&);
</span><span class="cx"> explicit UniqueElementData(const UniqueElementData&);
</span><span class="cx">
</span><del>- mutable RefPtr<StylePropertySet> m_presentationAttributeStyle;
</del><ins>+ mutable RefPtr<StyleProperties> m_presentationAttributeStyle;
</ins><span class="cx"> Vector<Attribute, 4> m_attributeVector;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> return static_cast<const ShareableElementData*>(this)->m_attributeArray;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline const StylePropertySet* ElementData::presentationAttributeStyle() const
</del><ins>+inline const StyleProperties* ElementData::presentationAttributeStyle() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isUnique)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/StyledElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include <wtf/HashFunctions.h>
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> PresentationAttributeCacheKey key;
</span><del>- RefPtr<StylePropertySet> value;
</del><ins>+ RefPtr<StyleProperties> value;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<unsigned, OwnPtr<PresentationAttributeCacheEntry>, AlreadyHashed> PresentationAttributeCache;
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> ASSERT(elementData());
</span><span class="cx"> ASSERT(elementData()->m_styleAttributeIsDirty);
</span><span class="cx"> elementData()->m_styleAttributeIsDirty = false;
</span><del>- if (const StylePropertySet* inlineStyle = this->inlineStyle())
</del><ins>+ if (const StyleProperties* inlineStyle = this->inlineStyle())
</ins><span class="cx"> const_cast<StyledElement*>(this)->setSynchronizedLazyAttribute(styleAttr, inlineStyle->asText());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -138,15 +138,15 @@
</span><span class="cx"> return ensureMutableInlineStyle().ensureInlineCSSStyleDeclaration(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& StyledElement::ensureMutableInlineStyle()
</del><ins>+MutableStyleProperties& StyledElement::ensureMutableInlineStyle()
</ins><span class="cx"> {
</span><del>- RefPtr<StylePropertySet>& inlineStyle = ensureUniqueElementData().m_inlineStyle;
</del><ins>+ RefPtr<StyleProperties>& inlineStyle = ensureUniqueElementData().m_inlineStyle;
</ins><span class="cx"> if (!inlineStyle)
</span><del>- inlineStyle = MutableStylePropertySet::create(strictToCSSParserMode(isHTMLElement() && !document().inQuirksMode()));
</del><ins>+ inlineStyle = MutableStyleProperties::create(strictToCSSParserMode(isHTMLElement() && !document().inQuirksMode()));
</ins><span class="cx"> else if (!inlineStyle->isMutable())
</span><span class="cx"> inlineStyle = inlineStyle->mutableCopy();
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(inlineStyle->isMutable());
</span><del>- return static_cast<MutableStylePropertySet&>(*inlineStyle);
</del><ins>+ return static_cast<MutableStyleProperties&>(*inlineStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyledElement::attributeChanged(const QualifiedName& name, const AtomicString& newValue, AttributeModificationReason reason)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> inline void StyledElement::setInlineStyleFromString(const AtomicString& newStyleString)
</span><span class="cx"> {
</span><del>- RefPtr<StylePropertySet>& inlineStyle = elementData()->m_inlineStyle;
</del><ins>+ RefPtr<StyleProperties>& inlineStyle = elementData()->m_inlineStyle;
</ins><span class="cx">
</span><span class="cx"> // Avoid redundant work if we're using shared attribute data with already parsed inline style.
</span><span class="cx"> if (inlineStyle && !elementData()->isUnique())
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> inlineStyle = CSSParser::parseInlineStyleDeclaration(newStyleString, this);
</span><span class="cx"> else {
</span><span class="cx"> ASSERT(inlineStyle->isMutable());
</span><del>- static_pointer_cast<MutableStylePropertySet>(inlineStyle)->parseDeclaration(newStyleString, &document().elementSheet().contents());
</del><ins>+ static_pointer_cast<MutableStyleProperties>(inlineStyle)->parseDeclaration(newStyleString, &document().elementSheet().contents());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx">
</span><span class="cx"> void StyledElement::addSubresourceAttributeURLs(ListHashSet<URL>& urls) const
</span><span class="cx"> {
</span><del>- if (const StylePropertySet* inlineStyle = elementData() ? elementData()->inlineStyle() : 0)
</del><ins>+ if (const StyleProperties* inlineStyle = elementData() ? elementData()->inlineStyle() : 0)
</ins><span class="cx"> inlineStyle->addSubresourceStyleURLs(urls, &document().elementSheet().contents());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -329,16 +329,16 @@
</span><span class="cx"> } else
</span><span class="cx"> cacheIterator = presentationAttributeCache().end();
</span><span class="cx">
</span><del>- RefPtr<StylePropertySet> style;
</del><ins>+ RefPtr<StyleProperties> style;
</ins><span class="cx"> if (cacheHash && cacheIterator->value) {
</span><span class="cx"> style = cacheIterator->value->value;
</span><span class="cx"> presentationAttributeCacheCleaner().didHitPresentationAttributeCache();
</span><span class="cx"> } else {
</span><del>- style = MutableStylePropertySet::create(isSVGElement() ? SVGAttributeMode : CSSQuirksMode);
</del><ins>+ style = MutableStyleProperties::create(isSVGElement() ? SVGAttributeMode : CSSQuirksMode);
</ins><span class="cx"> unsigned size = attributeCount();
</span><span class="cx"> for (unsigned i = 0; i < size; ++i) {
</span><span class="cx"> const Attribute& attribute = attributeAt(i);
</span><del>- collectStyleForPresentationAttribute(attribute.name(), attribute.value(), static_cast<MutableStylePropertySet&>(*style));
</del><ins>+ collectStyleForPresentationAttribute(attribute.name(), attribute.value(), static_cast<MutableStyleProperties&>(*style));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -364,17 +364,17 @@
</span><span class="cx"> cacheIterator->value = newEntry.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyledElement::addPropertyToPresentationAttributeStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, CSSValueID identifier)
</del><ins>+void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, CSSValueID identifier)
</ins><span class="cx"> {
</span><span class="cx"> style.setProperty(propertyID, cssValuePool().createIdentifierValue(identifier));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyledElement::addPropertyToPresentationAttributeStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitTypes unit)
</del><ins>+void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitTypes unit)
</ins><span class="cx"> {
</span><span class="cx"> style.setProperty(propertyID, cssValuePool().createValue(value, unit));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyledElement::addPropertyToPresentationAttributeStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, const String& value)
</del><ins>+void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, const String& value)
</ins><span class="cx"> {
</span><span class="cx"> style.setProperty(propertyID, value, false, &document().elementSheet().contents());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/dom/StyledElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Attribute;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx"> class PropertySetCSSStyleDeclaration;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx">
</span><span class="cx"> struct PresentationAttributeCacheKey;
</span><span class="cx">
</span><span class="lines">@@ -43,10 +43,10 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~StyledElement();
</span><span class="cx">
</span><del>- virtual const StylePropertySet* additionalPresentationAttributeStyle() { return 0; }
</del><ins>+ virtual const StyleProperties* additionalPresentationAttributeStyle() { return 0; }
</ins><span class="cx"> void invalidateStyleAttribute();
</span><span class="cx">
</span><del>- const StylePropertySet* inlineStyle() const { return elementData() ? elementData()->m_inlineStyle.get() : 0; }
</del><ins>+ const StyleProperties* inlineStyle() const { return elementData() ? elementData()->m_inlineStyle.get() : 0; }
</ins><span class="cx">
</span><span class="cx"> bool setInlineStyleProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
</span><span class="cx"> bool setInlineStyleProperty(CSSPropertyID, CSSPropertyID identifier, bool important = false);
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx">
</span><span class="cx"> virtual CSSStyleDeclaration* style() OVERRIDE FINAL;
</span><span class="cx">
</span><del>- const StylePropertySet* presentationAttributeStyle();
- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) { }
</del><ins>+ const StyleProperties* presentationAttributeStyle();
+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) { }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> StyledElement(const QualifiedName& name, Document& document, ConstructionType type)
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const { return false; }
</span><span class="cx">
</span><del>- void addPropertyToPresentationAttributeStyle(MutableStylePropertySet&, CSSPropertyID, CSSValueID identifier);
- void addPropertyToPresentationAttributeStyle(MutableStylePropertySet&, CSSPropertyID, double value, CSSPrimitiveValue::UnitTypes);
- void addPropertyToPresentationAttributeStyle(MutableStylePropertySet&, CSSPropertyID, const String& value);
</del><ins>+ void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, CSSValueID identifier);
+ void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, double value, CSSPrimitiveValue::UnitTypes);
+ void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, const String& value);
</ins><span class="cx">
</span><span class="cx"> virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> void inlineStyleChanged();
</span><span class="cx"> PropertySetCSSStyleDeclaration* inlineStyleCSSOMWrapper();
</span><span class="cx"> void setInlineStyleFromString(const AtomicString&);
</span><del>- MutableStylePropertySet& ensureMutableInlineStyle();
</del><ins>+ MutableStyleProperties& ensureMutableInlineStyle();
</ins><span class="cx">
</span><span class="cx"> void makePresentationAttributeCacheKey(PresentationAttributeCacheKey&) const;
</span><span class="cx"> void rebuildPresentationAttributeStyle();
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> elementData()->m_styleAttributeIsDirty = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline const StylePropertySet* StyledElement::presentationAttributeStyle()
</del><ins>+inline const StyleProperties* StyledElement::presentationAttributeStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (!elementData())
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include "NodeTraversal.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "RenderText.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TextNodeTraversal.h"
</span><span class="lines">@@ -299,10 +299,10 @@
</span><span class="cx"> updateStartEnd(startRange->startPosition(), endRange->startPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<MutableStylePropertySet> copyStyleOrCreateEmpty(const StylePropertySet* style)
</del><ins>+static PassRefPtr<MutableStyleProperties> copyStyleOrCreateEmpty(const StyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> if (!style)
</span><del>- return MutableStylePropertySet::create();
</del><ins>+ return MutableStyleProperties::create();
</ins><span class="cx"> return style->mutableCopy();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> }
</span><span class="cx"> lastStyledNode = node;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
</del><ins>+ RefPtr<MutableStyleProperties> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
</ins><span class="cx"> float currentFontSize = computedFontSize(node);
</span><span class="cx"> float desiredFontSize = std::max(MinimumFontSize, startingFontSizes.get(node) + style->fontSizeDelta());
</span><span class="cx"> RefPtr<CSSValue> value = inlineStyle->getPropertyCSSValue(CSSPropertyFontSize);
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> // other attributes, like we (should) do with B and I elements.
</span><span class="cx"> removeNodeAttribute(element, dirAttr);
</span><span class="cx"> } else {
</span><del>- RefPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
</del><ins>+ RefPtr<MutableStyleProperties> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
</ins><span class="cx"> inlineStyle->setProperty(CSSPropertyUnicodeBidi, CSSValueNormal);
</span><span class="cx"> inlineStyle->removeProperty(CSSPropertyDirection);
</span><span class="cx"> setNodeAttribute(element, styleAttr, inlineStyle->asText());
</span><span class="lines">@@ -769,8 +769,8 @@
</span><span class="cx"> break;
</span><span class="cx"> // Add to this element's inline style and skip over its contents.
</span><span class="cx"> HTMLElement* element = toHTMLElement(node.get());
</span><del>- RefPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
- if (MutableStylePropertySet* otherStyle = style->style())
</del><ins>+ RefPtr<MutableStyleProperties> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
+ if (MutableStyleProperties* otherStyle = style->style())
</ins><span class="cx"> inlineStyle->mergeAndOverrideOnConflict(*otherStyle);
</span><span class="cx"> setNodeAttribute(element, styleAttr, inlineStyle->asText());
</span><span class="cx"> next = NodeTraversal::nextSkippingChildren(node.get());
</span><span class="lines">@@ -1387,7 +1387,7 @@
</span><span class="cx"> String cssStyle = styleChange.cssStyle();
</span><span class="cx"> StringBuilder cssText;
</span><span class="cx"> cssText.append(cssStyle);
</span><del>- if (const StylePropertySet* decl = block->inlineStyle()) {
</del><ins>+ if (const StyleProperties* decl = block->inlineStyle()) {
</ins><span class="cx"> if (!cssStyle.isEmpty())
</span><span class="cx"> cssText.append(' ');
</span><span class="cx"> cssText.append(decl->asText());
</span><span class="lines">@@ -1467,7 +1467,7 @@
</span><span class="cx">
</span><span class="cx"> if (styleChange.cssStyle().length()) {
</span><span class="cx"> if (styleContainer) {
</span><del>- if (const StylePropertySet* existingStyle = styleContainer->inlineStyle()) {
</del><ins>+ if (const StyleProperties* existingStyle = styleContainer->inlineStyle()) {
</ins><span class="cx"> String existingText = existingStyle->asText();
</span><span class="cx"> StringBuilder cssText;
</span><span class="cx"> cssText.append(existingText);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteButtonControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteButtonController.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteButtonController.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/DeleteButtonController.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RemoveNodeCommand.h"
</span><span class="cx"> #include "RenderBox.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #include "QualifiedName.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="cx"> #include "StyleFontSizeFunctions.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyledElement.h"
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> enum EditingPropertiesToInclude { OnlyInheritableEditingProperties, AllEditingProperties };
</span><span class="cx"> template <class StyleDeclarationType>
</span><del>-static PassRefPtr<MutableStylePropertySet> copyEditingProperties(StyleDeclarationType* style, EditingPropertiesToInclude type)
</del><ins>+static PassRefPtr<MutableStyleProperties> copyEditingProperties(StyleDeclarationType* style, EditingPropertiesToInclude type)
</ins><span class="cx"> {
</span><span class="cx"> if (type == AllEditingProperties)
</span><span class="cx"> return style->copyPropertiesInSet(editingProperties, numAllEditingProperties);
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<MutableStylePropertySet> copyPropertiesFromComputedStyle(ComputedStyleExtractor& computedStyle, EditingStyle::PropertiesToInclude propertiesToInclude)
</del><ins>+static PassRefPtr<MutableStyleProperties> copyPropertiesFromComputedStyle(ComputedStyleExtractor& computedStyle, EditingStyle::PropertiesToInclude propertiesToInclude)
</ins><span class="cx"> {
</span><span class="cx"> switch (propertiesToInclude) {
</span><span class="cx"> case EditingStyle::AllProperties:
</span><span class="lines">@@ -119,13 +119,13 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<MutableStylePropertySet> copyPropertiesFromComputedStyle(Node* node, EditingStyle::PropertiesToInclude propertiesToInclude)
</del><ins>+static PassRefPtr<MutableStyleProperties> copyPropertiesFromComputedStyle(Node* node, EditingStyle::PropertiesToInclude propertiesToInclude)
</ins><span class="cx"> {
</span><span class="cx"> ComputedStyleExtractor computedStyle(node);
</span><span class="cx"> return copyPropertiesFromComputedStyle(computedStyle, propertiesToInclude);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<CSSValue> extractPropertyValue(const StylePropertySet* style, CSSPropertyID propertyID)
</del><ins>+static PassRefPtr<CSSValue> extractPropertyValue(const StyleProperties* style, CSSPropertyID propertyID)
</ins><span class="cx"> {
</span><span class="cx"> return style ? style->getPropertyCSSValue(propertyID) : PassRefPtr<CSSValue>();
</span><span class="cx"> }
</span><span class="lines">@@ -144,11 +144,11 @@
</span><span class="cx"> return toCSSPrimitiveValue(value.get())->getValueID();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> PassRefPtr<MutableStylePropertySet> getPropertiesNotIn(StylePropertySet* styleWithRedundantProperties, T* baseStyle);
</del><ins>+template<typename T> PassRefPtr<MutableStyleProperties> getPropertiesNotIn(StyleProperties* styleWithRedundantProperties, T* baseStyle);
</ins><span class="cx"> enum LegacyFontSizeMode { AlwaysUseLegacyFontSize, UseLegacyFontSizeOnlyIfPixelValuesMatch };
</span><span class="cx"> static int legacyFontSizeFromCSSValue(Document*, CSSPrimitiveValue*, bool shouldUseFixedFontDefaultSize, LegacyFontSizeMode);
</span><span class="cx"> static bool isTransparentColorValue(CSSValue*);
</span><del>-static bool hasTransparentBackgroundColor(StylePropertySet*);
</del><ins>+static bool hasTransparentBackgroundColor(StyleProperties*);
</ins><span class="cx"> static PassRefPtr<CSSValue> backgroundColorInEffect(Node*);
</span><span class="cx">
</span><span class="cx"> class HTMLElementEquivalent {
</span><span class="lines">@@ -162,8 +162,8 @@
</span><span class="cx"> virtual ~HTMLElementEquivalent() { }
</span><span class="cx"> virtual bool matches(const Element* element) const { return !m_tagName || element->hasTagName(*m_tagName); }
</span><span class="cx"> virtual bool hasAttribute() const { return false; }
</span><del>- virtual bool propertyExistsInStyle(const StylePropertySet* style) const { return style->getPropertyCSSValue(m_propertyID); }
- virtual bool valueIsPresentInStyle(Element*, StylePropertySet*) const;
</del><ins>+ virtual bool propertyExistsInStyle(const StyleProperties* style) const { return style->getPropertyCSSValue(m_propertyID); }
+ virtual bool valueIsPresentInStyle(Element*, StyleProperties*) const;
</ins><span class="cx"> virtual void addToStyle(Element*, EditingStyle*) const;
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> ASSERT(primitiveValue != CSSValueInvalid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLElementEquivalent::valueIsPresentInStyle(Element* element, StylePropertySet* style) const
</del><ins>+bool HTMLElementEquivalent::valueIsPresentInStyle(Element* element, StyleProperties* style) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValue> value = style->getPropertyCSSValue(m_propertyID);
</span><span class="cx"> return matches(element) && value && value->isPrimitiveValue() && toCSSPrimitiveValue(value.get())->getValueID() == m_primitiveValue->getValueID();
</span><span class="lines">@@ -212,8 +212,8 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptPtr(new HTMLTextDecorationEquivalent(primitiveValue, tagName));
</span><span class="cx"> }
</span><del>- virtual bool propertyExistsInStyle(const StylePropertySet*) const;
- virtual bool valueIsPresentInStyle(Element*, StylePropertySet*) const;
</del><ins>+ virtual bool propertyExistsInStyle(const StyleProperties*) const;
+ virtual bool valueIsPresentInStyle(Element*, StyleProperties*) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLTextDecorationEquivalent(CSSValueID primitiveValue, const QualifiedName& tagName);
</span><span class="lines">@@ -225,12 +225,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLTextDecorationEquivalent::propertyExistsInStyle(const StylePropertySet* style) const
</del><ins>+bool HTMLTextDecorationEquivalent::propertyExistsInStyle(const StyleProperties* style) const
</ins><span class="cx"> {
</span><span class="cx"> return style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect) || style->getPropertyCSSValue(CSSPropertyTextDecoration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(Element* element, StylePropertySet* style) const
</del><ins>+bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(Element* element, StyleProperties* style) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
</span><span class="cx"> if (!styleValue)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx">
</span><span class="cx"> bool matches(const Element* elem) const { return HTMLElementEquivalent::matches(elem) && elem->hasAttribute(m_attrName); }
</span><span class="cx"> virtual bool hasAttribute() const { return true; }
</span><del>- virtual bool valueIsPresentInStyle(Element*, StylePropertySet*) const;
</del><ins>+ virtual bool valueIsPresentInStyle(Element*, StyleProperties*) const;
</ins><span class="cx"> virtual void addToStyle(Element*, EditingStyle*) const;
</span><span class="cx"> virtual PassRefPtr<CSSValue> attributeValueAsCSSValue(Element*) const;
</span><span class="cx"> inline const QualifiedName& attributeName() const { return m_attrName; }
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLAttributeEquivalent::valueIsPresentInStyle(Element* element, StylePropertySet* style) const
</del><ins>+bool HTMLAttributeEquivalent::valueIsPresentInStyle(Element* element, StyleProperties* style) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValue> value = attributeValueAsCSSValue(element);
</span><span class="cx"> RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(m_propertyID);
</span><span class="lines">@@ -294,8 +294,8 @@
</span><span class="cx"> if (!element->hasAttribute(m_attrName))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> dummyStyle;
- dummyStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> dummyStyle;
+ dummyStyle = MutableStyleProperties::create();
</ins><span class="cx"> dummyStyle->setProperty(m_propertyID, element->getAttribute(m_attrName));
</span><span class="cx"> return dummyStyle->getPropertyCSSValue(m_propertyID);
</span><span class="cx"> }
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> init(position.deprecatedNode(), propertiesToInclude);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EditingStyle::EditingStyle(const StylePropertySet* style)
</del><ins>+EditingStyle::EditingStyle(const StyleProperties* style)
</ins><span class="cx"> : m_shouldUseFixedDefaultFontSize(false)
</span><span class="cx"> , m_fontSizeDelta(NoFontDelta)
</span><span class="cx"> {
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> void EditingStyle::setProperty(CSSPropertyID propertyID, const String& value, bool important)
</span><span class="cx"> {
</span><span class="cx"> if (!m_mutableStyle)
</span><del>- m_mutableStyle = MutableStylePropertySet::create();
</del><ins>+ m_mutableStyle = MutableStyleProperties::create();
</ins><span class="cx">
</span><span class="cx"> m_mutableStyle->setProperty(propertyID, value, important);
</span><span class="cx"> }
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EditingStyle::setStyle(PassRefPtr<MutableStylePropertySet> style)
</del><ins>+void EditingStyle::setStyle(PassRefPtr<MutableStyleProperties> style)
</ins><span class="cx"> {
</span><span class="cx"> m_mutableStyle = style;
</span><span class="cx"> // FIXME: We should be able to figure out whether or not font is fixed width for mutable style.
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx"> extractFontSizeDelta();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EditingStyle::overrideWithStyle(const StylePropertySet* style)
</del><ins>+void EditingStyle::overrideWithStyle(const StyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> return mergeStyle(style, OverrideValues);
</span><span class="cx"> }
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> PassRefPtr<EditingStyle> EditingStyle::extractAndRemoveTextDirection()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<EditingStyle> textDirection = EditingStyle::create();
</span><del>- textDirection->m_mutableStyle = MutableStylePropertySet::create();
</del><ins>+ textDirection->m_mutableStyle = MutableStyleProperties::create();
</ins><span class="cx"> textDirection->m_mutableStyle->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed, m_mutableStyle->propertyIsImportant(CSSPropertyUnicodeBidi));
</span><span class="cx"> textDirection->m_mutableStyle->setProperty(CSSPropertyDirection, m_mutableStyle->getPropertyValue(CSSPropertyDirection),
</span><span class="cx"> m_mutableStyle->propertyIsImportant(CSSPropertyDirection));
</span><span class="lines">@@ -609,8 +609,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!node || !node->parentNode())
</span><span class="cx"> return;
</span><del>- RefPtr<MutableStylePropertySet> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
- RefPtr<MutableStylePropertySet> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
</del><ins>+ RefPtr<MutableStyleProperties> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
+ RefPtr<MutableStyleProperties> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
</ins><span class="cx"> nodeStyle->removeEquivalentProperties(parentStyle.get());
</span><span class="cx"> m_mutableStyle->removeEquivalentProperties(nodeStyle.get());
</span><span class="cx"> }
</span><span class="lines">@@ -620,8 +620,8 @@
</span><span class="cx"> if (!node || !node->parentNode() || !m_mutableStyle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
- RefPtr<MutableStylePropertySet> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
</del><ins>+ RefPtr<MutableStyleProperties> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
+ RefPtr<MutableStyleProperties> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
</ins><span class="cx"> nodeStyle->removeEquivalentProperties(parentStyle.get());
</span><span class="cx">
</span><span class="cx"> unsigned propertyCount = nodeStyle->propertyCount();
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> TriState EditingStyle::triStateOfStyle(T* styleToCompare, ShouldIgnoreTextOnlyProperties shouldIgnoreTextOnlyProperties) const
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> difference = getPropertiesNotIn(m_mutableStyle.get(), styleToCompare);
</del><ins>+ RefPtr<MutableStyleProperties> difference = getPropertiesNotIn(m_mutableStyle.get(), styleToCompare);
</ins><span class="cx">
</span><span class="cx"> if (shouldIgnoreTextOnlyProperties == IgnoreTextOnlyProperties)
</span><span class="cx"> difference->removePropertiesInSet(textOnlyProperties, WTF_ARRAY_LENGTH(textOnlyProperties));
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> ASSERT(element);
</span><span class="cx"> ASSERT(!conflictingProperties || conflictingProperties->isEmpty());
</span><span class="cx">
</span><del>- const StylePropertySet* inlineStyle = element->inlineStyle();
</del><ins>+ const StyleProperties* inlineStyle = element->inlineStyle();
</ins><span class="cx"> if (!m_mutableStyle || !inlineStyle)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> matchedAttributes++;
</span><span class="cx">
</span><span class="cx"> if (element->hasAttribute(HTMLNames::styleAttr)) {
</span><del>- if (const StylePropertySet* style = element->inlineStyle()) {
</del><ins>+ if (const StyleProperties* style = element->inlineStyle()) {
</ins><span class="cx"> unsigned propertyCount = style->propertyCount();
</span><span class="cx"> for (unsigned i = 0; i < propertyCount; ++i) {
</span><span class="cx"> if (!isEditingProperty(style->propertyAt(i).id()))
</span><span class="lines">@@ -925,7 +925,7 @@
</span><span class="cx"> // If this function was modified in the future to delete all redundant properties, then add a boolean value to indicate
</span><span class="cx"> // which one of editingStyleAtPosition or computedStyle is called.
</span><span class="cx"> RefPtr<EditingStyle> editingStyleAtPosition = EditingStyle::create(position, EditingPropertiesInEffect);
</span><del>- StylePropertySet* styleAtPosition = editingStyleAtPosition->m_mutableStyle.get();
</del><ins>+ StyleProperties* styleAtPosition = editingStyleAtPosition->m_mutableStyle.get();
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> unicodeBidi;
</span><span class="cx"> RefPtr<CSSValue> direction;
</span><span class="lines">@@ -982,13 +982,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool elementMatchesAndPropertyIsNotInInlineStyleDecl(const HTMLElementEquivalent* equivalent, const StyledElement* element,
</span><del>- EditingStyle::CSSPropertyOverrideMode mode, StylePropertySet* style)
</del><ins>+ EditingStyle::CSSPropertyOverrideMode mode, StyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> return equivalent->matches(element) && (!element->inlineStyle() || !equivalent->propertyExistsInStyle(element->inlineStyle()))
</span><span class="cx"> && (mode == EditingStyle::OverrideValues || !equivalent->propertyExistsInStyle(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<MutableStylePropertySet> extractEditingProperties(const StylePropertySet* style, EditingStyle::PropertiesToInclude propertiesToInclude)
</del><ins>+static PassRefPtr<MutableStyleProperties> extractEditingProperties(const StyleProperties* style, EditingStyle::PropertiesToInclude propertiesToInclude)
</ins><span class="cx"> {
</span><span class="cx"> if (!style)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1074,7 +1074,7 @@
</span><span class="cx"> mergedValue->append(lineThrough.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EditingStyle::mergeStyle(const StylePropertySet* style, CSSPropertyOverrideMode mode)
</del><ins>+void EditingStyle::mergeStyle(const StyleProperties* style, CSSPropertyOverrideMode mode)
</ins><span class="cx"> {
</span><span class="cx"> if (!style)
</span><span class="cx"> return;
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned propertyCount = style->propertyCount();
</span><span class="cx"> for (unsigned i = 0; i < propertyCount; ++i) {
</span><del>- StylePropertySet::PropertyReference property = style->propertyAt(i);
</del><ins>+ StyleProperties::PropertyReference property = style->propertyAt(i);
</ins><span class="cx"> RefPtr<CSSValue> value = m_mutableStyle->getPropertyCSSValue(property.id());
</span><span class="cx">
</span><span class="cx"> // text decorations never override values
</span><span class="lines">@@ -1107,9 +1107,9 @@
</span><span class="cx"> m_fontSizeDelta += oldFontSizeDelta;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<MutableStylePropertySet> styleFromMatchedRulesForElement(Element* element, unsigned rulesToInclude)
</del><ins>+static PassRefPtr<MutableStyleProperties> styleFromMatchedRulesForElement(Element* element, unsigned rulesToInclude)
</ins><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> Vector<RefPtr<StyleRuleBase>> matchedRules = element->document().ensureStyleResolver().styleRulesForElement(element, rulesToInclude);
</span><span class="cx"> for (unsigned i = 0; i < matchedRules.size(); ++i) {
</span><span class="cx"> if (matchedRules[i]->isStyleRule())
</span><span class="lines">@@ -1121,7 +1121,7 @@
</span><span class="cx">
</span><span class="cx"> void EditingStyle::mergeStyleFromRules(StyledElement* element)
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> styleFromMatchedRules = styleFromMatchedRulesForElement(element,
</del><ins>+ RefPtr<MutableStyleProperties> styleFromMatchedRules = styleFromMatchedRulesForElement(element,
</ins><span class="cx"> StyleResolver::AuthorCSSRules | StyleResolver::CrossOriginCSSRules);
</span><span class="cx"> // Styles from the inline style declaration, held in the variable "style", take precedence
</span><span class="cx"> // over those from matched rules.
</span><span class="lines">@@ -1139,13 +1139,13 @@
</span><span class="cx"> // The property value, if it's a percentage, may not reflect the actual computed value.
</span><span class="cx"> // For example: style="height: 1%; overflow: visible;" in quirksmode
</span><span class="cx"> // FIXME: There are others like this, see <rdar://problem/5195123> Slashdot copy/paste fidelity problem
</span><del>- RefPtr<MutableStylePropertySet> fromComputedStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> fromComputedStyle = MutableStyleProperties::create();
</ins><span class="cx"> ComputedStyleExtractor computedStyle(element);
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> unsigned propertyCount = m_mutableStyle->propertyCount();
</span><span class="cx"> for (unsigned i = 0; i < propertyCount; ++i) {
</span><del>- StylePropertySet::PropertyReference property = m_mutableStyle->propertyAt(i);
</del><ins>+ StyleProperties::PropertyReference property = m_mutableStyle->propertyAt(i);
</ins><span class="cx"> CSSValue* value = property.value();
</span><span class="cx"> if (!value->isPrimitiveValue())
</span><span class="cx"> continue;
</span><span class="lines">@@ -1158,7 +1158,7 @@
</span><span class="cx"> m_mutableStyle->mergeAndOverrideOnConflict(*fromComputedStyle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void removePropertiesInStyle(MutableStylePropertySet* styleToRemovePropertiesFrom, StylePropertySet* style)
</del><ins>+static void removePropertiesInStyle(MutableStyleProperties* styleToRemovePropertiesFrom, StyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> unsigned propertyCount = style->propertyCount();
</span><span class="cx"> Vector<CSSPropertyID> propertiesToRemove(propertyCount);
</span><span class="lines">@@ -1175,7 +1175,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 1. Remove style from matched rules because style remain without repeating it in inline style declaration
</span><del>- RefPtr<MutableStylePropertySet> styleFromMatchedRules = styleFromMatchedRulesForElement(element, StyleResolver::AllButEmptyCSSRules);
</del><ins>+ RefPtr<MutableStyleProperties> styleFromMatchedRules = styleFromMatchedRulesForElement(element, StyleResolver::AllButEmptyCSSRules);
</ins><span class="cx"> if (styleFromMatchedRules && !styleFromMatchedRules->isEmpty())
</span><span class="cx"> m_mutableStyle = getPropertiesNotIn(m_mutableStyle.get(), styleFromMatchedRules.get());
</span><span class="cx">
</span><span class="lines">@@ -1204,7 +1204,7 @@
</span><span class="cx"> if (!m_mutableStyle || m_mutableStyle->isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<StylePropertySet> defaultStyle = styleFromMatchedRulesForElement(element, StyleResolver::UAAndUserCSSRules);
</del><ins>+ RefPtr<StyleProperties> defaultStyle = styleFromMatchedRulesForElement(element, StyleResolver::UAAndUserCSSRules);
</ins><span class="cx">
</span><span class="cx"> removePropertiesInStyle(m_mutableStyle.get(), defaultStyle.get());
</span><span class="cx"> }
</span><span class="lines">@@ -1212,7 +1212,7 @@
</span><span class="cx"> void EditingStyle::forceInline()
</span><span class="cx"> {
</span><span class="cx"> if (!m_mutableStyle)
</span><del>- m_mutableStyle = MutableStylePropertySet::create();
</del><ins>+ m_mutableStyle = MutableStyleProperties::create();
</ins><span class="cx"> const bool propertyIsImportant = true;
</span><span class="cx"> m_mutableStyle->setProperty(CSSPropertyDisplay, CSSValueInline, propertyIsImportant);
</span><span class="cx"> }
</span><span class="lines">@@ -1344,7 +1344,7 @@
</span><span class="cx"> return foundDirection;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void reconcileTextDecorationProperties(MutableStylePropertySet* style)
</del><ins>+static void reconcileTextDecorationProperties(MutableStyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValue> textDecorationsInEffect = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
</span><span class="cx"> RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(CSSPropertyTextDecoration);
</span><span class="lines">@@ -1380,7 +1380,7 @@
</span><span class="cx"> ComputedStyleExtractor computedStyle(node);
</span><span class="cx">
</span><span class="cx"> // FIXME: take care of background-color in effect
</span><del>- RefPtr<MutableStylePropertySet> mutableStyle = getPropertiesNotIn(style->style(), &computedStyle);
</del><ins>+ RefPtr<MutableStyleProperties> mutableStyle = getPropertiesNotIn(style->style(), &computedStyle);
</ins><span class="cx">
</span><span class="cx"> reconcileTextDecorationProperties(mutableStyle.get());
</span><span class="cx"> if (!document->frame()->editor().shouldStyleWithCSS())
</span><span class="lines">@@ -1399,7 +1399,7 @@
</span><span class="cx"> m_cssStyle = mutableStyle->asText().stripWhiteSpace();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setTextDecorationProperty(MutableStylePropertySet* style, const CSSValueList* newTextDecoration, CSSPropertyID propertyID)
</del><ins>+static void setTextDecorationProperty(MutableStyleProperties* style, const CSSValueList* newTextDecoration, CSSPropertyID propertyID)
</ins><span class="cx"> {
</span><span class="cx"> if (newTextDecoration->length())
</span><span class="cx"> style->setProperty(propertyID, newTextDecoration->cssText(), style->propertyIsImportant(propertyID));
</span><span class="lines">@@ -1409,7 +1409,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleChange::extractTextStyles(Document* document, MutableStylePropertySet* style, bool shouldUseFixedFontDefaultSize)
</del><ins>+void StyleChange::extractTextStyles(Document* document, MutableStyleProperties* style, bool shouldUseFixedFontDefaultSize)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(style);
</span><span class="cx">
</span><span class="lines">@@ -1474,7 +1474,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void diffTextDecorations(MutableStylePropertySet* style, CSSPropertyID propertID, CSSValue* refTextDecoration)
</del><ins>+static void diffTextDecorations(MutableStyleProperties* style, CSSPropertyID propertID, CSSValue* refTextDecoration)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(propertID);
</span><span class="cx"> if (!textDecoration || !textDecoration->isValueList() || !refTextDecoration || !refTextDecoration->isValueList())
</span><span class="lines">@@ -1527,10 +1527,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-static PassRefPtr<MutableStylePropertySet> extractPropertiesNotIn(StylePropertySet* styleWithRedundantProperties, T* baseStyle)
</del><ins>+static PassRefPtr<MutableStyleProperties> extractPropertiesNotIn(StyleProperties* styleWithRedundantProperties, T* baseStyle)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(styleWithRedundantProperties);
</span><del>- RefPtr<MutableStylePropertySet> result = styleWithRedundantProperties->mutableCopy();
</del><ins>+ RefPtr<MutableStyleProperties> result = styleWithRedundantProperties->mutableCopy();
</ins><span class="cx">
</span><span class="cx"> result->removeEquivalentProperties(baseStyle);
</span><span class="cx">
</span><span class="lines">@@ -1555,7 +1555,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-PassRefPtr<MutableStylePropertySet> getPropertiesNotIn(StylePropertySet* styleWithRedundantProperties, T* baseStyle)
</del><ins>+PassRefPtr<MutableStyleProperties> getPropertiesNotIn(StyleProperties* styleWithRedundantProperties, T* baseStyle)
</ins><span class="cx"> {
</span><span class="cx"> return extractPropertiesNotIn(styleWithRedundantProperties, baseStyle);
</span><span class="cx"> }
</span><span class="lines">@@ -1598,7 +1598,7 @@
</span><span class="cx"> return value->getValueID() == CSSValueTransparent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool hasTransparentBackgroundColor(StylePropertySet* style)
</del><ins>+bool hasTransparentBackgroundColor(StyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValue> cssValue = style->getPropertyCSSValue(CSSPropertyBackgroundColor);
</span><span class="cx"> return isTransparentColorValue(cssValue.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/EditingStyle.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span><span class="cx"> class HTMLElement;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx"> class Node;
</span><span class="cx"> class Position;
</span><span class="cx"> class QualifiedName;
</span><span class="cx"> class RenderStyle;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx"> class StyledElement;
</span><span class="cx"> class VisibleSelection;
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> return adoptRef(new EditingStyle(position, propertiesToInclude));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<EditingStyle> create(const StylePropertySet* style)
</del><ins>+ static PassRefPtr<EditingStyle> create(const StyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new EditingStyle(style));
</span><span class="cx"> }
</span><span class="lines">@@ -96,11 +96,11 @@
</span><span class="cx">
</span><span class="cx"> ~EditingStyle();
</span><span class="cx">
</span><del>- MutableStylePropertySet* style() { return m_mutableStyle.get(); }
</del><ins>+ MutableStyleProperties* style() { return m_mutableStyle.get(); }
</ins><span class="cx"> bool textDirection(WritingDirection&) const;
</span><span class="cx"> bool isEmpty() const;
</span><del>- void setStyle(PassRefPtr<MutableStylePropertySet>);
- void overrideWithStyle(const StylePropertySet*);
</del><ins>+ void setStyle(PassRefPtr<MutableStyleProperties>);
+ void overrideWithStyle(const StyleProperties*);
</ins><span class="cx"> void clear();
</span><span class="cx"> PassRefPtr<EditingStyle> copy() const;
</span><span class="cx"> PassRefPtr<EditingStyle> extractAndRemoveBlockProperties();
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> EditingStyle();
</span><span class="cx"> EditingStyle(Node*, PropertiesToInclude);
</span><span class="cx"> EditingStyle(const Position&, PropertiesToInclude);
</span><del>- explicit EditingStyle(const StylePropertySet*);
</del><ins>+ explicit EditingStyle(const StyleProperties*);
</ins><span class="cx"> EditingStyle(CSSPropertyID, const String& value);
</span><span class="cx"> void init(Node*, PropertiesToInclude);
</span><span class="cx"> void removeTextFillAndStrokeColorsIfNeeded(RenderStyle*);
</span><span class="lines">@@ -157,9 +157,9 @@
</span><span class="cx"> TriState triStateOfStyle(T* styleToCompare, ShouldIgnoreTextOnlyProperties) const;
</span><span class="cx"> bool conflictsWithInlineStyleOfElement(StyledElement*, EditingStyle* extractedStyle, Vector<CSSPropertyID>* conflictingProperties) const;
</span><span class="cx"> void mergeInlineAndImplicitStyleOfElement(StyledElement*, CSSPropertyOverrideMode, PropertiesToInclude);
</span><del>- void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
</del><ins>+ void mergeStyle(const StyleProperties*, CSSPropertyOverrideMode);
</ins><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> m_mutableStyle;
</del><ins>+ RefPtr<MutableStyleProperties> m_mutableStyle;
</ins><span class="cx"> bool m_shouldUseFixedDefaultFontSize;
</span><span class="cx"> float m_fontSizeDelta;
</span><span class="cx">
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> return !(*this == other);
</span><span class="cx"> }
</span><span class="cx"> private:
</span><del>- void extractTextStyles(Document*, MutableStylePropertySet*, bool shouldUseFixedFontDefaultSize);
</del><ins>+ void extractTextStyles(Document*, MutableStyleProperties*, bool shouldUseFixedFontDefaultSize);
</ins><span class="cx">
</span><span class="cx"> String m_cssStyle;
</span><span class="cx"> bool m_applyBold;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/Editor.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> #include "Sound.h"
</span><span class="cx"> #include "SpellChecker.h"
</span><span class="cx"> #include "SpellingCorrectionCommand.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TextCheckerClient.h"
</span><span class="cx"> #include "TextCheckingHelper.h"
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx"> return findEventTargetFrom(m_frame.selection().selection());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::applyStyle(StylePropertySet* style, EditAction editingAction)
</del><ins>+void Editor::applyStyle(StyleProperties* style, EditAction editingAction)
</ins><span class="cx"> {
</span><span class="cx"> switch (m_frame.selection().selectionType()) {
</span><span class="cx"> case VisibleSelection::NoSelection:
</span><span class="lines">@@ -762,12 +762,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Editor::shouldApplyStyle(StylePropertySet* style, Range* range)
</del><ins>+bool Editor::shouldApplyStyle(StyleProperties* style, Range* range)
</ins><span class="cx"> {
</span><span class="cx"> return client()->shouldApplyStyle(style, range);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::applyParagraphStyle(StylePropertySet* style, EditAction editingAction)
</del><ins>+void Editor::applyParagraphStyle(StyleProperties* style, EditAction editingAction)
</ins><span class="cx"> {
</span><span class="cx"> switch (m_frame.selection().selectionType()) {
</span><span class="cx"> case VisibleSelection::NoSelection:
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::applyStyleToSelection(StylePropertySet* style, EditAction editingAction)
</del><ins>+void Editor::applyStyleToSelection(StyleProperties* style, EditAction editingAction)
</ins><span class="cx"> {
</span><span class="cx"> if (!style || style->isEmpty() || !canEditRichly())
</span><span class="cx"> return;
</span><span class="lines">@@ -790,7 +790,7 @@
</span><span class="cx"> applyStyle(style, editingAction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::applyParagraphStyleToSelection(StylePropertySet* style, EditAction editingAction)
</del><ins>+void Editor::applyParagraphStyleToSelection(StyleProperties* style, EditAction editingAction)
</ins><span class="cx"> {
</span><span class="cx"> if (!style || style->isEmpty() || !canEditRichly())
</span><span class="cx"> return;
</span><span class="lines">@@ -1423,7 +1423,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(CSSPropertyDirection, direction == LeftToRightWritingDirection ? "ltr" : direction == RightToLeftWritingDirection ? "rtl" : "inherit", false);
</span><span class="cx"> applyParagraphStyleToSelection(style.get(), EditActionSetWritingDirection);
</span><span class="cx"> }
</span><span class="lines">@@ -2730,7 +2730,7 @@
</span><span class="cx"> return client() && client()->shouldChangeSelectedRange(oldSelection.toNormalizedRange().get(), newSelection.toNormalizedRange().get(), affinity, stillSelecting);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::computeAndSetTypingStyle(StylePropertySet* style, EditAction editingAction)
</del><ins>+void Editor::computeAndSetTypingStyle(StyleProperties* style, EditAction editingAction)
</ins><span class="cx"> {
</span><span class="cx"> if (!style || style->isEmpty()) {
</span><span class="cx"> m_frame.selection().clearTypingStyle();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/Editor.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> class SimpleFontData;
</span><span class="cx"> class SpellCheckRequest;
</span><span class="cx"> class SpellChecker;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx"> class Text;
</span><span class="cx"> class TextCheckerClient;
</span><span class="cx"> class TextEvent;
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> bool shouldInsertFragment(PassRefPtr<DocumentFragment>, PassRefPtr<Range>, EditorInsertAction);
</span><span class="cx"> bool shouldInsertText(const String&, Range*, EditorInsertAction) const;
</span><span class="cx"> bool shouldDeleteRange(Range*) const;
</span><del>- bool shouldApplyStyle(StylePropertySet*, Range*);
</del><ins>+ bool shouldApplyStyle(StyleProperties*, Range*);
</ins><span class="cx">
</span><span class="cx"> void respondToChangedContents(const VisibleSelection& endingSelection);
</span><span class="cx">
</span><span class="lines">@@ -166,10 +166,10 @@
</span><span class="cx"> void deleteSelectionWithSmartDelete(bool smartDelete);
</span><span class="cx"> bool dispatchCPPEvent(const AtomicString&, ClipboardAccessPolicy);
</span><span class="cx">
</span><del>- void applyStyle(StylePropertySet*, EditAction = EditActionUnspecified);
- void applyParagraphStyle(StylePropertySet*, EditAction = EditActionUnspecified);
- void applyStyleToSelection(StylePropertySet*, EditAction);
- void applyParagraphStyleToSelection(StylePropertySet*, EditAction);
</del><ins>+ void applyStyle(StyleProperties*, EditAction = EditActionUnspecified);
+ void applyParagraphStyle(StyleProperties*, EditAction = EditActionUnspecified);
+ void applyStyleToSelection(StyleProperties*, EditAction);
+ void applyParagraphStyleToSelection(StyleProperties*, EditAction);
</ins><span class="cx">
</span><span class="cx"> void appliedEditing(PassRefPtr<CompositeEditCommand>);
</span><span class="cx"> void unappliedEditing(PassRefPtr<EditCommandComposition>);
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> const VisibleSelection& mark() const; // Mark, to be used as emacs uses it.
</span><span class="cx"> void setMark(const VisibleSelection&);
</span><span class="cx">
</span><del>- void computeAndSetTypingStyle(StylePropertySet* , EditAction = EditActionUnspecified);
</del><ins>+ void computeAndSetTypingStyle(StyleProperties* , EditAction = EditActionUnspecified);
</ins><span class="cx"> void applyEditingStyleToBodyElement() const;
</span><span class="cx"> void applyEditingStyleToElement(Element*) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditorCommand.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> #include "Scrollbar.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "Sound.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TypingCommand.h"
</span><span class="cx"> #include "UnlinkCommand.h"
</span><span class="cx"> #include "UserTypingGestureIndicator.h"
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return node->document().frame();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool applyCommandToFrame(Frame& frame, EditorCommandSource source, EditAction action, StylePropertySet* style)
</del><ins>+static bool applyCommandToFrame(Frame& frame, EditorCommandSource source, EditAction action, StyleProperties* style)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that?
</span><span class="cx"> switch (source) {
</span><span class="lines">@@ -116,14 +116,14 @@
</span><span class="cx">
</span><span class="cx"> static bool executeApplyStyle(Frame& frame, EditorCommandSource source, EditAction action, CSSPropertyID propertyID, const String& propertyValue)
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(propertyID, propertyValue);
</span><span class="cx"> return applyCommandToFrame(frame, source, action, style.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool executeApplyStyle(Frame& frame, EditorCommandSource source, EditAction action, CSSPropertyID propertyID, CSSValueID propertyValue)
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(propertyID, propertyValue);
</span><span class="cx"> return applyCommandToFrame(frame, source, action, style.get());
</span><span class="cx"> }
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> newStyle = value->cssText();
</span><span class="cx">
</span><span class="cx"> // FIXME: We shouldn't be having to convert new style into text. We should have setPropertyCSSValue.
</span><del>- RefPtr<MutableStylePropertySet> newMutableStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> newMutableStyle = MutableStyleProperties::create();
</ins><span class="cx"> newMutableStyle->setProperty(propertyID, newStyle);
</span><span class="cx"> return applyCommandToFrame(frame, source, action, newMutableStyle.get());
</span><span class="cx"> }
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> static bool executeApplyParagraphStyle(Frame& frame, EditorCommandSource source, EditAction action, CSSPropertyID propertyID, const String& propertyValue)
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(propertyID, propertyValue);
</span><span class="cx"> // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that?
</span><span class="cx"> switch (source) {
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx">
</span><span class="cx"> static bool executeMakeTextWritingDirectionLeftToRight(Frame& frame, Event*, EditorCommandSource, const String&)
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed);
</span><span class="cx"> style->setProperty(CSSPropertyDirection, CSSValueLtr);
</span><span class="cx"> frame.editor().applyStyle(style.get(), EditActionSetWritingDirection);
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx">
</span><span class="cx"> static bool executeMakeTextWritingDirectionNatural(Frame& frame, Event*, EditorCommandSource, const String&)
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(CSSPropertyUnicodeBidi, CSSValueNormal);
</span><span class="cx"> frame.editor().applyStyle(style.get(), EditActionSetWritingDirection);
</span><span class="cx"> return true;
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx">
</span><span class="cx"> static bool executeMakeTextWritingDirectionRightToLeft(Frame& frame, Event*, EditorCommandSource, const String&)
</span><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(CSSPropertyUnicodeBidi, CSSValueEmbed);
</span><span class="cx"> style->setProperty(CSSPropertyDirection, CSSValueRtl);
</span><span class="cx"> frame.editor().applyStyle(style.get(), EditActionSetWritingDirection);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> #include "RenderedPosition.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SpatialNavigation.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TypingCommand.h"
</span><span class="cx"> #include "VisibleUnits.h"
</span><span class="cx"> #include "htmlediting.h"
</span><span class="lines">@@ -1906,7 +1906,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<MutableStylePropertySet> FrameSelection::copyTypingStyle() const
</del><ins>+PassRefPtr<MutableStyleProperties> FrameSelection::copyTypingStyle() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_typingStyle || !m_typingStyle->style())
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class GraphicsContext;
</span><span class="cx"> class HTMLFormElement;
</span><del>-class MutableStylePropertySet;
</del><ins>+class MutableStyleProperties;
</ins><span class="cx"> class RenderObject;
</span><span class="cx"> class RenderView;
</span><span class="cx"> class Settings;
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> void paintDragCaret(GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;
</span><span class="cx">
</span><span class="cx"> EditingStyle* typingStyle() const;
</span><del>- PassRefPtr<MutableStylePropertySet> copyTypingStyle() const;
</del><ins>+ PassRefPtr<MutableStyleProperties> copyTypingStyle() const;
</ins><span class="cx"> void setTypingStyle(PassRefPtr<EditingStyle>);
</span><span class="cx"> void clearTypingStyle();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingRemoveCSSPropertyCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/RemoveCSSPropertyCommand.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSStyleDeclaration.h"
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyledElement.h"
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx">
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> void RemoveCSSPropertyCommand::doApply()
</span><span class="cx"> {
</span><del>- const StylePropertySet* style = m_element->inlineStyle();
</del><ins>+ const StyleProperties* style = m_element->inlineStyle();
</ins><span class="cx"> m_oldValue = style->getPropertyValue(m_property);
</span><span class="cx"> m_important = style->propertyIsImportant(m_property);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingRemoveFormatCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/RemoveFormatCommand.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/RemoveFormatCommand.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/RemoveFormatCommand.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "SimplifyMarkupCommand.h"
</span><span class="cx"> #include "SmartReplace.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "VisibleUnits.h"
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx">
</span><span class="cx"> StyledElement* element = toStyledElement(node.get());
</span><span class="cx">
</span><del>- const StylePropertySet* inlineStyle = element->inlineStyle();
</del><ins>+ const StyleProperties* inlineStyle = element->inlineStyle();
</ins><span class="cx"> RefPtr<EditingStyle> newInlineStyle = EditingStyle::create(inlineStyle);
</span><span class="cx"> if (inlineStyle) {
</span><span class="cx"> if (element->isHTMLElement()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include "SoftLinking.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TypingCommand.h"
</span><span class="cx"> #include "WAKAppKitStubs.h"
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(CSSPropertyTextAlign, newValue);
</span><span class="cx"> applyParagraphStyle(style.get());
</span><span class="cx"> }
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> // This function removes styles that the user cannot modify by applying their default values.
</span><span class="cx">
</span><span class="cx"> RefPtr<EditingStyle> editingStyle = EditingStyle::create(m_frame.document()->body());
</span><del>- RefPtr<MutableStylePropertySet> defaultStyle = editingStyle.get()->style()->mutableCopy();
</del><ins>+ RefPtr<MutableStyleProperties> defaultStyle = editingStyle.get()->style()->mutableCopy();
</ins><span class="cx">
</span><span class="cx"> // Text widgets implement background color via the UIView property. Their body element will not have one.
</span><span class="cx"> defaultStyle->setProperty(CSSPropertyBackgroundColor, "rgba(255, 255, 255, 0.0)");
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> #import "ResourceBuffer.h"
</span><span class="cx"> #import "RuntimeApplicationChecks.h"
</span><span class="cx"> #import "Sound.h"
</span><del>-#import "StylePropertySet.h"
</del><ins>+#import "StyleProperties.h"
</ins><span class="cx"> #import "Text.h"
</span><span class="cx"> #import "TypingCommand.h"
</span><span class="cx"> #import "UUID.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/editing/markup.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #include "MarkupAccumulator.h"
</span><span class="cx"> #include "Range.h"
</span><span class="cx"> #include "RenderBlock.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "VisibleSelection.h"
</span><span class="cx"> #include "VisibleUnits.h"
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-static bool propertyMissingOrEqualToNone(StylePropertySet*, CSSPropertyID);
</del><ins>+static bool propertyMissingOrEqualToNone(StyleProperties*, CSSPropertyID);
</ins><span class="cx">
</span><span class="cx"> class AttributeChange {
</span><span class="cx"> public:
</span><span class="lines">@@ -124,13 +124,13 @@
</span><span class="cx">
</span><span class="cx"> Node* serializeNodes(Node* startNode, Node* pastEnd);
</span><span class="cx"> void wrapWithNode(Node&, bool convertBlocksToInlines = false, RangeFullySelectsNode = DoesFullySelectNode);
</span><del>- void wrapWithStyleNode(StylePropertySet*, Document&, bool isBlock = false);
</del><ins>+ void wrapWithStyleNode(StyleProperties*, Document&, bool isBlock = false);
</ins><span class="cx"> String takeResults();
</span><span class="cx">
</span><span class="cx"> using MarkupAccumulator::appendString;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void appendStyleNodeOpenTag(StringBuilder&, StylePropertySet*, Document&, bool isBlock = false);
</del><ins>+ void appendStyleNodeOpenTag(StringBuilder&, StyleProperties*, Document&, bool isBlock = false);
</ins><span class="cx"> const String& styleNodeCloseTag(bool isBlock = false);
</span><span class="cx">
</span><span class="cx"> String renderedText(const Node&, const Range*);
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> m_nodes->append(&node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style, Document& document, bool isBlock)
</del><ins>+void StyledMarkupAccumulator::wrapWithStyleNode(StyleProperties* style, Document& document, bool isBlock)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder openTag;
</span><span class="cx"> appendStyleNodeOpenTag(openTag, style, document, isBlock);
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> appendString(styleNodeCloseTag(isBlock));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyledMarkupAccumulator::appendStyleNodeOpenTag(StringBuilder& out, StylePropertySet* style, Document& document, bool isBlock)
</del><ins>+void StyledMarkupAccumulator::appendStyleNodeOpenTag(StringBuilder& out, StyleProperties* style, Document& document, bool isBlock)
</ins><span class="cx"> {
</span><span class="cx"> // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
</span><span class="cx"> ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> return ancestorToRetainStructureAndAppearanceForBlock(enclosingBlock(commonAncestor));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool propertyMissingOrEqualToNone(StylePropertySet* style, CSSPropertyID propertyID)
</del><ins>+static bool propertyMissingOrEqualToNone(StyleProperties* style, CSSPropertyID propertyID)
</ins><span class="cx"> {
</span><span class="cx"> if (!style)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLBRElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLBRElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLBRElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLBRElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLBRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == clearAttr) {
</span><span class="cx"> // If the string is empty, then don't add the clear property.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLBRElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLBRElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLBRElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLBRElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> HTMLBRElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual RenderElement* createRenderer(PassRef<RenderStyle>) OVERRIDE;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLBodyElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLBodyElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLBodyElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLBodyElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "Page.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLBodyElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLBodyElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == backgroundAttr) {
</span><span class="cx"> String url = stripLeadingAndTrailingHTMLSpaces(value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLBodyElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLBodyElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLBodyElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLBodyElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDivElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDivElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDivElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLDivElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLDivElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLDivElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == alignAttr) {
</span><span class="cx"> if (equalIgnoringCase(value, "middle") || equalIgnoringCase(value, "center"))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDivElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDivElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDivElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLDivElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #include "RenderLineBreak.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "SubframeLoader.h"
</span><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="lines">@@ -138,13 +138,13 @@
</span><span class="cx"> return borderWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::applyBorderAttributeToStyle(const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLElement::applyBorderAttributeToStyle(const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidth, parseBorderWidthAttribute(value), CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyle, CSSValueSolid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::mapLanguageAttributeToLocale(const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLElement::mapLanguageAttributeToLocale(const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (!value.isEmpty()) {
</span><span class="cx"> // Have to quote so the locale id is treated as a string instead of as a CSS keyword.
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> return StyledElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == alignAttr) {
</span><span class="cx"> if (equalIgnoringCase(value, "middle"))
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx"> insertAdjacent(where, textNode.get(), ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStylePropertySet& style)
</del><ins>+void HTMLElement::applyAlignmentAttributeToStyle(const AtomicString& alignment, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> // Vertical alignment with respect to the current baseline of the text
</span><span class="cx"> // right or left means floating images.
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx"> return StyledElement::isURLAttribute(attribute);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLElement::addHTMLLengthToStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, const String& value)
</del><ins>+void HTMLElement::addHTMLLengthToStyle(MutableStyleProperties& style, CSSPropertyID propertyID, const String& value)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: This function should not spin up the CSS parser, but should instead just figure out the correct
</span><span class="cx"> // length unit and make the appropriate parsed value.
</span><span class="lines">@@ -1054,7 +1054,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Color parsing that matches HTML's "rules for parsing a legacy color value"
</span><del>-void HTMLElement::addHTMLColorToStyle(MutableStylePropertySet& style, CSSPropertyID propertyID, const String& attributeValue)
</del><ins>+void HTMLElement::addHTMLColorToStyle(MutableStyleProperties& style, CSSPropertyID propertyID, const String& attributeValue)
</ins><span class="cx"> {
</span><span class="cx"> // An empty string doesn't apply a color. (One containing only whitespace does, which is why this check occurs before stripping.)
</span><span class="cx"> if (attributeValue.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -98,15 +98,15 @@
</span><span class="cx"> protected:
</span><span class="cx"> HTMLElement(const QualifiedName& tagName, Document&, ConstructionType);
</span><span class="cx">
</span><del>- void addHTMLLengthToStyle(MutableStylePropertySet&, CSSPropertyID, const String& value);
- void addHTMLColorToStyle(MutableStylePropertySet&, CSSPropertyID, const String& color);
</del><ins>+ void addHTMLLengthToStyle(MutableStyleProperties&, CSSPropertyID, const String& value);
+ void addHTMLColorToStyle(MutableStyleProperties&, CSSPropertyID, const String& color);
</ins><span class="cx">
</span><del>- void applyAlignmentAttributeToStyle(const AtomicString&, MutableStylePropertySet&);
- void applyBorderAttributeToStyle(const AtomicString&, MutableStylePropertySet&);
</del><ins>+ void applyAlignmentAttributeToStyle(const AtomicString&, MutableStyleProperties&);
+ void applyBorderAttributeToStyle(const AtomicString&, MutableStyleProperties&);
</ins><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> unsigned parseBorderWidthAttribute(const AtomicString&) const;
</span><span class="cx">
</span><span class="cx"> virtual void childrenChanged(const ChildChange&) OVERRIDE;
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual String nodeName() const OVERRIDE FINAL;
</span><span class="cx">
</span><del>- void mapLanguageAttributeToLocale(const AtomicString&, MutableStylePropertySet&);
</del><ins>+ void mapLanguageAttributeToLocale(const AtomicString&, MutableStyleProperties&);
</ins><span class="cx">
</span><span class="cx"> virtual HTMLFormElement* virtualForm() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLEmbedElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLEmbedElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return HTMLPlugInImageElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLEmbedElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLEmbedElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == hiddenAttr) {
</span><span class="cx"> if (equalIgnoringCase(value, "yes") || equalIgnoringCase(value, "true")) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLEmbedElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLEmbedElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLEmbedElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool rendererIsNeeded(const RenderStyle&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFontElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFontElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFontElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLFontElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "CSSValuePool.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> using namespace WTF;
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLFontElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == sizeAttr) {
</span><span class="cx"> CSSValueID size = CSSValueInvalid;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFontElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFontElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFontElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLFontElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> HTMLFontElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLFrameSetElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == bordercolorAttr)
</span><span class="cx"> addHTMLColorToStyle(style, CSSPropertyBorderColor, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameSetElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameSetElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLFrameSetElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual void willAttachRenderers() OVERRIDE;
</span><span class="cx"> virtual bool rendererIsNeeded(const RenderStyle&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLHRElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLHRElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLHRElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLHRElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include "CSSValuePool.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLHRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLHRElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == alignAttr) {
</span><span class="cx"> if (equalIgnoringCase(value, "left")) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLHRElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLHRElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLHRElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLHRElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> HTMLHRElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLIFrameElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLIFrameElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return HTMLFrameElementBase::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLIFrameElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><span class="cx"> addHTMLLengthToStyle(style, CSSPropertyWidth, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLIFrameElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLIFrameElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLIFrameElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool rendererIsNeeded(const RenderStyle&);
</span><span class="cx"> virtual RenderElement* createRenderer(PassRef<RenderStyle>) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><span class="cx"> addHTMLLengthToStyle(style, CSSPropertyWidth, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLImageElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual void didAttachRenderers() OVERRIDE;
</span><span class="cx"> virtual RenderElement* createRenderer(PassRef<RenderStyle>) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx"> return HTMLTextFormControlElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLInputElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLInputElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == vspaceAttr) {
</span><span class="cx"> addHTMLLengthToStyle(style, CSSPropertyMarginTop, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> virtual void finishParsingChildren() OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual void copyNonAttributePropertiesFromElement(const Element&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLIElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLIElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLLIElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLLIElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLLIElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == typeAttr) {
</span><span class="cx"> if (value == "a")
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLIElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLIElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLLIElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual void didAttachRenderers() OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMarqueeElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMarqueeElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLMarqueeElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == widthAttr) {
</span><span class="cx"> if (!value.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMarqueeElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMarqueeElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> HTMLMarqueeElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> // ActiveDOMObject
</span><span class="cx"> virtual bool canSuspend() const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOListElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOListElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOListElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLOListElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLOListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLOListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == typeAttr) {
</span><span class="cx"> if (value == "a")
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOListElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOListElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOListElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLOListElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> int m_start;
</span><span class="cx"> unsigned m_itemCount;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> return HTMLPlugInImageElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLObjectElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == borderAttr)
</span><span class="cx"> applyBorderAttributeToStyle(value, style);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLObjectElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) OVERRIDE;
</span><span class="cx"> virtual void removedFrom(ContainerNode&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLParagraphElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLParagraphElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLParagraphElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLParagraphElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLParagraphElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLParagraphElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == alignAttr) {
</span><span class="cx"> if (equalIgnoringCase(value, "middle") || equalIgnoringCase(value, "center"))
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLParagraphElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLParagraphElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLParagraphElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLParagraphElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> HTMLParagraphElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> return HTMLFrameOwnerElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLPlugInElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><span class="cx"> addHTMLLengthToStyle(style, CSSPropertyWidth, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void willDetachRenderers() OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool useFallbackContent() const { return false; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPreElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPreElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPreElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLPreElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLPreElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == wrapAttr)
</span><span class="cx"> style.setProperty(CSSPropertyWhiteSpace, CSSValuePreWrap);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPreElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPreElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPreElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLPreElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> HTMLPreElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableCaptionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableCaptionElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableCaptionElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableCaptionElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableCaptionElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLTableCaptionElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == alignAttr) {
</span><span class="cx"> if (!value.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableCaptionElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableCaptionElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableCaptionElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableCaptionElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> HTMLTableCaptionElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(HTMLTableCaptionElement)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableCellElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableCellElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableCellElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableCellElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> return HTMLTablePartElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLTableCellElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == nowrapAttr)
</span><span class="cx"> addPropertyToPresentationAttributeStyle(style, CSSPropertyWhiteSpace, CSSValueWebkitNowrap);
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> HTMLTablePartElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const StylePropertySet* HTMLTableCellElement::additionalPresentationAttributeStyle()
</del><ins>+const StyleProperties* HTMLTableCellElement::additionalPresentationAttributeStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (HTMLTableElement* table = findParentTable())
</span><span class="cx"> return table->additionalCellStyle();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableCellElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableCellElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableCellElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableCellElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
- virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
+ virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableColElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableColElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableColElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableColElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> return HTMLTablePartElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableColElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLTableColElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><span class="cx"> addHTMLLengthToStyle(style, CSSPropertyWidth, value);
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> HTMLTablePartElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const StylePropertySet* HTMLTableColElement::additionalPresentationAttributeStyle()
</del><ins>+const StyleProperties* HTMLTableColElement::additionalPresentationAttributeStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (!hasLocalName(colgroupTag))
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableColElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableColElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableColElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableColElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
- virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
+ virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> int m_span;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "HTMLTableRowsCollection.h"
</span><span class="cx"> #include "HTMLTableSectionElement.h"
</span><span class="cx"> #include "RenderTable.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTableElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLTableElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><span class="cx"> addHTMLLengthToStyle(style, CSSPropertyWidth, value);
</span><span class="lines">@@ -412,9 +412,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static StylePropertySet* leakBorderStyle(CSSValueID value)
</del><ins>+static StyleProperties* leakBorderStyle(CSSValueID value)
</ins><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(CSSPropertyBorderTopStyle, value);
</span><span class="cx"> style->setProperty(CSSPropertyBorderBottomStyle, value);
</span><span class="cx"> style->setProperty(CSSPropertyBorderLeftStyle, value);
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> return style.release().leakRef();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const StylePropertySet* HTMLTableElement::additionalPresentationAttributeStyle()
</del><ins>+const StyleProperties* HTMLTableElement::additionalPresentationAttributeStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (m_frameAttr)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -431,17 +431,17 @@
</span><span class="cx"> // Setting the border to 'hidden' allows it to win over any border
</span><span class="cx"> // set on the table's cells during border-conflict resolution.
</span><span class="cx"> if (m_rulesAttr != UnsetRules) {
</span><del>- static StylePropertySet* solidBorderStyle = leakBorderStyle(CSSValueHidden);
</del><ins>+ static StyleProperties* solidBorderStyle = leakBorderStyle(CSSValueHidden);
</ins><span class="cx"> return solidBorderStyle;
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_borderColorAttr) {
</span><del>- static StylePropertySet* solidBorderStyle = leakBorderStyle(CSSValueSolid);
</del><ins>+ static StyleProperties* solidBorderStyle = leakBorderStyle(CSSValueSolid);
</ins><span class="cx"> return solidBorderStyle;
</span><span class="cx"> }
</span><del>- static StylePropertySet* outsetBorderStyle = leakBorderStyle(CSSValueOutset);
</del><ins>+ static StyleProperties* outsetBorderStyle = leakBorderStyle(CSSValueOutset);
</ins><span class="cx"> return outsetBorderStyle;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -468,9 +468,9 @@
</span><span class="cx"> return NoBorders;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StylePropertySet> HTMLTableElement::createSharedCellStyle()
</del><ins>+PassRefPtr<StyleProperties> HTMLTableElement::createSharedCellStyle()
</ins><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx">
</span><span class="cx"> switch (cellBorders()) {
</span><span class="cx"> case SolidBordersColsOnly:
</span><span class="lines">@@ -508,16 +508,16 @@
</span><span class="cx"> return style.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const StylePropertySet* HTMLTableElement::additionalCellStyle()
</del><ins>+const StyleProperties* HTMLTableElement::additionalCellStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_sharedCellStyle)
</span><span class="cx"> m_sharedCellStyle = createSharedCellStyle();
</span><span class="cx"> return m_sharedCellStyle.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static StylePropertySet* leakGroupBorderStyle(int rows)
</del><ins>+static StyleProperties* leakGroupBorderStyle(int rows)
</ins><span class="cx"> {
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> if (rows) {
</span><span class="cx"> style->setProperty(CSSPropertyBorderTopWidth, CSSValueThin);
</span><span class="cx"> style->setProperty(CSSPropertyBorderBottomWidth, CSSValueThin);
</span><span class="lines">@@ -532,16 +532,16 @@
</span><span class="cx"> return style.release().leakRef();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const StylePropertySet* HTMLTableElement::additionalGroupStyle(bool rows)
</del><ins>+const StyleProperties* HTMLTableElement::additionalGroupStyle(bool rows)
</ins><span class="cx"> {
</span><span class="cx"> if (m_rulesAttr != GroupsRules)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (rows) {
</span><del>- static StylePropertySet* rowBorderStyle = leakGroupBorderStyle(true);
</del><ins>+ static StyleProperties* rowBorderStyle = leakGroupBorderStyle(true);
</ins><span class="cx"> return rowBorderStyle;
</span><span class="cx"> }
</span><del>- static StylePropertySet* columnBorderStyle = leakGroupBorderStyle(false);
</del><ins>+ static StyleProperties* columnBorderStyle = leakGroupBorderStyle(false);
</ins><span class="cx"> return columnBorderStyle;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -65,19 +65,19 @@
</span><span class="cx"> String rules() const;
</span><span class="cx"> String summary() const;
</span><span class="cx">
</span><del>- const StylePropertySet* additionalCellStyle();
- const StylePropertySet* additionalGroupStyle(bool rows);
</del><ins>+ const StyleProperties* additionalCellStyle();
+ const StyleProperties* additionalGroupStyle(bool rows);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLTableElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
</span><span class="cx">
</span><span class="cx"> // Used to obtain either a solid or outset border decl and to deal with the frame and rules attributes.
</span><del>- virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
</del><ins>+ virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> CellBorders cellBorders() const;
</span><span class="cx">
</span><del>- PassRefPtr<StylePropertySet> createSharedCellStyle();
</del><ins>+ PassRefPtr<StyleProperties> createSharedCellStyle();
</ins><span class="cx">
</span><span class="cx"> HTMLTableSectionElement* lastBody() const;
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> // are present, to none otherwise).
</span><span class="cx">
</span><span class="cx"> unsigned short m_padding;
</span><del>- RefPtr<StylePropertySet> m_sharedCellStyle;
</del><ins>+ RefPtr<StyleProperties> m_sharedCellStyle;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(HTMLTableElement)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTablePartElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTablePartElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTablePartElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTablePartElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "HTMLTableElement.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == bgcolorAttr)
</span><span class="cx"> addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTablePartElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTablePartElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTablePartElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTablePartElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> HTMLTableElement* findParentTable() const;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableSectionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableSectionElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableSectionElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableSectionElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> return adoptRef(new HTMLTableSectionElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const StylePropertySet* HTMLTableSectionElement::additionalPresentationAttributeStyle()
</del><ins>+const StyleProperties* HTMLTableSectionElement::additionalPresentationAttributeStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (HTMLTableElement* table = findParentTable())
</span><span class="cx"> return table->additionalGroupStyle(true);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableSectionElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableSectionElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableSectionElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTableSectionElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> private:
</span><span class="cx"> HTMLTableSectionElement(const QualifiedName& tagName, Document&);
</span><span class="cx">
</span><del>- virtual const StylePropertySet* additionalPresentationAttributeStyle() OVERRIDE;
</del><ins>+ virtual const StyleProperties* additionalPresentationAttributeStyle() OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> return HTMLTextFormControlElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextAreaElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLTextAreaElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == wrapAttr) {
</span><span class="cx"> if (shouldWrapText()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextAreaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextAreaElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> virtual void childrenChanged(const ChildChange&) OVERRIDE;
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> virtual RenderElement* createRenderer(PassRef<RenderStyle>) OVERRIDE;
</span><span class="cx"> virtual bool appendFormData(FormDataList&, bool) OVERRIDE;
</span><span class="cx"> virtual void reset() OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLUListElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLUListElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLUListElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLUListElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> return HTMLElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLUListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLUListElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == typeAttr)
</span><span class="cx"> addPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleType, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLUListElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLUListElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLUListElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLUListElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> HTMLUListElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLVideoElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLVideoElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void HTMLVideoElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == widthAttr)
</span><span class="cx"> addHTMLLengthToStyle(style, CSSPropertyWidth, value);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/HTMLVideoElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> virtual void didAttachRenderers() OVERRIDE;
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> virtual bool isVideo() const OVERRIDE { return true; }
</span><span class="cx"> virtual bool hasVideo() const OVERRIDE { return player() && player()->hasVideo(); }
</span><span class="cx"> virtual bool supportsFullscreen() const OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "StrokeStyleApplier.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "TextMetrics.h"
</span><span class="cx"> #include "TextRun.h"
</span><span class="lines">@@ -1993,7 +1993,7 @@
</span><span class="cx"> if (newFont == state().m_unparsedFont && state().m_realizedFont)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> parsedStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> parsedStyle = MutableStyleProperties::create();
</ins><span class="cx"> CSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, newFont, true, strictToCSSParserMode(!m_usesCSSCompatibilityParseMode), 0);
</span><span class="cx"> if (parsedStyle->isEmpty())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasStyle.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasStyle.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/canvas/CanvasStyle.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "CanvasPattern.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> #include <CoreGraphics/CGContext.h>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementTypescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/shadow/MediaControlElementTypes.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="cx"> #include "RenderMedia.h"
</span><span class="cx"> #include "RenderMediaControlElements.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaControlElement::isShowing() const
</span><span class="cx"> {
</span><del>- const StylePropertySet* propertySet = m_element->inlineStyle();
</del><ins>+ const StyleProperties* propertySet = m_element->inlineStyle();
</ins><span class="cx"> // Following the code from show() and hide() above, we only have
</span><span class="cx"> // to check for the presense of inline display.
</span><span class="cx"> return (!propertySet || !propertySet->getPropertyCSSValue(CSSPropertyDisplay));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMeterShadowElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include "RenderMeter.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #include "NodeList.h"
</span><span class="cx"> #include "RenderRegion.h"
</span><span class="cx"> #include "SVGStyleElement.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="lines">@@ -1348,12 +1348,12 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // FIXME: Ugliness below.
</span><del>- StylePropertySet* attributeStyle = const_cast<StylePropertySet*>(toStyledElement(element)->presentationAttributeStyle());
</del><ins>+ StyleProperties* attributeStyle = const_cast<StyleProperties*>(toStyledElement(element)->presentationAttributeStyle());
</ins><span class="cx"> if (!attributeStyle)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(attributeStyle->isMutable());
</span><del>- MutableStylePropertySet* mutableAttributeStyle = static_cast<MutableStylePropertySet*>(attributeStyle);
</del><ins>+ MutableStyleProperties* mutableAttributeStyle = static_cast<MutableStyleProperties*>(attributeStyle);
</ins><span class="cx">
</span><span class="cx"> RefPtr<InspectorStyle> inspectorStyle = InspectorStyle::create(InspectorCSSId(), mutableAttributeStyle->ensureCSSStyleDeclaration(), 0);
</span><span class="cx"> return inspectorStyle->buildObjectForStyle();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleSheetList.h"
</span><span class="cx"> #include "Text.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #include "Node.h"
</span><span class="cx"> #include "RegularExpression.h"
</span><span class="cx"> #include "SVGNames.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleRuleImport.h"
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (propertyText.stripWhiteSpace().length()) {
</span><del>- RefPtr<MutableStylePropertySet> tempMutableStyle = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> tempMutableStyle = MutableStyleProperties::create();
</ins><span class="cx"> RefPtr<CSSRuleSourceData> sourceData = CSSRuleSourceData::create(CSSRuleSourceData::STYLE_RULE);
</span><span class="cx"> Document* ownerDocument = m_parentStyleSheet->pageStyleSheet() ? m_parentStyleSheet->pageStyleSheet()->ownerDocument() : 0;
</span><span class="cx"> createCSSParser(ownerDocument)->parseDeclaration(tempMutableStyle.get(), propertyText + " " + bogusPropertyName + ": none", sourceData, &m_style->parentStyleSheet()->contents());
</span><span class="lines">@@ -1547,7 +1547,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> tempDeclaration = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> tempDeclaration = MutableStyleProperties::create();
</ins><span class="cx"> createCSSParser(&m_element->document())->parseDeclaration(tempDeclaration.get(), m_styleText, result, &m_element->document().elementSheet().contents());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> virtual bool shouldInsertText(const String&, Range*, EditorInsertAction) OVERRIDE { return false; }
</span><span class="cx"> virtual bool shouldChangeSelectedRange(Range*, Range*, EAffinity, bool) OVERRIDE { return false; }
</span><span class="cx">
</span><del>- virtual bool shouldApplyStyle(StylePropertySet*, Range*) OVERRIDE { return false; }
</del><ins>+ virtual bool shouldApplyStyle(StyleProperties*, Range*) OVERRIDE { return false; }
</ins><span class="cx"> virtual bool shouldMoveRangeAfterDelete(Range*, Range*) OVERRIDE { return false; }
</span><span class="cx">
</span><span class="cx"> virtual void didBeginEditing() OVERRIDE { }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/mathml/MathMLElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return StyledElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MathMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void MathMLElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (name == mathbackgroundAttr)
</span><span class="cx"> addPropertyToPresentationAttributeStyle(style, CSSPropertyBackgroundColor, value);
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/mathml/MathMLElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool childShouldCreateRenderer(const Node&) const OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/page/DragController.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "Text.h"
</span><span class="cx"> #include "TextEvent.h"
</span><span class="cx"> #include "htmlediting.h"
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> if (!color.isValid())
</span><span class="cx"> return false;
</span><span class="cx"> RefPtr<Range> innerRange = innerFrame->selection().toNormalizedRange();
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</ins><span class="cx"> style->setProperty(CSSPropertyColor, color.serialized(), false);
</span><span class="cx"> if (!innerFrame->editor().shouldApplyStyle(style.get(), innerRange.get()))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorepageEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EditorClient.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EditorClient.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/page/EditorClient.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> class Node;
</span><span class="cx"> class Range;
</span><span class="cx"> class SharedBuffer;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx"> class TextCheckerClient;
</span><span class="cx"> class VisibleSelection;
</span><span class="cx"> class VisiblePosition;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> virtual bool shouldInsertText(const String&, Range*, EditorInsertAction) = 0;
</span><span class="cx"> virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting) = 0;
</span><span class="cx">
</span><del>- virtual bool shouldApplyStyle(StylePropertySet*, Range*) = 0;
</del><ins>+ virtual bool shouldApplyStyle(StyleProperties*, Range*) = 0;
</ins><span class="cx"> virtual bool shouldMoveRangeAfterDelete(Range*, Range*) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void didBeginEditing() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/page/Frame.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> #include "ScriptValue.h"
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "TextNodeTraversal.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "StyleCachedImage.h"
</span><span class="cx"> #include "StyleImage.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "Text.h"
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> retrieveResourcesForProperties(&rule->properties(), document);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageSerializer::retrieveResourcesForProperties(const StylePropertySet* styleDeclaration, Document* document)
</del><ins>+void PageSerializer::retrieveResourcesForProperties(const StyleProperties* styleDeclaration, Document* document)
</ins><span class="cx"> {
</span><span class="cx"> if (!styleDeclaration)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/page/PageSerializer.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class Page;
</span><span class="cx"> class RenderElement;
</span><del>-class StylePropertySet;
</del><ins>+class StyleProperties;
</ins><span class="cx"> class StyleRule;
</span><span class="cx">
</span><span class="cx"> // This class is used to serialize a page contents back to text (typically HTML).
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void serializeCSSStyleSheet(CSSStyleSheet*, const URL&);
</span><span class="cx">
</span><span class="cx"> void addImageToResources(CachedImage*, RenderElement*, const URL&);
</span><del>- void retrieveResourcesForProperties(const StylePropertySet*, Document*);
</del><ins>+ void retrieveResourcesForProperties(const StyleProperties*, Document*);
</ins><span class="cx"> void retrieveResourcesForRule(StyleRule*, Document*);
</span><span class="cx">
</span><span class="cx"> Vector<Resource>* m_resources;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "SourceGraphic.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "TextStream.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "RenderTableCol.h"
</span><span class="cx"> #include "RenderView.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TransformState.h"
</span><span class="cx"> #include <wtf/StackStats.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "SimpleLineLayoutResolver.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> if (!node->hasChildNodes())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- const StylePropertySet* inlineStyleDecl = elem->inlineStyle();
</del><ins>+ const StyleProperties* inlineStyleDecl = elem->inlineStyle();
</ins><span class="cx"> return (!inlineStyleDecl || inlineStyleDecl->isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimateElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimateElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimateElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGAnimateElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "SVGAnimatorFactory.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -759,14 +759,14 @@
</span><span class="cx"> return document().ensureStyleResolver().styleForElement(correspondingElement(), style, DisallowStyleSharing);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet* SVGElement::animatedSMILStyleProperties() const
</del><ins>+MutableStyleProperties* SVGElement::animatedSMILStyleProperties() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_svgRareData)
</span><span class="cx"> return m_svgRareData->animatedSMILStyleProperties();
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStylePropertySet& SVGElement::ensureAnimatedSMILStyleProperties()
</del><ins>+MutableStyleProperties& SVGElement::ensureAnimatedSMILStyleProperties()
</ins><span class="cx"> {
</span><span class="cx"> return ensureSVGRareData().ensureAnimatedSMILStyleProperties();
</span><span class="cx"> }
</span><span class="lines">@@ -966,7 +966,7 @@
</span><span class="cx"> return StyledElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void SVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> CSSPropertyID propertyID = cssPropertyIdForSVGAttributeName(name);
</span><span class="cx"> if (propertyID > 0)
</span><span class="lines">@@ -1054,7 +1054,7 @@
</span><span class="cx"> if (!attribute)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RefPtr<MutableStylePropertySet> style = MutableStylePropertySet::create(SVGAttributeMode);
</del><ins>+ RefPtr<MutableStyleProperties> style = MutableStyleProperties::create(SVGAttributeMode);
</ins><span class="cx"> CSSPropertyID propertyID = cssPropertyIdForSVGAttributeName(attribute->name());
</span><span class="cx"> style->setProperty(propertyID, attribute->value());
</span><span class="cx"> RefPtr<CSSValue> cssValue = style->getPropertyCSSValue(propertyID);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> bool isAnimatableAttribute(const QualifiedName&) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- MutableStylePropertySet* animatedSMILStyleProperties() const;
- MutableStylePropertySet& ensureAnimatedSMILStyleProperties();
</del><ins>+ MutableStyleProperties* animatedSMILStyleProperties() const;
+ MutableStyleProperties& ensureAnimatedSMILStyleProperties();
</ins><span class="cx"> void setUseOverrideComputedStyle(bool);
</span><span class="cx">
</span><span class="cx"> virtual bool haveLoadedRequiredResources();
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> static CSSPropertyID cssPropertyIdForSVGAttributeName(const QualifiedName&);
</span><span class="cx">
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) OVERRIDE;
</span><span class="cx"> virtual void removedFrom(ContainerNode&) OVERRIDE;
</span><span class="cx"> virtual void childrenChanged(const ChildChange&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElementRareData.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElementRareData.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGElementRareData.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef SVGElementRareData_h
</span><span class="cx"> #define SVGElementRareData_h
</span><span class="cx">
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="lines">@@ -61,11 +61,11 @@
</span><span class="cx"> CSSCursorImageValue* cursorImageValue() const { return m_cursorImageValue; }
</span><span class="cx"> void setCursorImageValue(CSSCursorImageValue* cursorImageValue) { m_cursorImageValue = cursorImageValue; }
</span><span class="cx">
</span><del>- MutableStylePropertySet* animatedSMILStyleProperties() const { return m_animatedSMILStyleProperties.get(); }
- MutableStylePropertySet& ensureAnimatedSMILStyleProperties()
</del><ins>+ MutableStyleProperties* animatedSMILStyleProperties() const { return m_animatedSMILStyleProperties.get(); }
+ MutableStyleProperties& ensureAnimatedSMILStyleProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_animatedSMILStyleProperties)
</span><del>- m_animatedSMILStyleProperties = MutableStylePropertySet::create(SVGAttributeMode);
</del><ins>+ m_animatedSMILStyleProperties = MutableStyleProperties::create(SVGAttributeMode);
</ins><span class="cx"> return *m_animatedSMILStyleProperties;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> bool m_instancesUpdatesBlocked : 1;
</span><span class="cx"> bool m_useOverrideComputedStyle : 1;
</span><span class="cx"> bool m_needsOverrideComputedStyleUpdate : 1;
</span><del>- RefPtr<MutableStylePropertySet> m_animatedSMILStyleProperties;
</del><ins>+ RefPtr<MutableStyleProperties> m_animatedSMILStyleProperties;
</ins><span class="cx"> RefPtr<RenderStyle> m_overrideComputedStyle;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontFaceElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontFaceElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontFaceElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGFontFaceElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "SVGFontFaceSrcElement.h"
</span><span class="cx"> #include "SVGGlyphElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include <math.h>
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> inline SVGFontFaceElement::SVGFontFaceElement(const QualifiedName& tagName, Document& document)
</span><span class="cx"> : SVGElement(tagName, document)
</span><del>- , m_fontFaceRule(StyleRuleFontFace::create(MutableStylePropertySet::create(CSSStrictMode)))
</del><ins>+ , m_fontFaceRule(StyleRuleFontFace::create(MutableStyleProperties::create(CSSStrictMode)))
</ins><span class="cx"> , m_fontElement(0)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(font_faceTag));
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGImageElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGImageElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGImageElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> return SVGGraphicsElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void SVGImageElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (!isSupportedAttribute(name))
</span><span class="cx"> SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGImageElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGImageElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGImageElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> bool isSupportedAttribute(const QualifiedName&);
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> virtual void svgAttributeChanged(const QualifiedName&);
</span><span class="cx">
</span><span class="cx"> virtual void didAttachRenderers() OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTextContentElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTextContentElement.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTextContentElement.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGTextContentElement.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> return SVGGraphicsElement::isPresentationAttribute(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGTextContentElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet& style)
</del><ins>+void SVGTextContentElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</ins><span class="cx"> {
</span><span class="cx"> if (!isSupportedAttribute(name))
</span><span class="cx"> SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTextContentElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTextContentElement.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTextContentElement.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebCore/svg/SVGTextContentElement.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> bool isSupportedAttribute(const QualifiedName&);
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
</span><del>- virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet&) OVERRIDE;
</del><ins>+ virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) OVERRIDE;
</ins><span class="cx"> virtual void svgAttributeChanged(const QualifiedName&);
</span><span class="cx">
</span><span class="cx"> virtual bool selfHasRelativeLengths() const;
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportEditorClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EditorClientEfl::shouldApplyStyle(StylePropertySet* style, Range* range)
</del><ins>+bool EditorClientEfl::shouldApplyStyle(StyleProperties* style, Range* range)
</ins><span class="cx"> {
</span><span class="cx"> Ewk_Should_Apply_Style_Event shouldApplyStyleEvent = { style, range };
</span><span class="cx"> evas_object_smart_callback_call(m_view, "editorclient,style,apply", &shouldApplyStyleEvent);
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportEditorClientEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct Ewk_Should_Apply_Style_Event {
</span><del>- WebCore::StylePropertySet* style;
</del><ins>+ WebCore::StyleProperties* style;
</ins><span class="cx"> WebCore::Range* range;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> virtual bool shouldInsertText(const String&, Range*, EditorInsertAction);
</span><span class="cx"> virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting);
</span><span class="cx">
</span><del>- virtual bool shouldApplyStyle(StylePropertySet*, Range*);
</del><ins>+ virtual bool shouldApplyStyle(StyleProperties*, Range*);
</ins><span class="cx">
</span><span class="cx"> virtual bool shouldMoveRangeAfterDelete(Range*, Range*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportEditorClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include "PasteboardHelper.h"
</span><span class="cx"> #include "PlatformKeyboardEvent.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "UndoStep.h"
</span><span class="cx"> #include "WebKitDOMCSSStyleDeclarationPrivate.h"
</span><span class="cx"> #include "WebKitDOMHTMLElementPrivate.h"
</span><span class="lines">@@ -177,10 +177,10 @@
</span><span class="cx"> return accept;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EditorClient::shouldApplyStyle(WebCore::StylePropertySet* set, WebCore::Range* range)
</del><ins>+bool EditorClient::shouldApplyStyle(WebCore::StyleProperties* set, WebCore::Range* range)
</ins><span class="cx"> {
</span><span class="cx"> gboolean accept = TRUE;
</span><del>- Ref<MutableStylePropertySet> mutableStyle(set->mutableCopy());
</del><ins>+ Ref<MutableStyleProperties> mutableStyle(set->mutableCopy());
</ins><span class="cx"> GRefPtr<WebKitDOMCSSStyleDeclaration> kitDeclaration(kit(mutableStyle->ensureCSSStyleDeclaration()));
</span><span class="cx"> GRefPtr<WebKitDOMRange> kitRange(adoptGRef(kit(range)));
</span><span class="cx"> g_signal_emit_by_name(m_webView, "should-apply-style", kitDeclaration.get(), kitRange.get(), &accept);
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportEditorClientGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction);
</span><span class="cx"> virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting);
</span><span class="cx">
</span><del>- virtual bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*);
</del><ins>+ virtual bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*);
</ins><span class="cx">
</span><span class="cx"> virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE;
</span><span class="cx"> virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) OVERRIDE;
</span><span class="cx">
</span><del>- virtual bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*) OVERRIDE;
</del><ins>+ virtual bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range* rangeToBeReplaced) OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> #import <WebCore/PlatformKeyboardEvent.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><span class="cx"> #import <WebCore/SpellChecker.h>
</span><del>-#import <WebCore/StylePropertySet.h>
</del><ins>+#import <WebCore/StyleProperties.h>
</ins><span class="cx"> #import <WebCore/UndoStep.h>
</span><span class="cx"> #import <WebCore/UserTypingGestureIndicator.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="lines">@@ -244,9 +244,9 @@
</span><span class="cx"> return page->settings().selectTrailingWhitespaceEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebEditorClient::shouldApplyStyle(StylePropertySet* style, Range* range)
</del><ins>+bool WebEditorClient::shouldApplyStyle(StyleProperties* style, Range* range)
</ins><span class="cx"> {
</span><del>- Ref<MutableStylePropertySet> mutableStyle(style->isMutable() ? static_cast<MutableStylePropertySet&>(*style) : style->mutableCopy());
</del><ins>+ Ref<MutableStyleProperties> mutableStyle(style->isMutable() ? static_cast<MutableStyleProperties&>(*style) : style->mutableCopy());
</ins><span class="cx"> return [[m_webView _editingDelegateForwarder] webView:m_webView
</span><span class="cx"> shouldApplyStyle:kit(mutableStyle->ensureCSSStyleDeclaration()) toElementsInDOMRange:kit(range)];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #import <WebCore/ScriptValue.h>
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="cx"> #import <WebCore/SmartReplace.h>
</span><del>-#import <WebCore/StylePropertySet.h>
</del><ins>+#import <WebCore/StyleProperties.h>
</ins><span class="cx"> #import <WebCore/SubframeLoader.h>
</span><span class="cx"> #import <WebCore/TextIterator.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!_private->coreFrame)
</span><span class="cx"> return nil;
</span><del>- RefPtr<MutableStylePropertySet> typingStyle = _private->coreFrame->selection().copyTypingStyle();
</del><ins>+ RefPtr<MutableStyleProperties> typingStyle = _private->coreFrame->selection().copyTypingStyle();
</ins><span class="cx"> if (!typingStyle)
</span><span class="cx"> return nil;
</span><span class="cx"> return kit(typingStyle->ensureCSSStyleDeclaration());
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx"> if (!_private->coreFrame || !style)
</span><span class="cx"> return;
</span><span class="cx"> // FIXME: We shouldn't have to create a copy here.
</span><del>- Ref<MutableStylePropertySet> properties(core(style)->copyProperties());
</del><ins>+ Ref<MutableStyleProperties> properties(core(style)->copyProperties());
</ins><span class="cx"> _private->coreFrame->editor().computeAndSetTypingStyle(&properties.get(), undoAction);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="cx"> #import <WebCore/SimpleFontData.h>
</span><del>-#import <WebCore/StylePropertySet.h>
</del><ins>+#import <WebCore/StyleProperties.h>
</ins><span class="cx"> #import <WebCore/Text.h>
</span><span class="cx"> #import <WebCore/TextAlternativeWithRange.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="lines">@@ -4369,8 +4369,8 @@
</span><span class="cx"> - (void)_applyStyleToSelection:(DOMCSSStyleDeclaration *)style withUndoAction:(EditAction)undoAction
</span><span class="cx"> {
</span><span class="cx"> if (Frame* coreFrame = core([self _frame])) {
</span><del>- // 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());
</del><ins>+ // 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());
</ins><span class="cx"> coreFrame->editor().applyStyleToSelection(&properties.get(), undoAction);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4673,7 +4673,7 @@
</span><span class="cx"> if ([[webView _editingDelegateForwarder] webView:webView shouldApplyStyle:style toElementsInDOMRange:range]) {
</span><span class="cx"> if (Frame* coreFrame = core([self _frame])) {
</span><span class="cx"> // FIXME: We shouldn't have to make a copy here.
</span><del>- Ref<MutableStylePropertySet> properties(core(style)->copyProperties());
</del><ins>+ Ref<MutableStyleProperties> properties(core(style)->copyProperties());
</ins><span class="cx"> coreFrame->editor().applyStyle(&properties.get(), [self _undoActionFromColorPanelWithSelector:selector]);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="cx"> #import <WebCore/SecurityPolicy.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><del>-#import <WebCore/StylePropertySet.h>
</del><ins>+#import <WebCore/StyleProperties.h>
</ins><span class="cx"> #import <WebCore/SystemVersionMac.h>
</span><span class="cx"> #import <WebCore/TextResourceDecoder.h>
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="lines">@@ -5955,7 +5955,7 @@
</span><span class="cx"> WebFrame *webFrame = [self _selectedOrMainFrame];
</span><span class="cx"> if (Frame* coreFrame = core(webFrame)) {
</span><span class="cx"> // FIXME: We shouldn't have to make a copy here.
</span><del>- Ref<MutableStylePropertySet> properties(core(style)->copyProperties());
</del><ins>+ Ref<MutableStyleProperties> properties(core(style)->copyProperties());
</ins><span class="cx"> coreFrame->editor().applyStyle(&properties.get());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -283,13 +283,13 @@
</span><span class="cx"> //bool WebEditorClient::shouldChangeSelectedRange(Range *currentRange, Range *toProposedRange, SelectionAffinity selectionAffinity, bool stillSelecting)
</span><span class="cx"> //{ notImplemented(); return false; }
</span><span class="cx">
</span><del>-bool WebEditorClient::shouldApplyStyle(StylePropertySet* /*style*/, Range* /*toElementsInDOMRange*/)
</del><ins>+bool WebEditorClient::shouldApplyStyle(StyleProperties* /*style*/, Range* /*toElementsInDOMRange*/)
</ins><span class="cx"> { notImplemented(); return true; }
</span><span class="cx">
</span><span class="cx"> bool WebEditorClient::shouldMoveRangeAfterDelete(Range* /*range*/, Range* /*rangeToBeReplaced*/)
</span><span class="cx"> { notImplemented(); return true; }
</span><span class="cx">
</span><del>-bool WebEditorClient::shouldChangeTypingStyle(StylePropertySet* /*currentStyle*/, StylePropertySet* /*toProposedStyle*/)
</del><ins>+bool WebEditorClient::shouldChangeTypingStyle(StyleProperties* /*currentStyle*/, StyleProperties* /*toProposedStyle*/)
</ins><span class="cx"> { notImplemented(); return false; }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::webViewDidChangeTypingStyle(WebNotification* /*notification*/)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> bool shouldDeleteRange(WebCore::Range*);
</span><span class="cx">
</span><span class="cx"> bool shouldInsertNode(WebCore::Node*, WebCore::Range* replacingRange, WebCore::EditorInsertAction);
</span><del>- bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*);
</del><ins>+ bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*);
</ins><span class="cx"> bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*);
</span><del>- bool shouldChangeTypingStyle(WebCore::StylePropertySet* currentStyle, WebCore::StylePropertySet* toProposedStyle);
</del><ins>+ bool shouldChangeTypingStyle(WebCore::StyleProperties* currentStyle, WebCore::StyleProperties* toProposedStyle);
</ins><span class="cx">
</span><span class="cx"> void webViewDidChangeTypingStyle(WebNotification*);
</span><span class="cx"> void webViewDidChangeSelection(WebNotification*);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/SpellChecker.h>
</span><del>-#include <WebCore/StylePropertySet.h>
</del><ins>+#include <WebCore/StyleProperties.h>
</ins><span class="cx"> #include <WebCore/TextIterator.h>
</span><span class="cx"> #include <WebCore/UndoStep.h>
</span><span class="cx"> #include <WebCore/UserTypingGestureIndicator.h>
</span><span class="lines">@@ -153,9 +153,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebEditorClient::shouldApplyStyle(StylePropertySet* style, Range* range)
</del><ins>+bool WebEditorClient::shouldApplyStyle(StyleProperties* style, Range* range)
</ins><span class="cx"> {
</span><del>- Ref<MutableStylePropertySet> mutableStyle(style->isMutable() ? static_cast<MutableStylePropertySet&>(*style) : style->mutableCopy());
</del><ins>+ Ref<MutableStyleProperties> mutableStyle(style->isMutable() ? static_cast<MutableStyleProperties&>(*style) : style->mutableCopy());
</ins><span class="cx"> bool result = m_page->injectedBundleEditorClient().shouldApplyStyle(m_page, mutableStyle->ensureCSSStyleDeclaration(), range);
</span><span class="cx"> notImplemented();
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> virtual bool shouldInsertText(const String&, WebCore::Range*, WebCore::EditorInsertAction) OVERRIDE;
</span><span class="cx"> virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity, bool stillSelecting) OVERRIDE;
</span><span class="cx">
</span><del>- virtual bool shouldApplyStyle(WebCore::StylePropertySet*, WebCore::Range*) OVERRIDE;
</del><ins>+ virtual bool shouldApplyStyle(WebCore::StyleProperties*, WebCore::Range*) OVERRIDE;
</ins><span class="cx"> virtual bool shouldMoveRangeAfterDelete(WebCore::Range*, WebCore::Range*) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual void didBeginEditing() OVERRIDE;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeeflEditingCallbackscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/efl/EditingCallbacks.cpp (159855 => 159856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/efl/EditingCallbacks.cpp 2013-11-28 20:33:44 UTC (rev 159855)
+++ trunk/Tools/DumpRenderTree/efl/EditingCallbacks.cpp 2013-11-28 20:53:22 UTC (rev 159856)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "EditorInsertAction.h"
</span><span class="cx"> #include "Node.h"
</span><span class="cx"> #include "Range.h"
</span><del>-#include "StylePropertySet.h"
</del><ins>+#include "StyleProperties.h"
</ins><span class="cx"> #include "TestRunner.h"
</span><span class="cx"> #include "TextAffinity.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span></span></pre>
</div>
</div>
</body>
</html>