Title: [201300] trunk
- Revision
- 201300
- Author
- [email protected]
- Date
- 2016-05-23 15:37:52 -0700 (Mon, 23 May 2016)
Log Message
Unreviewed, rolling out r201296.
https://bugs.webkit.org/show_bug.cgi?id=158002
The LayoutTest added with this change is failing on mac-wk1
(Requested by ryanhaddad on #webkit).
Reverted changeset:
"Changing border color and size simultaneously fails to
repaint."
https://bugs.webkit.org/show_bug.cgi?id=157967
http://trac.webkit.org/changeset/201296
Patch by Commit Queue <[email protected]> on 2016-05-23
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (201299 => 201300)
--- trunk/LayoutTests/ChangeLog 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/LayoutTests/ChangeLog 2016-05-23 22:37:52 UTC (rev 201300)
@@ -1,3 +1,18 @@
+2016-05-23 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r201296.
+ https://bugs.webkit.org/show_bug.cgi?id=158002
+
+ The LayoutTest added with this change is failing on mac-wk1
+ (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Changing border color and size simultaneously fails to
+ repaint."
+ https://bugs.webkit.org/show_bug.cgi?id=157967
+ http://trac.webkit.org/changeset/201296
+
2016-05-23 Ryan Haddad <[email protected]>
Marking inspector/unit-tests/heap-snapshot-collection-event.html as a flaky timeout.
Deleted: trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes-expected.html (201299 => 201300)
--- trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes-expected.html 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes-expected.html 2016-05-23 22:37:52 UTC (rev 201300)
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that we relayout neighboring cells when collapsed border changes.</title>
-<style>
-#topCell {
- border-left-width: 150px;
- border-left-style: solid;
- border-left-color: blue;
-}
-</style>
-</head>
-<body>
-PASS if the blue border does not cover the paddin/content box of 'foo'.
-<table style="border-collapse: collapse;">
-<tr><td>foo</td><td id="topCell">bar</td></tr></table>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html (201299 => 201300)
--- trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/LayoutTests/fast/table/neighboring-cells-when-collapsed-border-changes.html 2016-05-23 22:37:52 UTC (rev 201300)
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that we relayout neighboring cells when collapsed border changes.</title>
-<style>
-#topCell {
- border-left-width: 100px;
- border-left-style: solid;
- border-left-color: blue;
-}
-</style>
-</head>
-<body>
-PASS if the blue border does not cover the paddin/content box of 'foo'.
-<table style="border-collapse: collapse;">
-<tr><td>foo</td><td id="topCell">bar</td></tr></table>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-setTimeout(function() {
- document.getElementById('topCell').style.borderLeftWidth = "150px";
- if (window.testRunner)
- testRunner.notifyDone();
-}, 10);
-</script>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (201299 => 201300)
--- trunk/Source/WebCore/ChangeLog 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/Source/WebCore/ChangeLog 2016-05-23 22:37:52 UTC (rev 201300)
@@ -1,3 +1,18 @@
+2016-05-23 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r201296.
+ https://bugs.webkit.org/show_bug.cgi?id=158002
+
+ The LayoutTest added with this change is failing on mac-wk1
+ (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Changing border color and size simultaneously fails to
+ repaint."
+ https://bugs.webkit.org/show_bug.cgi?id=157967
+ http://trac.webkit.org/changeset/201296
+
2016-05-23 Dean Jackson <[email protected]>
Missing/Incomplete timestamp for inline Audio player in ePub book
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (201299 => 201300)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-23 22:07:25 UTC (rev 201299)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-05-23 22:37:52 UTC (rev 201300)
@@ -594,14 +594,6 @@
clearNeedsLayout();
}
-static inline void markCellDirtyWhenCollapsedBorderChanges(RenderTableCell* cell)
-{
- if (!cell)
- return;
- cell->invalidateHasEmptyCollapsedBorders();
- cell->setNeedsLayoutAndPrefWidthsRecalc();
-}
-
void RenderTable::invalidateCollapsedBorders(RenderTableCell* cellWithStyleChange)
{
m_collapsedBordersValid = false;
@@ -616,10 +608,14 @@
if (cellWithStyleChange) {
// It is enough to invalidate just the surrounding cells when cell border style changes.
cellWithStyleChange->invalidateHasEmptyCollapsedBorders();
- markCellDirtyWhenCollapsedBorderChanges(cellBelow(cellWithStyleChange));
- markCellDirtyWhenCollapsedBorderChanges(cellAbove(cellWithStyleChange));
- markCellDirtyWhenCollapsedBorderChanges(cellBefore(cellWithStyleChange));
- markCellDirtyWhenCollapsedBorderChanges(cellAfter(cellWithStyleChange));
+ if (auto* below = cellBelow(cellWithStyleChange))
+ below->invalidateHasEmptyCollapsedBorders();
+ if (auto* above = cellAbove(cellWithStyleChange))
+ above->invalidateHasEmptyCollapsedBorders();
+ if (auto* before = cellBefore(cellWithStyleChange))
+ before->invalidateHasEmptyCollapsedBorders();
+ if (auto* after = cellAfter(cellWithStyleChange))
+ after->invalidateHasEmptyCollapsedBorders();
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
