<!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>[176524] 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/176524">176524</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-11-24 14:12:53 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the '-webkit-box-reflext' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139008
Reviewed by Anders Carlsson.
* css/CSSPropertyNames.in:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertReflection):
* 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="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.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 (176523 => 176524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-24 22:09:06 UTC (rev 176523)
+++ trunk/Source/WebCore/ChangeLog 2014-11-24 22:12:53 UTC (rev 176524)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-11-22 Sam Weinig <sam@webkit.org>
+
+ Move the '-webkit-box-reflext' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=139008
+
+ Reviewed by Anders Carlsson.
+
+ * css/CSSPropertyNames.in:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertReflection):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
</ins><span class="cx"> 2014-11-24 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused Style struct from SimpleLineLayout.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (176523 => 176524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-24 22:09:06 UTC (rev 176523)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-24 22:12:53 UTC (rev 176524)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> -webkit-box-ordinal-group [TypeName=unsigned]
</span><span class="cx"> -webkit-box-orient
</span><span class="cx"> -webkit-box-pack
</span><del>--webkit-box-reflect [LegacyStyleBuilder]
</del><ins>+-webkit-box-reflect [Converter=Reflection]
</ins><span class="cx"> // -webkit-box-shadow differs from box-shadow in its treatement of blur radii > 8px.
</span><span class="cx"> // Let -webkit-box-shadow blur radius be w_r and box-shadow blur radius be b_r. For
</span><span class="cx"> // w_r > 8px, b_r = 8 + 4 * sqrt((w_r - 8) / 2).
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (176523 => 176524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-24 22:09:06 UTC (rev 176523)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-24 22:12:53 UTC (rev 176524)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "BasicShapeFunctions.h"
</span><span class="cx"> #include "CSSCalculationValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><ins>+#include "CSSReflectValue.h"
</ins><span class="cx"> #include "Length.h"
</span><span class="cx"> #include "Pair.h"
</span><span class="cx"> #include "QuotesData.h"
</span><span class="lines">@@ -68,6 +69,7 @@
</span><span class="cx"> static int convertMarqueeSpeed(StyleResolver&, CSSValue&);
</span><span class="cx"> static PassRefPtr<QuotesData> convertQuotes(StyleResolver&, CSSValue&);
</span><span class="cx"> static TextUnderlinePosition convertTextUnderlinePosition(StyleResolver&, CSSValue&);
</span><ins>+ static PassRefPtr<StyleReflection> convertReflection(StyleResolver&, CSSValue&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static Length convertToRadiusLength(CSSToLengthConversionData&, CSSPrimitiveValue&);
</span><span class="lines">@@ -469,6 +471,29 @@
</span><span class="cx"> return static_cast<TextUnderlinePosition>(combinedPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline PassRefPtr<StyleReflection> StyleBuilderConverter::convertReflection(StyleResolver& styleResolver, CSSValue& value)
+{
+ if (is<CSSPrimitiveValue>(value)) {
+ ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone);
+ return nullptr;
+ }
+
+ CSSReflectValue& reflectValue = downcast<CSSReflectValue>(value);
+
+ RefPtr<StyleReflection> reflection = StyleReflection::create();
+ reflection->setDirection(*reflectValue.direction());
+
+ if (reflectValue.offset())
+ reflection->setOffset(reflectValue.offset()->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(styleResolver.state().cssToLengthConversionData()));
+
+ NinePieceImage mask;
+ mask.setMaskDefaults();
+ styleResolver.styleMap()->mapNinePieceImage(CSSPropertyWebkitBoxReflect, reflectValue.mask(), mask);
+ reflection->setMask(mask);
+
+ return reflection.release();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderConverter_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (176523 => 176524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-11-24 22:09:06 UTC (rev 176523)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-11-24 22:12:53 UTC (rev 176524)
</span><span class="lines">@@ -2411,29 +2411,6 @@
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- case CSSPropertyWebkitBoxReflect: {
- HANDLE_INHERIT_AND_INITIAL(boxReflect, BoxReflect)
- if (primitiveValue) {
- state.style()->setBoxReflect(RenderStyle::initialBoxReflect());
- return;
- }
-
- if (!is<CSSReflectValue>(*value))
- return;
-
- CSSReflectValue& reflectValue = downcast<CSSReflectValue>(*value);
- RefPtr<StyleReflection> reflection = StyleReflection::create();
- reflection->setDirection(*reflectValue.direction());
- if (reflectValue.offset())
- reflection->setOffset(reflectValue.offset()->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(state.cssToLengthConversionData()));
- NinePieceImage mask;
- mask.setMaskDefaults();
- m_styleMap.mapNinePieceImage(id, reflectValue.mask(), mask);
- reflection->setMask(mask);
-
- state.style()->setBoxReflect(reflection.release());
- return;
- }
</del><span class="cx"> case CSSPropertySrc: // Only used in @font-face rules.
</span><span class="cx"> return;
</span><span class="cx"> case CSSPropertyUnicodeRange: // Only used in @font-face rules.
</span><span class="lines">@@ -3081,6 +3058,7 @@
</span><span class="cx"> case CSSPropertyWebkitBoxOrdinalGroup:
</span><span class="cx"> case CSSPropertyWebkitBoxOrient:
</span><span class="cx"> case CSSPropertyWebkitBoxPack:
</span><ins>+ case CSSPropertyWebkitBoxReflect:
</ins><span class="cx"> case CSSPropertyWebkitColorCorrection:
</span><span class="cx"> case CSSPropertyWebkitColumnAxis:
</span><span class="cx"> case CSSPropertyWebkitColumnBreakAfter:
</span></span></pre>
</div>
</div>
</body>
</html>