Source/core/dom/Document.cpp - Issue 1145993002: Refactor root element background painting

Unified Diff: Source/core/dom/Document.cpp

Issue 1145993002: Refactor root element background painting (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rebase, adding back TestExpectation Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « LayoutTests/platform/win/virtual/slimmingpaint/svg/transforms/animated-path-inside-transformed-html-expected.txt ('k') | Source/core/layout/LayoutBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/Document.cpp

diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp

index c5f50198e16b8ac30f5bd0f4c6d5cf98fcc4b922..196bfaf444cb9d1404e6ed9b29102eea054c635c 100644

--- a/Source/core/dom/Document.cpp

+++ b/Source/core/dom/Document.cpp

@@ -1613,13 +1613,34 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)

rootDirection = bodyStyle->direction();

}

- RefPtr<ComputedStyle> overflowStyle;

+ const ComputedStyle* backgroundStyle = documentElementStyle.get();

+ // http://www.w3.org/TR/css3-background/#body-background

+ // <html> root element with no background steals background from its first <body> child.

+ // Also see LayoutBoxModelObject::backgroundStolenForBeingBody()

+ if (isHTMLHtmlElement(documentElement()) && isHTMLBodyElement(body) && !backgroundStyle->hasBackground())

+ backgroundStyle = bodyStyle.get();

+ Color backgroundColor = backgroundStyle->visitedDependentColor(CSSPropertyBackgroundColor);

+ FillLayer backgroundLayers = backgroundStyle->backgroundLayers();

+ for (auto currentLayer = &backgroundLayers; currentLayer; currentLayer = currentLayer->next()) {

+ // http://www.w3.org/TR/css3-background/#root-background

+ // The root element background always have painting area of the whole canvas.

+ currentLayer->setClip(BorderFillBox);

+ // The root element doesn't scroll. It always propagates its layout overflow

+ // to the viewport. Positioning background against either box is equivalent to

+ // positioning against the scrolled box of the viewport.

+ if (currentLayer->attachment() == ScrollBackgroundAttachment)

+ currentLayer->setAttachment(LocalBackgroundAttachment);

+ }

+ EImageRendering imageRendering = backgroundStyle->imageRendering();

+ const ComputedStyle* overflowStyle = nullptr;

if (Element* element = viewportDefiningElement(documentElementStyle.get())) {

if (element == body) {

- overflowStyle = bodyStyle;

+ overflowStyle = bodyStyle.get();

} else {

ASSERT(element == documentElement());

- overflowStyle = documentElementStyle;

+ overflowStyle = documentElementStyle.get();

}

@@ -1656,6 +1677,9 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)

RefPtr<ComputedStyle> documentStyle = layoutView()->mutableStyle();

if (documentStyle->writingMode() != rootWritingMode

|| documentStyle->direction() != rootDirection

+ || documentStyle->visitedDependentColor(CSSPropertyBackgroundColor) != backgroundColor

+ || documentStyle->backgroundLayers() != backgroundLayers

+ || documentStyle->imageRendering() != imageRendering

|| documentStyle->overflowX() != overflowX

|| documentStyle->overflowY() != overflowY

|| documentStyle->columnGap() != columnGap

@@ -1663,9 +1687,12 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)

RefPtr<ComputedStyle> newStyle = ComputedStyle::clone(*documentStyle);

newStyle->setWritingMode(rootWritingMode);

newStyle->setDirection(rootDirection);

- newStyle->setColumnGap(columnGap);

+ newStyle->setBackgroundColor(backgroundColor);

+ newStyle->accessBackgroundLayers() = backgroundLayers;

+ newStyle->setImageRendering(imageRendering);

newStyle->setOverflowX(overflowX);

newStyle->setOverflowY(overflowY);

+ newStyle->setColumnGap(columnGap);

newStyle->setScrollBlocksOn(scrollBlocksOn);

layoutView()->setStyle(newStyle);

setupFontBuilder(*newStyle);