<!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>[46773] trunk</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/46773">46773</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2009-08-04 12:38:26 -0700 (Tue, 04 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-08-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;

        Reviewed by Dave Hyatt.

        Add support for transitions of min- and max-width, and min- and max-height.
        https://bugs.webkit.org/show_bug.cgi?id=27990

        Test: transitions/min-max-width-height-transitions.html

        * page/animation/AnimationBase.cpp:
        (WebCore::ensurePropertyMap):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageanimationAnimationBasecpp">trunk/WebCore/page/animation/AnimationBase.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTeststransitionsminmaxwidthheighttransitionsexpectedtxt">trunk/LayoutTests/transitions/min-max-width-height-transitions-expected.txt</a></li>
<li><a href="#trunkLayoutTeststransitionsminmaxwidthheighttransitionshtml">trunk/LayoutTests/transitions/min-max-width-height-transitions.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (46772 => 46773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-08-04 19:17:38 UTC (rev 46772)
+++ trunk/LayoutTests/ChangeLog        2009-08-04 19:38:26 UTC (rev 46773)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-08-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Reviewed by Dave Hyatt.
+
+        Add support for transitions of min- and max-width, and min- and max-height.
+        https://bugs.webkit.org/show_bug.cgi?id=27990
+
+        * transitions/min-max-width-height-transitions-expected.txt: Added.
+        * transitions/min-max-width-height-transitions.html: Added.
+
</ins><span class="cx"> 2009-08-04  Chris Fleizach  &lt;cfleizach@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTeststransitionsminmaxwidthheighttransitionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/transitions/min-max-width-height-transitions-expected.txt (0 => 46773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/min-max-width-height-transitions-expected.txt                                (rev 0)
+++ trunk/LayoutTests/transitions/min-max-width-height-transitions-expected.txt        2009-08-04 19:38:26 UTC (rev 46773)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS - &quot;min-height&quot; property for &quot;box1&quot; element at 0.5s saw something close to: 150
+PASS - &quot;min-width&quot; property for &quot;box1&quot; element at 0.5s saw something close to: 150
+PASS - &quot;max-height&quot; property for &quot;box2&quot; element at 0.5s saw something close to: 75
+PASS - &quot;max-width&quot; property for &quot;box2&quot; element at 0.5s saw something close to: 75
+
</ins></span></pre></div>
<a id="trunkLayoutTeststransitionsminmaxwidthheighttransitionshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/transitions/min-max-width-height-transitions.html (0 => 46773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/min-max-width-height-transitions.html                                (rev 0)
+++ trunk/LayoutTests/transitions/min-max-width-height-transitions.html        2009-08-04 19:38:26 UTC (rev 46773)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+&lt;!DOCTYPE&gt;
+&lt;html&gt;
+&lt;head&gt;
+  &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot;&gt;
+  &lt;title&gt;Testing transitions of min-, max-width, height&lt;/title&gt;
+  &lt;style type=&quot;text/css&quot; media=&quot;screen&quot;&gt;
+    #container {
+      border: 1px solid black;
+      width: 300px;
+      height: 300px;
+    }
+    
+    .box {
+      width: 100px;
+      height: 100px;
+      margin: 10px;
+      background-color: blue;
+      -webkit-transition-property: min-width, min-height, max-width, max-height;
+      -webkit-transition-duration: 1s;
+      -webkit-transition-timing-function: linear;
+    }
+    
+    .minner {
+      min-width: 100px;
+      min-height: 100px;
+    }
+
+    #container.final .minner {
+      min-width: 200px;
+      min-height: 200px;
+    }
+
+    .maxer {
+      max-width: 100px;
+      max-height: 100px;
+    }
+
+    #container.final .maxer {
+      max-width: 50px;
+      max-height: 50px;
+    }
+
+  &lt;/style&gt;
+  &lt;script src=&quot;transition-test-helpers.js&quot; type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;&lt;/script&gt;
+  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;
+
+    const expectedValues = [
+      // [time, element-id, property, expected-value, tolerance]
+      [0.5, 'box1', 'min-height', 150, 2],
+      [0.5, 'box1', 'min-width', 150, 2],
+      [0.5, 'box2', 'max-height', 75, 2],
+      [0.5, 'box2', 'max-width', 75, 2],
+    ];
+  
+    function setupTest()
+    {
+      document.getElementById('container').className = 'final';
+    }
+  
+    runTransitionTest(expectedValues, setupTest, true);
+    
+  &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+  
+  &lt;div id=&quot;container&quot;&gt;
+    &lt;div id=&quot;box1&quot; class='minner box'&gt;&lt;/div&gt;
+    &lt;div id=&quot;box2&quot; class='maxer box'&gt;&lt;/div&gt;
+  &lt;/div&gt;
+
+  &lt;div id=&quot;result&quot;&gt;&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46772 => 46773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-08-04 19:17:38 UTC (rev 46772)
+++ trunk/WebCore/ChangeLog        2009-08-04 19:38:26 UTC (rev 46773)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2009-08-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Reviewed by Dave Hyatt.
+
+        Add support for transitions of min- and max-width, and min- and max-height.
+        https://bugs.webkit.org/show_bug.cgi?id=27990
+
+        Test: transitions/min-max-width-height-transitions.html
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::ensurePropertyMap):
+
</ins><span class="cx"> 2009-08-04  Chris Fleizach  &lt;cfleizach@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/animation/AnimationBase.cpp (46772 => 46773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/animation/AnimationBase.cpp        2009-08-04 19:17:38 UTC (rev 46772)
+++ trunk/WebCore/page/animation/AnimationBase.cpp        2009-08-04 19:38:26 UTC (rev 46773)
</span><span class="lines">@@ -418,8 +418,15 @@
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyRight, &amp;RenderStyle::right, &amp;RenderStyle::setRight));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyTop, &amp;RenderStyle::top, &amp;RenderStyle::setTop));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyBottom, &amp;RenderStyle::bottom, &amp;RenderStyle::setBottom));
</span><ins>+
</ins><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyWidth, &amp;RenderStyle::width, &amp;RenderStyle::setWidth));
</span><ins>+        gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyMinWidth, &amp;RenderStyle::minWidth, &amp;RenderStyle::setMinWidth));
+        gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyMaxWidth, &amp;RenderStyle::maxWidth, &amp;RenderStyle::setMaxWidth));
+
</ins><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyHeight, &amp;RenderStyle::height, &amp;RenderStyle::setHeight));
</span><ins>+        gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyMinHeight, &amp;RenderStyle::minHeight, &amp;RenderStyle::setMinHeight));
+        gPropertyWrappers-&gt;append(new PropertyWrapper&lt;Length&gt;(CSSPropertyMaxHeight, &amp;RenderStyle::maxHeight, &amp;RenderStyle::setMaxHeight));
+
</ins><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;unsigned short&gt;(CSSPropertyBorderLeftWidth, &amp;RenderStyle::borderLeftWidth, &amp;RenderStyle::setBorderLeftWidth));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;unsigned short&gt;(CSSPropertyBorderRightWidth, &amp;RenderStyle::borderRightWidth, &amp;RenderStyle::setBorderRightWidth));
</span><span class="cx">         gPropertyWrappers-&gt;append(new PropertyWrapper&lt;unsigned short&gt;(CSSPropertyBorderTopWidth, &amp;RenderStyle::borderTopWidth, &amp;RenderStyle::setBorderTopWidth));
</span><span class="lines">@@ -498,7 +505,6 @@
</span><span class="cx"> 
</span><span class="cx">         // TODO:
</span><span class="cx">         // 
</span><del>-        //  CSSPropertyMinWidth, CSSPropertyMaxWidth, CSSPropertyMinHeight, CSSPropertyMaxHeight
</del><span class="cx">         //  CSSPropertyTextIndent
</span><span class="cx">         //  CSSPropertyVerticalAlign
</span><span class="cx">         // 
</span></span></pre>
</div>
</div>

</body>
</html>