Title: [111970] releases/WebKitGTK/webkit-1.8
- Revision
- 111970
- Author
- [email protected]
- Date
- 2012-03-23 19:22:05 -0700 (Fri, 23 Mar 2012)
Log Message
Merging r111882
Modified Paths
Added Paths
Removed Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (111969 => 111970)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-03-24 02:20:42 UTC (rev 111969)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-03-24 02:22:05 UTC (rev 111970)
@@ -1,3 +1,23 @@
+2012-03-23 Julien Chaffraix <[email protected]>
+
+ REGRESSION(107971): Google Voice contact list is broken in WebKit due to badly allocating the extra height
+ https://bugs.webkit.org/show_bug.cgi?id=81826
+
+ Reviewed by Tony Chang.
+
+ * fast/table/double-height-table-no-tbody.html-disabled: Renamed from LayoutTests/fast/table/double-height-table-no-tbody.html.
+ Disabled this test as it relies on our algorithm not to discriminate between first sections.
+
+ * platform/chromium/test_expectations.txt:
+ * platform/qt/Skipped:
+ Mark those 2 tests as needing a new baseline again.
+
+ * platform/efl/test_expectations.txt:
+ * platform/gtk/Skipped:
+ * platform/mac/test_expectations.txt:
+ * platform/win/Skipped:
+ Those platforms did not rebaseline those 2 tests so they should automatically pass them.
+
2012-03-23 Adam Barth <[email protected]>
Remove support for "magic" iframe
Deleted: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/table/double-height-table-no-tbody.html (111969 => 111970)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/table/double-height-table-no-tbody.html 2012-03-24 02:20:42 UTC (rev 111969)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/table/double-height-table-no-tbody.html 2012-03-24 02:22:05 UTC (rev 111970)
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
- body { font-size: 13px; font-family: serif; }
- table { border: 1px solid red; border-spacing: 0px; padding: 0px; }
- th { border: 1px solid red; width: 125px; }
- .height20px { height: 20px; }
- .height19px { height: 19px; }
- .smallerFont { font-size: 10px; }
-</style>
-</head>
-<body>
-<p>Bug <a href="" thead in table without tbody causes table height doubling</p>
-<p>There should not be any gap between the tables' border and the rows'.</p>
-<h1>height = 20px</h1>
-<table class="height20px">
-<thead>
-<tr>
- <th>A</th>
- <th>B</th>
- <th>C</th>
- <th>D</th>
-</tr>
-</thead>
-</table>
-<br>
-<table class="height20px">
-<tfoot>
-<tr>
- <th>A</th>
- <th>B</th>
- <th>C</th>
- <th>D</th>
-</tr>
-</tfoot>
-</table>
-
-<h1>height = 19px, font-size = 10px</h1>
-<table class="height19px smallerFont">
-<thead>
-<tr>
- <th>A</th>
- <th>B</th>
- <th>C</th>
- <th>D</th>
-</tr>
-</thead>
-</table>
-<br>
-<table class="height19px smallerFont">
-<tfoot>
-<tr>
- <th>A</th>
- <th>B</th>
- <th>C</th>
- <th>D</th>
-</tr>
-</tfoot>
-</table>
-
-</body>
-</html>
Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/table/double-height-table-no-tbody.html-disabled (0 => 111970)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/table/double-height-table-no-tbody.html-disabled (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/table/double-height-table-no-tbody.html-disabled 2012-03-24 02:22:05 UTC (rev 111970)
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ body { font-size: 13px; font-family: serif; }
+ table { border: 1px solid red; border-spacing: 0px; padding: 0px; }
+ th { border: 1px solid red; width: 125px; }
+ .height20px { height: 20px; }
+ .height19px { height: 19px; }
+ .smallerFont { font-size: 10px; }
+</style>
+</head>
+<body>
+<p>Bug <a href="" thead in table without tbody causes table height doubling</p>
+<p>There should not be any gap between the tables' border and the rows'.</p>
+<h1>height = 20px</h1>
+<table class="height20px">
+<thead>
+<tr>
+ <th>A</th>
+ <th>B</th>
+ <th>C</th>
+ <th>D</th>
+</tr>
+</thead>
+</table>
+<br>
+<table class="height20px">
+<tfoot>
+<tr>
+ <th>A</th>
+ <th>B</th>
+ <th>C</th>
+ <th>D</th>
+</tr>
+</tfoot>
+</table>
+
+<h1>height = 19px, font-size = 10px</h1>
+<table class="height19px smallerFont">
+<thead>
+<tr>
+ <th>A</th>
+ <th>B</th>
+ <th>C</th>
+ <th>D</th>
+</tr>
+</thead>
+</table>
+<br>
+<table class="height19px smallerFont">
+<tfoot>
+<tr>
+ <th>A</th>
+ <th>B</th>
+ <th>C</th>
+ <th>D</th>
+</tr>
+</tfoot>
+</table>
+
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (111969 => 111970)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-24 02:20:42 UTC (rev 111969)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-03-24 02:22:05 UTC (rev 111970)
@@ -1,3 +1,23 @@
+2012-03-23 Julien Chaffraix <[email protected]>
+
+ REGRESSION(107971): Google Voice contact list is broken in WebKit due to badly allocating the extra height
+ https://bugs.webkit.org/show_bug.cgi?id=81826
+
+ Reviewed by Tony Chang.
+
+ Covered by tables/mozilla/bugs/bug27038-{1|2}.html.
+
+ This partly reverts r107971: the extra logical height distribution change was not needed
+ to fix the bug (it is needed by the test though). We revert to giving all the extra height
+ to the first tbody and not the first section.
+
+ This is broken but unfortunately some websites are relying on that. Getting a real
+ distribution algorithm is covered by bug 81824. However this is super tricky to get
+ right and I did not want to add more compatibility risks until I have something solid.
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::distributeExtraLogicalHeight):
+
2012-03-23 Konrad Piascik <[email protected]>
(r110063) m_mouseDownMayStartDrag is used without being behind the ENABLE(DRAG_SUPPORT) macro
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTable.cpp (111969 => 111970)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTable.cpp 2012-03-24 02:20:42 UTC (rev 111969)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTable.cpp 2012-03-24 02:22:05 UTC (rev 111970)
@@ -391,10 +391,10 @@
for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
if (child->isTableSection())
// FIXME: Distribute the extra logical height between all table sections instead of giving it all to the first one.
- toRenderTableSection(child)->layoutRows(child == topSection() ? max<LayoutUnit>(0, computedLogicalHeight - totalSectionLogicalHeight) : 0);
+ toRenderTableSection(child)->layoutRows(child == m_firstBody ? max<LayoutUnit>(0, computedLogicalHeight - totalSectionLogicalHeight) : 0);
}
- if (!topSection() && computedLogicalHeight > totalSectionLogicalHeight && !document()->inQuirksMode()) {
+ if (!m_firstBody && computedLogicalHeight > totalSectionLogicalHeight && !document()->inQuirksMode()) {
// Completely empty tables (with no sections or anything) should at least honor specified height
// in strict mode.
setLogicalHeight(logicalHeight() + computedLogicalHeight);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
