<!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>[178022] trunk/Source/WebCore</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/178022">178022</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 23:13:00 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'content' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=140169
Reviewed by Sam Weinig.
Move 'content' CSS property to the new StyleBuilder.
* css/CSSPropertyNames.in:
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyInitialContent):
(WebCore::StyleBuilderCustom::applyInheritContent):
(WebCore::StyleBuilderCustom::applyValueContent):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178021 => 178022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-07 07:03:17 UTC (rev 178021)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 07:13:00 UTC (rev 178022)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-01-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Move 'content' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=140169
+
+ Reviewed by Sam Weinig.
+
+ Move 'content' CSS property to the new StyleBuilder.
+
+ * css/CSSPropertyNames.in:
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyInitialContent):
+ (WebCore::StyleBuilderCustom::applyInheritContent):
+ (WebCore::StyleBuilderCustom::applyValueContent):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
+2015-01-06 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move 'webkit-mask-image' CSS property to the new StyleBuilder
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140168
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (178021 => 178022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-07 07:03:17 UTC (rev 178021)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-07 07:13:00 UTC (rev 178022)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> clear
</span><span class="cx"> clip [Custom=All]
</span><span class="cx"> -webkit-clip-path [Converter=ClipPath]
</span><del>-content [LegacyStyleBuilder]
</del><ins>+content [Custom=All]
</ins><span class="cx"> counter-increment [Custom=All]
</span><span class="cx"> counter-reset [Custom=All]
</span><span class="cx"> cursor [Inherited, Custom=All]
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (178021 => 178022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-07 07:03:17 UTC (rev 178021)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-07 07:13:00 UTC (rev 178022)
</span><span class="lines">@@ -29,7 +29,10 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSAspectRatioValue.h"
</span><span class="cx"> #include "CSSCursorImageValue.h"
</span><ins>+#include "CSSGradientValue.h"
</ins><span class="cx"> #include "CSSShadowValue.h"
</span><ins>+#include "Counter.h"
+#include "CounterContent.h"
</ins><span class="cx"> #include "CursorList.h"
</span><span class="cx"> #include "ElementAncestorIterator.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -39,6 +42,7 @@
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "StyleBuilderConverter.h"
</span><span class="cx"> #include "StyleFontSizeFunctions.h"
</span><ins>+#include "StyleGeneratedImage.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -59,6 +63,7 @@
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(BoxShadow);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(Clip);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(ColumnGap);
</span><ins>+ DECLARE_PROPERTY_CUSTOM_HANDLERS(Content);
</ins><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(CounterIncrement);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(CounterReset);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(Cursor);
</span><span class="lines">@@ -1163,6 +1168,97 @@
</span><span class="cx"> styleResolver.style()->setColumnGap(StyleBuilderConverter::convertComputedLength<float>(styleResolver, value));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void StyleBuilderCustom::applyInitialContent(StyleResolver& styleResolver)
+{
+ styleResolver.style()->clearContent();
+}
+
+inline void StyleBuilderCustom::applyInheritContent(StyleResolver&)
+{
+ // FIXME: In CSS3, it will be possible to inherit content. In CSS2 it is not. This
+ // note is a reminder that eventually "inherit" needs to be supported.
+}
+
+inline void StyleBuilderCustom::applyValueContent(StyleResolver& styleResolver, CSSValue& value)
+{
+ bool didSet = false;
+ for (auto& item : downcast<CSSValueList>(value)) {
+ if (is<CSSImageGeneratorValue>(item.get())) {
+ if (is<CSSGradientValue>(item.get()))
+ styleResolver.style()->setContent(StyleGeneratedImage::create(*downcast<CSSGradientValue>(item.get()).gradientWithStylesResolved(&styleResolver)), didSet);
+ else
+ styleResolver.style()->setContent(StyleGeneratedImage::create(downcast<CSSImageGeneratorValue>(item.get())), didSet);
+ didSet = true;
+#if ENABLE(CSS_IMAGE_SET)
+ } else if (is<CSSImageSetValue>(item.get())) {
+ styleResolver.style()->setContent(styleResolver.setOrPendingFromValue(CSSPropertyContent, downcast<CSSImageSetValue>(item.get())), didSet);
+ didSet = true;
+#endif
+ }
+
+ if (is<CSSImageValue>(item.get())) {
+ styleResolver.style()->setContent(styleResolver.cachedOrPendingFromValue(CSSPropertyContent, downcast<CSSImageValue>(item.get())), didSet);
+ didSet = true;
+ continue;
+ }
+
+ if (!is<CSSPrimitiveValue>(item.get()))
+ continue;
+
+ auto& contentValue = downcast<CSSPrimitiveValue>(item.get());
+ if (contentValue.isString()) {
+ styleResolver.style()->setContent(contentValue.getStringValue().impl(), didSet);
+ didSet = true;
+ } else if (contentValue.isAttr()) {
+ // FIXME: Can a namespace be specified for an attr(foo)?
+ if (styleResolver.style()->styleType() == NOPSEUDO)
+ styleResolver.style()->setUnique();
+ else
+ styleResolver.parentStyle()->setUnique();
+ QualifiedName attr(nullAtom, contentValue.getStringValue().impl(), nullAtom);
+ const AtomicString& value = styleResolver.element()->getAttribute(attr);
+ styleResolver.style()->setContent(value.isNull() ? emptyAtom : value.impl(), didSet);
+ didSet = true;
+ // Register the fact that the attribute value affects the style.
+ styleResolver.ruleSets().features().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
+ styleResolver.ruleSets().features().attributeLocalNamesInRules.add(attr.localName().impl());
+ } else if (contentValue.isCounter()) {
+ Counter* counterValue = contentValue.getCounterValue();
+ EListStyleType listStyleType = NoneListStyle;
+ CSSValueID listStyleIdent = counterValue->listStyleIdent();
+ if (listStyleIdent != CSSValueNone)
+ listStyleType = static_cast<EListStyleType>(listStyleIdent - CSSValueDisc);
+ auto counter = std::make_unique<CounterContent>(counterValue->identifier(), listStyleType, counterValue->separator());
+ styleResolver.style()->setContent(WTF::move(counter), didSet);
+ didSet = true;
+ } else {
+ switch (contentValue.getValueID()) {
+ case CSSValueOpenQuote:
+ styleResolver.style()->setContent(OPEN_QUOTE, didSet);
+ didSet = true;
+ break;
+ case CSSValueCloseQuote:
+ styleResolver.style()->setContent(CLOSE_QUOTE, didSet);
+ didSet = true;
+ break;
+ case CSSValueNoOpenQuote:
+ styleResolver.style()->setContent(NO_OPEN_QUOTE, didSet);
+ didSet = true;
+ break;
+ case CSSValueNoCloseQuote:
+ styleResolver.style()->setContent(NO_CLOSE_QUOTE, didSet);
+ didSet = true;
+ break;
+ default:
+ // normal and none do not have any effect.
+ break;
+ }
+ }
+ }
+ if (!didSet)
+ styleResolver.style()->clearContent();
+}
+
</ins><span class="cx"> inline void StyleBuilderCustom::applyInitialWebkitFontVariantLigatures(StyleResolver& styleResolver)
</span><span class="cx"> {
</span><span class="cx"> FontDescription fontDescription = styleResolver.fontDescription();
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (178021 => 178022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-07 07:03:17 UTC (rev 178021)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-07 07:13:00 UTC (rev 178022)
</span><span class="lines">@@ -1981,100 +1981,6 @@
</span><span class="cx"> // What follows is a list that maps the CSS properties into their corresponding front-end
</span><span class="cx"> // RenderStyle values.
</span><span class="cx"> switch (id) {
</span><del>- // lists
- case CSSPropertyContent:
- // list of string, uri, counter, attr, i
- {
- // FIXME: In CSS3, it will be possible to inherit content. In CSS2 it is not. This
- // note is a reminder that eventually "inherit" needs to be supported.
-
- if (isInitial) {
- state.style()->clearContent();
- return;
- }
-
- if (!is<CSSValueList>(*value))
- return;
-
- bool didSet = false;
- for (auto& item : downcast<CSSValueList>(*value)) {
- if (is<CSSImageGeneratorValue>(item.get())) {
- if (is<CSSGradientValue>(item.get()))
- state.style()->setContent(StyleGeneratedImage::create(*downcast<CSSGradientValue>(item.get()).gradientWithStylesResolved(this)), didSet);
- else
- state.style()->setContent(StyleGeneratedImage::create(downcast<CSSImageGeneratorValue>(item.get())), didSet);
- didSet = true;
-#if ENABLE(CSS_IMAGE_SET)
- } else if (is<CSSImageSetValue>(item.get())) {
- state.style()->setContent(setOrPendingFromValue(CSSPropertyContent, downcast<CSSImageSetValue>(item.get())), didSet);
- didSet = true;
-#endif
- }
-
- if (is<CSSImageValue>(item.get())) {
- state.style()->setContent(cachedOrPendingFromValue(CSSPropertyContent, downcast<CSSImageValue>(item.get())), didSet);
- didSet = true;
- continue;
- }
-
- if (!is<CSSPrimitiveValue>(item.get()))
- continue;
-
- auto& contentValue = downcast<CSSPrimitiveValue>(item.get());
-
- if (contentValue.isString()) {
- state.style()->setContent(contentValue.getStringValue().impl(), didSet);
- didSet = true;
- } else if (contentValue.isAttr()) {
- // FIXME: Can a namespace be specified for an attr(foo)?
- if (state.style()->styleType() == NOPSEUDO)
- state.style()->setUnique();
- else
- state.parentStyle()->setUnique();
- QualifiedName attr(nullAtom, contentValue.getStringValue().impl(), nullAtom);
- const AtomicString& value = state.element()->getAttribute(attr);
- state.style()->setContent(value.isNull() ? emptyAtom : value.impl(), didSet);
- didSet = true;
- // Register the fact that the attribute value affects the style.
- m_ruleSets.features().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
- m_ruleSets.features().attributeLocalNamesInRules.add(attr.localName().impl());
- } else if (contentValue.isCounter()) {
- Counter* counterValue = contentValue.getCounterValue();
- EListStyleType listStyleType = NoneListStyle;
- CSSValueID listStyleIdent = counterValue->listStyleIdent();
- if (listStyleIdent != CSSValueNone)
- listStyleType = static_cast<EListStyleType>(listStyleIdent - CSSValueDisc);
- auto counter = std::make_unique<CounterContent>(counterValue->identifier(), listStyleType, counterValue->separator());
- state.style()->setContent(WTF::move(counter), didSet);
- didSet = true;
- } else {
- switch (contentValue.getValueID()) {
- case CSSValueOpenQuote:
- state.style()->setContent(OPEN_QUOTE, didSet);
- didSet = true;
- break;
- case CSSValueCloseQuote:
- state.style()->setContent(CLOSE_QUOTE, didSet);
- didSet = true;
- break;
- case CSSValueNoOpenQuote:
- state.style()->setContent(NO_OPEN_QUOTE, didSet);
- didSet = true;
- break;
- case CSSValueNoCloseQuote:
- state.style()->setContent(NO_CLOSE_QUOTE, didSet);
- didSet = true;
- break;
- default:
- // normal and none do not have any effect.
- { }
- }
- }
- }
- if (!didSet)
- state.style()->clearContent();
- return;
- }
</del><span class="cx"> // Shorthand properties.
</span><span class="cx"> case CSSPropertyFont:
</span><span class="cx"> if (isInherit) {
</span><span class="lines">@@ -2364,6 +2270,7 @@
</span><span class="cx"> case CSSPropertyClear:
</span><span class="cx"> case CSSPropertyClip:
</span><span class="cx"> case CSSPropertyColor:
</span><ins>+ case CSSPropertyContent:
</ins><span class="cx"> case CSSPropertyCounterIncrement:
</span><span class="cx"> case CSSPropertyCounterReset:
</span><span class="cx"> case CSSPropertyCursor:
</span></span></pre>
</div>
</div>
</body>
</html>