<!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>[178512] 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/178512">178512</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 09:20:44 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of custom StyleBuilder code for 'line-height' CSS property
https://bugs.webkit.org/show_bug.cgi?id=140462
Reviewed by Antti Koivisto.
Get rid of custom StyleBuilder code for 'line-height' CSS property by
using a conditional converter.
* css/CSSPropertyNames.in:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertLineHeight):
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueLineHeight):
(WebCore::StyleBuilderCustom::convertLineHeight): Deleted.</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="#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 (178511 => 178512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-15 16:45:12 UTC (rev 178511)
+++ trunk/Source/WebCore/ChangeLog 2015-01-15 17:20:44 UTC (rev 178512)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-15 Chris Dumez <cdumez@apple.com>
+
+ Get rid of custom StyleBuilder code for 'line-height' CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=140462
+
+ Reviewed by Antti Koivisto.
+
+ Get rid of custom StyleBuilder code for 'line-height' CSS property by
+ using a conditional converter.
+
+ * css/CSSPropertyNames.in:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertLineHeight):
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueLineHeight):
+ (WebCore::StyleBuilderCustom::convertLineHeight): Deleted.
+
</ins><span class="cx"> 2015-01-15 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename Font to FontCascade
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (178511 => 178512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-15 16:45:12 UTC (rev 178511)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-15 17:20:44 UTC (rev 178512)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> #if defined(ENABLE_IOS_TEXT_AUTOSIZING) && ENABLE_IOS_TEXT_AUTOSIZING
</span><span class="cx"> line-height [Inherited, Custom=All]
</span><span class="cx"> #else
</span><del>-line-height [Inherited, Getter=specifiedLineHeight, Custom=Value]
</del><ins>+line-height [Inherited, Getter=specifiedLineHeight, ConditionalConverter=LineHeight]
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Keep this in between the highest priority props and the lower ones.
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (178511 => 178512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-15 16:45:12 UTC (rev 178511)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-15 17:20:44 UTC (rev 178512)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> static Color convertSVGColor(StyleResolver&, CSSValue&);
</span><span class="cx"> static EGlyphOrientation convertGlyphOrientation(StyleResolver&, CSSValue&);
</span><span class="cx"> static EGlyphOrientation convertGlyphOrientationOrAuto(StyleResolver&, CSSValue&);
</span><ins>+ static Optional<Length> convertLineHeight(StyleResolver&, CSSValue&, float multiplier = 1.f);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class StyleBuilderCustom;
</span><span class="lines">@@ -1211,6 +1212,29 @@
</span><span class="cx"> return convertGlyphOrientation(styleResolver, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline Optional<Length> StyleBuilderConverter::convertLineHeight(StyleResolver& styleResolver, CSSValue& value, float multiplier)
+{
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ if (primitiveValue.getValueID() == CSSValueNormal)
+ return RenderStyle::initialLineHeight();
+
+ if (primitiveValue.isLength()) {
+ Length length = primitiveValue.computeLength<Length>(StyleBuilderConverter::csstoLengthConversionDataWithTextZoomFactor(styleResolver));
+ if (multiplier != 1.f)
+ length = Length(length.value() * multiplier, Fixed);
+ return length;
+ }
+ if (primitiveValue.isPercentage()) {
+ // FIXME: percentage should not be restricted to an integer here.
+ return Length((styleResolver.style()->computedFontSize() * primitiveValue.getIntValue()) / 100, Fixed);
+ }
+ if (primitiveValue.isNumber()) {
+ // FIXME: number and percentage values should produce the same type of Length (ie. Fixed or Percent).
+ return Length(primitiveValue.getDoubleValue() * multiplier * 100.0, Percent);
+ }
+ return Nullopt;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderConverter_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (178511 => 178512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-15 16:45:12 UTC (rev 178511)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-15 17:20:44 UTC (rev 178512)
</span><span class="lines">@@ -116,9 +116,6 @@
</span><span class="cx"> // Custom handling of value setting only.
</span><span class="cx"> static void applyValueBaselineShift(StyleResolver&, CSSValue&);
</span><span class="cx"> static void applyValueDirection(StyleResolver&, CSSValue&);
</span><del>-#if !ENABLE(IOS_TEXT_AUTOSIZING)
- static void applyValueLineHeight(StyleResolver&, CSSValue&);
-#endif
</del><span class="cx"> static void applyValueVerticalAlign(StyleResolver&, CSSValue&);
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> static void applyValueWebkitDashboardRegion(StyleResolver&, CSSValue&);
</span><span class="lines">@@ -134,7 +131,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void resetEffectiveZoom(StyleResolver&);
</span><del>- static bool convertLineHeight(StyleResolver&, const CSSValue&, Length&, float multiplier = 1.f);
</del><span class="cx">
</span><span class="cx"> static Length mmLength(double mm);
</span><span class="cx"> static Length inchLength(double inch);
</span><span class="lines">@@ -606,32 +602,6 @@
</span><span class="cx"> DEFINE_BORDER_IMAGE_MODIFIER_HANDLER(WebkitMaskBoxImage, Slice)
</span><span class="cx"> DEFINE_BORDER_IMAGE_MODIFIER_HANDLER(WebkitMaskBoxImage, Width)
</span><span class="cx">
</span><del>-inline bool StyleBuilderCustom::convertLineHeight(StyleResolver& styleResolver, const CSSValue& value, Length& length, float multiplier)
-{
- auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
- if (primitiveValue.getValueID() == CSSValueNormal) {
- length = RenderStyle::initialLineHeight();
- return true;
- }
- if (primitiveValue.isLength()) {
- length = primitiveValue.computeLength<Length>(StyleBuilderConverter::csstoLengthConversionDataWithTextZoomFactor(styleResolver));
- if (multiplier != 1.f)
- length = Length(length.value() * multiplier, Fixed);
- return true;
- }
- if (primitiveValue.isPercentage()) {
- // FIXME: percentage should not be restricted to an integer here.
- length = Length((styleResolver.style()->computedFontSize() * primitiveValue.getIntValue()) / 100, Fixed);
- return true;
- }
- if (primitiveValue.isNumber()) {
- // FIXME: number and percentage values should produce the same type of Length (ie. Fixed or Percent).
- length = Length(primitiveValue.getDoubleValue() * multiplier * 100.0, Percent);
- return true;
- }
- return false;
-}
-
</del><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyInheritLineHeight(StyleResolver& styleResolver)
</span><span class="lines">@@ -648,26 +618,15 @@
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyValueLineHeight(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span><del>- Length lineHeight;
</del><span class="cx"> float multiplier = styleResolver.style()->textSizeAdjust().isPercentage() ? styleResolver.style()->textSizeAdjust().multiplier() : 1.f;
</span><del>- if (!convertLineHeight(styleResolver, value, lineHeight, multiplier))
</del><ins>+ Optional<Length> lineHeight = StyleBuilderConverter::convertLineHeight(styleResolver, value, multiplier);
+ if (!lineHeight)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- styleResolver.style()->setLineHeight(lineHeight);
- styleResolver.style()->setSpecifiedLineHeight(lineHeight);
</del><ins>+ styleResolver.style()->setLineHeight(lineHeight.value());
+ styleResolver.style()->setSpecifiedLineHeight(lineHeight.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#else
-
-inline void StyleBuilderCustom::applyValueLineHeight(StyleResolver& styleResolver, CSSValue& value)
-{
- Length lineHeight;
- if (!convertLineHeight(styleResolver, value, lineHeight))
- return;
-
- styleResolver.style()->setLineHeight(lineHeight);
-}
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyInheritOutlineStyle(StyleResolver& styleResolver)
</span></span></pre>
</div>
</div>
</body>
</html>