<!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>[175445] 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/175445">175445</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-31 18:31:46 -0700 (Fri, 31 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>StyleBuilder: Stop using custom code for -webkit-hyphenate-limit-lines
https://bugs.webkit.org/show_bug.cgi?id=138270
Reviewed by Antti Koivisto.
Stop using custom code for -webkit-hyphenate-limit-lines in the new
StyleBuilder. We don't really need to, we can just have a Converter
specific to this property.
No new tests, no behavior change.
* css/CSSPropertyNames.in:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertWebkitHyphenateLimitLines):
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderFunctions::applyValueWebkitHyphenateLimitLines): 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 (175444 => 175445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-01 01:07:48 UTC (rev 175444)
+++ trunk/Source/WebCore/ChangeLog 2014-11-01 01:31:46 UTC (rev 175445)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-10-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ StyleBuilder: Stop using custom code for -webkit-hyphenate-limit-lines
+ https://bugs.webkit.org/show_bug.cgi?id=138270
+
+ Reviewed by Antti Koivisto.
+
+ Stop using custom code for -webkit-hyphenate-limit-lines in the new
+ StyleBuilder. We don't really need to, we can just have a Converter
+ specific to this property.
+
+ No new tests, no behavior change.
+
+ * css/CSSPropertyNames.in:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertWebkitHyphenateLimitLines):
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderFunctions::applyValueWebkitHyphenateLimitLines): Deleted.
+
+2014-10-31 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Support throttling of DOMTimers using nested setTimeout() calls
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138262
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175444 => 175445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-01 01:07:48 UTC (rev 175444)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-01 01:31:46 UTC (rev 175445)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> -webkit-hyphenate-character [Inherited]
</span><span class="cx"> -webkit-hyphenate-limit-after [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitAfter, Converter=Number<short>]
</span><span class="cx"> -webkit-hyphenate-limit-before [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitBefore, Converter=Number<short>]
</span><del>--webkit-hyphenate-limit-lines [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitLines, Custom=Value]
</del><ins>+-webkit-hyphenate-limit-lines [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitLines, Converter=WebkitHyphenateLimitLines]
</ins><span class="cx"> -webkit-hyphens [Inherited, NewStyleBuilder, TypeName=Hyphens]
</span><span class="cx"> -epub-hyphens = -webkit-hyphens
</span><span class="cx"> -webkit-initial-letter
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (175444 => 175445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-01 01:07:48 UTC (rev 175444)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-01 01:31:46 UTC (rev 175445)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> static LengthSize convertRadius(StyleResolver&, CSSValue&);
</span><span class="cx"> static TextDecoration convertTextDecoration(StyleResolver&, CSSValue&);
</span><span class="cx"> template <typename T> static T convertNumber(StyleResolver&, CSSValue&);
</span><ins>+ static short convertWebkitHyphenateLimitLines(StyleResolver&, CSSValue&);
</ins><span class="cx"> template <CSSPropertyID property> static NinePieceImage convertBorderImage(StyleResolver&, CSSValue&);
</span><span class="cx"> template <CSSPropertyID property> static NinePieceImage convertBorderMask(StyleResolver&, CSSValue&);
</span><span class="cx"> template <CSSPropertyID property> static PassRefPtr<StyleImage> convertBorderImageSource(StyleResolver&, CSSValue&);
</span><span class="lines">@@ -209,6 +210,14 @@
</span><span class="cx"> return primitiveValue.getValue<T>(CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline short StyleBuilderConverter::convertWebkitHyphenateLimitLines(StyleResolver&, CSSValue& value)
+{
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ if (primitiveValue.getValueID() == CSSValueNoLimit)
+ return -1;
+ return primitiveValue.getValue<short>(CSSPrimitiveValue::CSS_NUMBER);
+}
+
</ins><span class="cx"> template <CSSPropertyID property>
</span><span class="cx"> inline NinePieceImage StyleBuilderConverter::convertBorderImage(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (175444 => 175445)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-11-01 01:07:48 UTC (rev 175444)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-11-01 01:31:46 UTC (rev 175445)
</span><span class="lines">@@ -33,15 +33,6 @@
</span><span class="cx">
</span><span class="cx"> namespace StyleBuilderFunctions {
</span><span class="cx">
</span><del>-inline void applyValueWebkitHyphenateLimitLines(StyleResolver& styleResolver, CSSValue& value)
-{
- auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
- short number = -1;
- if (primitiveValue.getValueID() != CSSValueNoLimit)
- number = primitiveValue.getValue<short>(CSSPrimitiveValue::CSS_NUMBER);
- styleResolver.style()->setHyphenationLimitLines(number);
-}
-
</del><span class="cx"> inline void applyValueWebkitMarqueeIncrement(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span><span class="cx"> auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</span></span></pre>
</div>
</div>
</body>
</html>