<!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>[176813] 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/176813">176813</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-04 13:48:33 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'webkit-aspect-ratio' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139250
Reviewed by Sam Weinig.
Move 'aspect-ratio' CSS property to the new StyleBuilder by
using custom code.
No new tests, no behavior change.
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyAspectRatio::applyInheritValue): Deleted.
(WebCore::ApplyPropertyAspectRatio::applyInitialValue): Deleted.
(WebCore::ApplyPropertyAspectRatio::applyValue): Deleted.
(WebCore::ApplyPropertyAspectRatio::createHandler): Deleted.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyInitialWebkitAspectRatio):
(WebCore::StyleBuilderCustom::applyInheritWebkitAspectRatio):
(WebCore::StyleBuilderCustom::applyValueWebkitAspectRatio):</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="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176812 => 176813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-04 21:32:21 UTC (rev 176812)
+++ trunk/Source/WebCore/ChangeLog 2014-12-04 21:48:33 UTC (rev 176813)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-04 Chris Dumez <cdumez@apple.com>
+
+ Move 'webkit-aspect-ratio' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=139250
+
+ Reviewed by Sam Weinig.
+
+ Move 'aspect-ratio' CSS property to the new StyleBuilder by
+ using custom code.
+
+ No new tests, no behavior change.
+
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::ApplyPropertyAspectRatio::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyAspectRatio::applyInitialValue): Deleted.
+ (WebCore::ApplyPropertyAspectRatio::applyValue): Deleted.
+ (WebCore::ApplyPropertyAspectRatio::createHandler): Deleted.
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyInitialWebkitAspectRatio):
+ (WebCore::StyleBuilderCustom::applyInheritWebkitAspectRatio):
+ (WebCore::StyleBuilderCustom::applyValueWebkitAspectRatio):
+
</ins><span class="cx"> 2014-12-04 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Further fix the 32-bit build.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (176812 => 176813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-04 21:32:21 UTC (rev 176812)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-04 21:48:33 UTC (rev 176813)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> -webkit-animation-play-state [LegacyStyleBuilder]
</span><span class="cx"> -webkit-animation-timing-function [LegacyStyleBuilder]
</span><span class="cx"> -webkit-appearance [TypeName=ControlPart]
</span><del>--webkit-aspect-ratio [Inherited, LegacyStyleBuilder]
</del><ins>+-webkit-aspect-ratio [Inherited, Custom=All]
</ins><span class="cx"> -webkit-backface-visibility
</span><span class="cx"> -webkit-background-clip [LegacyStyleBuilder]
</span><span class="cx"> -webkit-background-composite [LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (176812 => 176813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-04 21:32:21 UTC (rev 176812)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-04 21:48:33 UTC (rev 176813)
</span><span class="lines">@@ -919,54 +919,6 @@
</span><span class="cx"> static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ApplyPropertyAspectRatio {
-public:
- static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- if (styleResolver->parentStyle()->aspectRatioType() == AspectRatioAuto)
- return;
- styleResolver->style()->setAspectRatioType(styleResolver->parentStyle()->aspectRatioType());
- styleResolver->style()->setAspectRatioDenominator(styleResolver->parentStyle()->aspectRatioDenominator());
- styleResolver->style()->setAspectRatioNumerator(styleResolver->parentStyle()->aspectRatioNumerator());
- }
-
- static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- styleResolver->style()->setAspectRatioType(RenderStyle::initialAspectRatioType());
- styleResolver->style()->setAspectRatioDenominator(RenderStyle::initialAspectRatioDenominator());
- styleResolver->style()->setAspectRatioNumerator(RenderStyle::initialAspectRatioNumerator());
- }
-
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (is<CSSPrimitiveValue>(*value)) {
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
-
- if (primitiveValue.getValueID() == CSSValueAuto)
- return styleResolver->style()->setAspectRatioType(AspectRatioAuto);
- if (primitiveValue.getValueID() == CSSValueFromDimensions)
- return styleResolver->style()->setAspectRatioType(AspectRatioFromDimensions);
- if (primitiveValue.getValueID() == CSSValueFromIntrinsic)
- return styleResolver->style()->setAspectRatioType(AspectRatioFromIntrinsic);
- }
-
- if (!is<CSSAspectRatioValue>(*value)) {
- styleResolver->style()->setAspectRatioType(AspectRatioAuto);
- return;
- }
-
- CSSAspectRatioValue& aspectRatioValue = downcast<CSSAspectRatioValue>(*value);
- styleResolver->style()->setAspectRatioType(AspectRatioSpecified);
- styleResolver->style()->setAspectRatioDenominator(aspectRatioValue.denominatorValue());
- styleResolver->style()->setAspectRatioNumerator(aspectRatioValue.numeratorValue());
- }
-
- static PropertyHandler createHandler()
- {
- return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue);
- }
-};
-
</del><span class="cx"> const DeprecatedStyleBuilder& DeprecatedStyleBuilder::sharedStyleBuilder()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<DeprecatedStyleBuilder> styleBuilderInstance;
</span><span class="lines">@@ -1026,7 +978,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationName, ApplyPropertyAnimation<const String&, &Animation::name, &Animation::setName, &Animation::isNameSet, &Animation::clearName, &Animation::initialAnimationName, &CSSToStyleMap::mapAnimationName, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationPlayState, ApplyPropertyAnimation<EAnimPlayState, &Animation::playState, &Animation::setPlayState, &Animation::isPlayStateSet, &Animation::clearPlayState, &Animation::initialAnimationPlayState, &CSSToStyleMap::mapAnimationPlayState, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationTimingFunction, ApplyPropertyAnimation<const PassRefPtr<TimingFunction>, &Animation::timingFunction, &Animation::setTimingFunction, &Animation::isTimingFunctionSet, &Animation::clearTimingFunction, &Animation::initialAnimationTimingFunction, &CSSToStyleMap::mapAnimationTimingFunction, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitAspectRatio, ApplyPropertyAspectRatio::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundClip, CSSPropertyBackgroundClip);
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (176812 => 176813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-04 21:32:21 UTC (rev 176812)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-04 21:48:33 UTC (rev 176813)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #define StyleBuilderCustom_h
</span><span class="cx">
</span><span class="cx"> #include "BasicShapeFunctions.h"
</span><ins>+#include "CSSAspectRatioValue.h"
</ins><span class="cx"> #include "CSSImageGeneratorValue.h"
</span><span class="cx"> #include "CSSImageSetValue.h"
</span><span class="cx"> #include "CSSImageValue.h"
</span><span class="lines">@@ -125,6 +126,10 @@
</span><span class="cx"> static void applyInheritDisplay(StyleResolver&);
</span><span class="cx"> static void applyValueDisplay(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><ins>+ static void applyInitialWebkitAspectRatio(StyleResolver&);
+ static void applyInheritWebkitAspectRatio(StyleResolver&);
+ static void applyValueWebkitAspectRatio(StyleResolver&, CSSValue&);
+
</ins><span class="cx"> private:
</span><span class="cx"> static void resetEffectiveZoom(StyleResolver&);
</span><span class="cx"> static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor(StyleResolver&);
</span><span class="lines">@@ -1005,6 +1010,42 @@
</span><span class="cx"> styleResolver.style()->setDisplay(display);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void StyleBuilderCustom::applyInitialWebkitAspectRatio(StyleResolver& styleResolver)
+{
+ styleResolver.style()->setAspectRatioType(RenderStyle::initialAspectRatioType());
+ styleResolver.style()->setAspectRatioDenominator(RenderStyle::initialAspectRatioDenominator());
+ styleResolver.style()->setAspectRatioNumerator(RenderStyle::initialAspectRatioNumerator());
+}
+
+inline void StyleBuilderCustom::applyInheritWebkitAspectRatio(StyleResolver& styleResolver)
+{
+ if (styleResolver.parentStyle()->aspectRatioType() == AspectRatioAuto)
+ return;
+ styleResolver.style()->setAspectRatioType(styleResolver.parentStyle()->aspectRatioType());
+ styleResolver.style()->setAspectRatioDenominator(styleResolver.parentStyle()->aspectRatioDenominator());
+ styleResolver.style()->setAspectRatioNumerator(styleResolver.parentStyle()->aspectRatioNumerator());
+}
+
+inline void StyleBuilderCustom::applyValueWebkitAspectRatio(StyleResolver& styleResolver, CSSValue& value)
+{
+ if (is<CSSPrimitiveValue>(value)) {
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+ if (primitiveValue.getValueID() == CSSValueFromDimensions)
+ return styleResolver.style()->setAspectRatioType(AspectRatioFromDimensions);
+ if (primitiveValue.getValueID() == CSSValueFromIntrinsic)
+ return styleResolver.style()->setAspectRatioType(AspectRatioFromIntrinsic);
+
+ ASSERT(primitiveValue.getValueID() == CSSValueAuto);
+ return styleResolver.style()->setAspectRatioType(AspectRatioAuto);
+ }
+
+ auto& aspectRatioValue = downcast<CSSAspectRatioValue>(value);
+ styleResolver.style()->setAspectRatioType(AspectRatioSpecified);
+ styleResolver.style()->setAspectRatioDenominator(aspectRatioValue.denominatorValue());
+ styleResolver.style()->setAspectRatioNumerator(aspectRatioValue.numeratorValue());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderCustom_h
</span></span></pre>
</div>
</div>
</body>
</html>