<!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>[37154] 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/37154">37154</a></dd>
<dt>Author</dt> <dd>kmccullough@apple.com</dd>
<dt>Date</dt> <dd>2008-10-01 13:41:56 -0700 (Wed, 01 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebCore:

2008-10-01  Kevin McCullough  &lt;kmccullough@apple.com&gt;

        Reviewed by Dan Bernstein.

        https://bugs.webkit.org/show_bug.cgi?id=21284
        Bug 21284: Max height affects max width
        - Looks like a cut and paste bug
        - Added layout test fast/css/max-height-and-max-width.html

        * css/CSSComputedStyleDeclaration.cpp:
        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

LayoutTests:

2008-10-01  Kevin McCullough  &lt;kmccullough@apple.com&gt;

        Reviewed by Dan Bernstein.

        https://bugs.webkit.org/show_bug.cgi?id=21284
        Bug 21284: Max height affects max width
        - Looks like a cut and paste bug

        * fast/css/max-height-and-max-width-expected.txt: Added.
        * fast/css/max-height-and-max-width.html: Added.</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="#trunkWebCorecssCSSComputedStyleDeclarationcpp">trunk/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssmaxheightandmaxwidthexpectedtxt">trunk/LayoutTests/fast/css/max-height-and-max-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssmaxheightandmaxwidthhtml">trunk/LayoutTests/fast/css/max-height-and-max-width.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (37153 => 37154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2008-10-01 20:34:07 UTC (rev 37153)
+++ trunk/LayoutTests/ChangeLog        2008-10-01 20:41:56 UTC (rev 37154)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2008-10-01  Kevin McCullough  &lt;kmccullough@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21284
+        Bug 21284: Max height affects max width
+        - Looks like a cut and paste bug
+
+        * fast/css/max-height-and-max-width-expected.txt: Added.
+        * fast/css/max-height-and-max-width.html: Added.
+
</ins><span class="cx"> 2008-10-01  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssmaxheightandmaxwidthexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/max-height-and-max-width-expected.txt (0 => 37154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/max-height-and-max-width-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/css/max-height-and-max-width-expected.txt        2008-10-01 20:41:56 UTC (rev 37154)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+This succeeds if max-height and max-width are not set together, but are different values.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS max-width is independent of max-height.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssmaxheightandmaxwidthhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/max-height-and-max-width.html (0 => 37154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/max-height-and-max-width.html                                (rev 0)
+++ trunk/LayoutTests/fast/css/max-height-and-max-width.html        2008-10-01 20:41:56 UTC (rev 37154)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+&lt;!DOCTYPE HTML PUBLIC &quot;-//IETF//DTD HTML//EN&quot;&gt;
+&lt;html&gt;
+&lt;head id=&quot;myhead&quot;&gt;
+&lt;link rel=&quot;stylesheet&quot; href=&quot;../js/resources/js-test-style.css&quot;&gt;
+&lt;script src=&quot;../js/resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;../js/resources/js-test-post-function.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+if (window.layoutTestController)
+    window.layoutTestController.dumpAsText();
+
+function doTest()
+{
+    description(&quot;This succeeds if max-height and max-width are not set together, but are different values.&quot;);
+
+    var box = document.createElement(&quot;div&quot;);
+    box.style['max-height'] = &quot;20px&quot;;
+    box.style['max-width'] = &quot;30px&quot;;
+
+    document.getElementById(&quot;body&quot;).appendChild(box);    
+
+    var style = window.getComputedStyle(box);
+    if(style.getPropertyValue(&quot;max-height&quot;) == style.getPropertyValue(&quot;max-width&quot;))
+        testFailed(&quot;max-width is NOT independent of max-height.&quot;);
+    else
+        testPassed(&quot;max-width is independent of max-height.&quot;);
+
+    window.successfullyParsed = true;
+}
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body onload=&quot;doTest()&quot; id=&quot;body&quot;&gt;
+&lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
+&lt;div id=&quot;console&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 (37153 => 37154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-01 20:34:07 UTC (rev 37153)
+++ trunk/WebCore/ChangeLog        2008-10-01 20:41:56 UTC (rev 37154)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2008-10-01  Kevin McCullough  &lt;kmccullough@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21284
+        Bug 21284: Max height affects max width
+        - Looks like a cut and paste bug
+        - Added layout test fast/css/max-height-and-max-width.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+
</ins><span class="cx"> 2008-10-01  David Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=21282
</span></span></pre></div>
<a id="trunkWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSComputedStyleDeclaration.cpp (37153 => 37154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSComputedStyleDeclaration.cpp        2008-10-01 20:34:07 UTC (rev 37153)
+++ trunk/WebCore/css/CSSComputedStyleDeclaration.cpp        2008-10-01 20:41:56 UTC (rev 37154)
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx">             return CSSPrimitiveValue::create(maxHeight);
</span><span class="cx">         }
</span><span class="cx">         case CSSPropertyMaxWidth: {
</span><del>-            const Length&amp; maxWidth = style-&gt;maxHeight();
</del><ins>+            const Length&amp; maxWidth = style-&gt;maxWidth();
</ins><span class="cx">             if (maxWidth.isFixed() &amp;&amp; maxWidth.value() == undefinedLength)
</span><span class="cx">                 return CSSPrimitiveValue::createIdentifier(CSSValueNone);
</span><span class="cx">             return CSSPrimitiveValue::create(maxWidth);
</span></span></pre>
</div>
</div>

</body>
</html>