Don't paint the stolen background of the body even when it has display:table-cell.

BUG=622795 Review-Url: https://codereview.chromium.org/2133803003 Cr-Commit-Position: refs/heads/master@{#404529}

Don't paint the stolen background of the body even when it has display:table-cell.
BUG=622795 Review-Url: https://codereview.chromium.org/2133803003 Cr-Commit-Position: refs/heads/master@{#404529}
4d17020d · chrishtr · Commit bot · 6c799c44 · 4d17020d · 4d17020d
Commit 4d17020d authored Jul 08, 2016 by chrishtr Committed by Commit bot Jul 08, 2016
3 changed files
--- a/third_party/WebKit/LayoutTests/paint/background/body-background-when-table-cell-expected.html
+++ b/third_party/WebKit/LayoutTests/paint/background/body-background-when-table-cell-expected.html
+<!DOCTYPE html>
+<style>
+    html { background: url(../invalidation/resources/bluesquare.png) } 
+</style>
--- a/third_party/WebKit/LayoutTests/paint/background/body-background-when-table-cell.html
+++ b/third_party/WebKit/LayoutTests/paint/background/body-background-when-table-cell.html
+<!DOCTYPE html>
+<!-- The document shoudl be entirely blue. The red background on the 20x20-sized body should not appear. -->
+<style>
+    body { display:table-cell; vertical-align:middle; background:red url(../invalidation/resources/bluesquare.png) } 
+</style>
+<body style="width: 20px; height: 20px"></body>
--- a/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/TableCellPainter.cpp
@@ -151,6 +151,9 @@ void TableCellPainter::paintContainerBackgroundBehindCell(const PaintInfo& paint

 void TableCellPainter::paintBackground(const PaintInfo& paintInfo, const LayoutRect& paintRect, const LayoutObject& backgroundObject)
 {
+    if (m_layoutTableCell.backgroundStolenForBeingBody())
+        return;
+
    Color c = backgroundObject.resolveColor(CSSPropertyBackgroundColor);
    const FillLayer& bgLayer = backgroundObject.styleRef().backgroundLayers();
    if (bgLayer.hasImage() || c.alpha()) {