<!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>[35975] trunk/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/35975">35975</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2008-08-28 12:53:56 -0700 (Thu, 28 Aug 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-08-28  David Hyatt  &lt;hyatt@apple.com&gt;

        Reviewed by Darin

        https://bugs.webkit.org/show_bug.cgi?id=18091

        font-size should be animatable using -webkit-transition.

        * page/AnimationController.cpp:
        (WebCore::AnimationControllerPrivate::ensurePropertyMap):
        * rendering/style/RenderStyle.h:
        (WebCore::RenderStyle::setFontSize):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageAnimationControllercpp">trunk/WebCore/page/AnimationController.cpp</a></li>
<li><a href="#trunkWebCorerenderingstyleRenderStylecpp">trunk/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkWebCorerenderingstyleRenderStyleh">trunk/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (35974 => 35975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-08-28 18:08:09 UTC (rev 35974)
+++ trunk/WebCore/ChangeLog        2008-08-28 19:53:56 UTC (rev 35975)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2008-08-28  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        Reviewed by Darin
+
+        https://bugs.webkit.org/show_bug.cgi?id=18091
+
+        font-size should be animatable using -webkit-transition.
+
+        * page/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::ensurePropertyMap):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::setFontSize):
+
</ins><span class="cx"> 2008-08-28  Brad Garcia  &lt;bgarcia@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkWebCorepageAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/AnimationController.cpp (35974 => 35975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/AnimationController.cpp        2008-08-28 18:08:09 UTC (rev 35974)
+++ trunk/WebCore/page/AnimationController.cpp        2008-08-28 19:53:56 UTC (rev 35975)
</span><span class="lines">@@ -1160,6 +1160,7 @@
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;float&gt;(CSSPropertyOpacity, &amp;RenderStyle::opacity, &amp;RenderStyle::setOpacity));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;const Color&amp;&gt;(CSSPropertyColor, &amp;RenderStyle::color, &amp;RenderStyle::setColor));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;const Color&amp;&gt;(CSSPropertyBackgroundColor, &amp;RenderStyle::backgroundColor, &amp;RenderStyle::setBackgroundColor));
</span><ins>+        gPropertyWrappers-&gt;append(new PropertyWrapper&lt;int&gt;(CSSPropertyFontSize, &amp;RenderStyle::fontSize, &amp;RenderStyle::setBlendedFontSize));
</ins><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;unsigned short&gt;(CSSPropertyWebkitColumnRuleWidth, &amp;RenderStyle::columnRuleWidth, &amp;RenderStyle::setColumnRuleWidth));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;float&gt;(CSSPropertyWebkitColumnGap, &amp;RenderStyle::columnGap, &amp;RenderStyle::setColumnGap));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;unsigned short&gt;(CSSPropertyWebkitColumnCount, &amp;RenderStyle::columnCount, &amp;RenderStyle::setColumnCount));
</span></span></pre></div>
<a id="trunkWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/RenderStyle.cpp (35974 => 35975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/RenderStyle.cpp        2008-08-28 18:08:09 UTC (rev 35974)
+++ trunk/WebCore/rendering/style/RenderStyle.cpp        2008-08-28 19:53:56 UTC (rev 35975)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CachedImage.h&quot;
</span><span class="cx"> #include &quot;CSSStyleSelector.h&quot;
</span><ins>+#include &quot;FontSelector.h&quot;
</ins><span class="cx"> #include &quot;RenderArena.h&quot;
</span><span class="cx"> #include &quot;RenderObject.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -2047,4 +2048,13 @@
</span><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RenderStyle::setBlendedFontSize(int size)
+{
+    FontDescription desc(fontDescription());
+    desc.setSpecifiedSize(size);
+    desc.setComputedSize(size);
+    setFontDescription(desc);
+    font().update(font().fontSelector());
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/RenderStyle.h (35974 => 35975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/RenderStyle.h        2008-08-28 18:08:09 UTC (rev 35974)
+++ trunk/WebCore/rendering/style/RenderStyle.h        2008-08-28 19:53:56 UTC (rev 35975)
</span><span class="lines">@@ -2275,7 +2275,10 @@
</span><span class="cx">         }
</span><span class="cx">         return false;
</span><span class="cx">     }
</span><del>-
</del><ins>+    
+    // Only used for blending font sizes when animating.
+    void setBlendedFontSize(int);
+    
</ins><span class="cx">     void setColor(const Color &amp; v) { SET_VAR(inherited,color,v) }
</span><span class="cx">     void setTextIndent(Length v) { SET_VAR(inherited,indent,v) }
</span><span class="cx">     void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }
</span></span></pre>
</div>
</div>

</body>
</html>