<!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>[178017] 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/178017">178017</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 18:36:48 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the 'alt' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=140129
Reviewed by Darin Adler.
Move the 'alt' CSS property to the new StyleBuilder.
* css/CSSPropertyNames.in:
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueAlt):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* rendering/style/RenderStyle.h:</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>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178016 => 178017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-07 02:23:25 UTC (rev 178016)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 02:36:48 UTC (rev 178017)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-01-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Move the 'alt' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=140129
+
+ Reviewed by Darin Adler.
+
+ Move the 'alt' CSS property to the new StyleBuilder.
+
+ * css/CSSPropertyNames.in:
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueAlt):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ * rendering/style/RenderStyle.h:
+
+2015-01-06 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move '-webkit-text-size-adjust' CSS property to the new StyleBuilder
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140157
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (178016 => 178017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-07 02:23:25 UTC (rev 178016)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-07 02:36:48 UTC (rev 178017)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> word-spacing [Inherited, ConditionalConverter=WordSpacing, TypeName=Length]
</span><span class="cx"> word-wrap [Inherited=EOverflowWrap, NameForMethods=OverflowWrap]
</span><span class="cx"> z-index [TypeName=int, AutoFunctions]
</span><del>-alt [LegacyStyleBuilder]
</del><ins>+alt [NameForMethods=ContentAltText, Custom=Value]
</ins><span class="cx"> -webkit-alt = alt
</span><span class="cx"> -webkit-animation [LegacyStyleBuilder]
</span><span class="cx"> -webkit-animation-delay [AnimationProperty, TypeName=double, NameForMethods=Delay]
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (178016 => 178017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-07 02:23:25 UTC (rev 178016)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-07 02:36:48 UTC (rev 178017)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> static void applyValueWebkitTextSizeAdjust(StyleResolver&, CSSValue&);
</span><span class="cx"> #endif
</span><span class="cx"> static void applyValueWebkitWritingMode(StyleResolver&, CSSValue&);
</span><ins>+ static void applyValueAlt(StyleResolver&, CSSValue&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void resetEffectiveZoom(StyleResolver&);
</span><span class="lines">@@ -1444,6 +1445,29 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx">
</span><ins>+void StyleBuilderCustom::applyValueAlt(StyleResolver& styleResolver, CSSValue& value)
+{
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ if (primitiveValue.isString())
+ styleResolver.style()->setContentAltText(primitiveValue.getStringValue());
+ else if (primitiveValue.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, primitiveValue.getStringValue(), nullAtom);
+ const AtomicString& value = styleResolver.element()->getAttribute(attr);
+ styleResolver.style()->setContentAltText(value.isNull() ? emptyAtom : value);
+
+ // 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
+ styleResolver.style()->setContentAltText(emptyAtom);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderCustom_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (178016 => 178017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-07 02:23:25 UTC (rev 178016)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-07 02:36:48 UTC (rev 178017)
</span><span class="lines">@@ -2075,39 +2075,6 @@
</span><span class="cx"> state.style()->clearContent();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- case CSSPropertyAlt:
- {
- if (isInherit) {
- state.style()->setContentAltText(state.parentStyle()->contentAltText());
- return;
- }
- if (isInitial) {
- state.style()->setContentAltText(emptyAtom);
- return;
- }
- ASSERT(primitiveValue);
- bool didSet = false;
- if (primitiveValue->isString()) {
- state.style()->setContentAltText(primitiveValue->getStringValue().impl());
- didSet = true;
- } else if (primitiveValue->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, primitiveValue->getStringValue().impl(), nullAtom);
- const AtomicString& value = state.element()->getAttribute(attr);
- state.style()->setContentAltText(value.isNull() ? emptyAtom : value.impl());
- 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());
- }
- if (!didSet)
- state.style()->setContentAltText(emptyAtom);
- return;
- }
</del><span class="cx"> // Shorthand properties.
</span><span class="cx"> case CSSPropertyFont:
</span><span class="cx"> if (isInherit) {
</span><span class="lines">@@ -2662,6 +2629,7 @@
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> case CSSPropertyWebkitBackdropFilter:
</span><span class="cx"> #endif
</span><ins>+ case CSSPropertyAlt:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (178016 => 178017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-01-07 02:23:25 UTC (rev 178016)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-01-07 02:36:48 UTC (rev 178017)
</span><span class="lines">@@ -1954,6 +1954,7 @@
</span><span class="cx"> static StyleImage* initialMaskBoxImageSource() { return 0; }
</span><span class="cx"> static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustEconomy; }
</span><span class="cx"> static QuotesData* initialQuotes() { return nullptr; }
</span><ins>+ static const AtomicString& initialContentAltText() { return emptyAtom; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> static ScrollSnapType initialScrollSnapType() { return ScrollSnapType::None; }
</span></span></pre>
</div>
</div>
</body>
</html>