r97693 caused 42 failures on the chromium mac bots
authorojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Oct 2011 00:10:58 +0000 (00:10 +0000)
committerojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Oct 2011 00:10:58 +0000 (00:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=70300

Can't test this until https://bugs.webkit.org/show_bug.cgi?id=70660
is fixed. The fix for that bug will test this codepath as well though.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp

index 0b57bc4..f0b5b0b 100755 (executable)
@@ -1,3 +1,14 @@
+2011-10-21  Ojan Vafai  <ojan@chromium.org>
+
+        r97693 caused 42 failures on the chromium mac bots
+        https://bugs.webkit.org/show_bug.cgi?id=70300
+
+        Can't test this until https://bugs.webkit.org/show_bug.cgi?id=70660
+        is fixed. The fix for that bug will test this codepath as well though.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
+
 2011-10-21  Vineet Chaudhary  <vineet.chaudhary@motorola.com>
 
         Setting form.enctype reflected attribute behaves strangely.
index 0b4bc1e..0262b39 100644 (file)
@@ -5258,7 +5258,7 @@ void RenderBlock::computeBlockPreferredLogicalWidths()
         if (child->isBox() && child->isHorizontalWritingMode() != isHorizontalWritingMode()) {
             RenderBox* childBox = toRenderBox(child);
             LayoutUnit oldHeight = childBox->logicalHeight();
-            setLogicalHeight(childBox->borderAndPaddingLogicalHeight());
+            childBox->setLogicalHeight(childBox->borderAndPaddingLogicalHeight());
             childBox->computeLogicalHeight();
             childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = childBox->logicalHeight();
             childBox->setLogicalHeight(oldHeight);