Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(914)

Unified Diff: Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.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
Download patch
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/paint/BoxPainter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp
diff --git a/Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp b/Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp
index 44fafb8bfeaa6d0bd913355f295ce68f3aae8b88..f05e08401a628af7a4fc02468b5034cf3d761555 100644
--- a/Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp
+++ b/Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp
@@ -1738,11 +1738,7 @@ float CompositedDeprecatedPaintLayerMapping::compositingOpacity(float layoutObje
Color CompositedDeprecatedPaintLayerMapping::layoutObjectBackgroundColor() const
{
- LayoutObject* backgroundLayoutObject = layoutObject();
- if (backgroundLayoutObject->isDocumentElement())
- backgroundLayoutObject = backgroundLayoutObject->layoutObjectForRootBackground();
-
- return backgroundLayoutObject->resolveColor(CSSPropertyBackgroundColor);
+ return layoutObject()->resolveColor(CSSPropertyBackgroundColor);
}
void CompositedDeprecatedPaintLayerMapping::updateBackgroundColor()
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/paint/BoxPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698