Title: [97661] trunk
- Revision
- 97661
- Author
- [email protected]
- Date
- 2011-10-17 15:53:43 -0700 (Mon, 17 Oct 2011)
Log Message
Unreviewed, rolling out r97653.
http://trac.webkit.org/changeset/97653
https://bugs.webkit.org/show_bug.cgi?id=69957
Caused a number of Chromium failures.
Source/WebCore:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
LayoutTests:
* fast/writing-mode/borders-expected.html: Removed.
* fast/writing-mode/borders.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (97660 => 97661)
--- trunk/LayoutTests/ChangeLog 2011-10-17 22:38:58 UTC (rev 97660)
+++ trunk/LayoutTests/ChangeLog 2011-10-17 22:53:43 UTC (rev 97661)
@@ -1,3 +1,14 @@
+2011-10-17 Ojan Vafai <[email protected]>
+
+ Unreviewed, rolling out r97653.
+ http://trac.webkit.org/changeset/97653
+ https://bugs.webkit.org/show_bug.cgi?id=69957
+
+ Caused a number of Chromium failures.
+
+ * fast/writing-mode/borders-expected.html: Removed.
+ * fast/writing-mode/borders.html: Removed.
+
2011-10-17 Dirk Pranke <[email protected]>
fullscreen/video-controls-override.html is still failing on chromium bots.
Deleted: trunk/LayoutTests/fast/writing-mode/borders-expected.html (97660 => 97661)
--- trunk/LayoutTests/fast/writing-mode/borders-expected.html 2011-10-17 22:38:58 UTC (rev 97660)
+++ trunk/LayoutTests/fast/writing-mode/borders-expected.html 2011-10-17 22:53:43 UTC (rev 97661)
@@ -1,29 +0,0 @@
-<style>
-.container {
- border: 5px solid red;
- display: inline-block;
-}
-.box {
- border: 5px solid;
- width: 100px;
- height: 50px;
-}
-</style>
-
-<div>The four boxes below should look identical.</div>
-
-<div class="container">
- <div class="box"></div>
-</div>
-
-<div class="container">
- <div class="box"></div>
-</div>
-
-<div class="container">
- <div class="box"></div>
-</div>
-
-<div class="container">
- <div class="box"></div>
-</div>
Deleted: trunk/LayoutTests/fast/writing-mode/borders.html (97660 => 97661)
--- trunk/LayoutTests/fast/writing-mode/borders.html 2011-10-17 22:38:58 UTC (rev 97660)
+++ trunk/LayoutTests/fast/writing-mode/borders.html 2011-10-17 22:53:43 UTC (rev 97661)
@@ -1,29 +0,0 @@
-<style>
-.container {
- border: 5px solid red;
- display: inline-block;
-}
-.box {
- border: 5px solid;
- width: 100px;
- height: 50px;
-}
-</style>
-
-<div>The four boxes below should look identical.</div>
-
-<div class="container">
- <div class="box" style="-webkit-writing-mode: horizontal-tb;"></div>
-</div>
-
-<div class="container">
- <div class="box" style="-webkit-writing-mode: horitzontal-bt;"></div>
-</div>
-
-<div class="container">
- <div class="box" style="-webkit-writing-mode: vertical-lr;"></div>
-</div>
-
-<div class="container">
- <div class="box" style="-webkit-writing-mode: vertical-rl;"></div>
-</div>
Modified: trunk/Source/WebCore/ChangeLog (97660 => 97661)
--- trunk/Source/WebCore/ChangeLog 2011-10-17 22:38:58 UTC (rev 97660)
+++ trunk/Source/WebCore/ChangeLog 2011-10-17 22:53:43 UTC (rev 97661)
@@ -1,3 +1,14 @@
+2011-10-17 Ojan Vafai <[email protected]>
+
+ Unreviewed, rolling out r97653.
+ http://trac.webkit.org/changeset/97653
+ https://bugs.webkit.org/show_bug.cgi?id=69957
+
+ Caused a number of Chromium failures.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
+
2011-10-17 Rafael Weinstein <[email protected]>
[MutationObservers] Implement WebKitMutationObserver.observe for attributes
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (97660 => 97661)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-17 22:38:58 UTC (rev 97660)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-17 22:53:43 UTC (rev 97661)
@@ -5252,27 +5252,14 @@
marginEnd += endMarginLength.value();
margin = marginStart + marginEnd;
- LayoutUnit childMinPreferredLogicalWidth, childMaxPreferredLogicalWidth;
- if (child->isBox() && child->isHorizontalWritingMode() != isHorizontalWritingMode()) {
- RenderBox* childBox = toRenderBox(child);
- LayoutUnit oldHeight = childBox->logicalHeight();
- setLogicalHeight(childBox->borderAndPaddingLogicalHeight());
- childBox->computeLogicalHeight();
- childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = childBox->logicalHeight();
- childBox->setLogicalHeight(oldHeight);
- } else {
- childMinPreferredLogicalWidth = child->minPreferredLogicalWidth();
- childMaxPreferredLogicalWidth = child->maxPreferredLogicalWidth();
- }
-
- LayoutUnit w = childMinPreferredLogicalWidth + margin;
+ LayoutUnit w = child->minPreferredLogicalWidth() + margin;
m_minPreferredLogicalWidth = max(w, m_minPreferredLogicalWidth);
// IE ignores tables for calculation of nowrap. Makes some sense.
if (nowrap && !child->isTable())
m_maxPreferredLogicalWidth = max(w, m_maxPreferredLogicalWidth);
- w = childMaxPreferredLogicalWidth + margin;
+ w = child->maxPreferredLogicalWidth() + margin;
if (!child->isFloating()) {
if (child->isBox() && toRenderBox(child)->avoidsFloats()) {
@@ -5284,7 +5271,7 @@
LayoutUnit marginLogicalRight = ltr ? marginEnd : marginStart;
LayoutUnit maxLeft = marginLogicalLeft > 0 ? max(floatLeftWidth, marginLogicalLeft) : floatLeftWidth + marginLogicalLeft;
LayoutUnit maxRight = marginLogicalRight > 0 ? max(floatRightWidth, marginLogicalRight) : floatRightWidth + marginLogicalRight;
- w = childMaxPreferredLogicalWidth + maxLeft + maxRight;
+ w = child->maxPreferredLogicalWidth() + maxLeft + maxRight;
w = max(w, floatLeftWidth + floatRightWidth);
}
else
@@ -5313,7 +5300,6 @@
// of 100px because of the table.
// We can achieve this effect by making the maxwidth of blocks that contain tables
// with percentage widths be infinite (as long as they are not inside a table cell).
- // FIXME: There is probably a bug here with orthogonal writing modes since we check logicalWidth only using the child's writing mode.
if (containingBlock && document()->inQuirksMode() && child->style()->logicalWidth().isPercent()
&& !isTableCell() && child->isTable() && m_maxPreferredLogicalWidth < BLOCK_MAX_WIDTH) {
RenderBlock* cb = containingBlock;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
