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

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 59888ae33e06a2262190d48a6d4941a4fed62967..92b68d3b092b38ed61ae1d3603b83724627365c4 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -1188,7 +1188,7 @@ LayoutRect RenderBox::backgroundPaintedExtent() const
ASSERT(hasBackground());
LayoutRect backgroundRect = pixelSnappedIntRect(borderBoxRect());
- StyleColor backgroundColor = resolveStyleColor(CSSPropertyBackgroundColor);
+ Color backgroundColor = resolveColor(CSSPropertyBackgroundColor);
if (backgroundColor.isValid() && backgroundColor.alpha())
return backgroundRect;
if (!style()->backgroundLayers()->image() || style()->backgroundLayers()->next())
@@ -1203,7 +1203,7 @@ bool RenderBox::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) c
if (isBody() && skipBodyBackground(this))
return false;
- StyleColor backgroundColor = resolveStyleColor(CSSPropertyBackgroundColor);
+ Color backgroundColor = resolveColor(CSSPropertyBackgroundColor);
if (!backgroundColor.isValid() || backgroundColor.hasAlpha())
return false;
@@ -1321,7 +1321,7 @@ bool RenderBox::backgroundHasOpaqueTopLayer() const
// If there is only one layer and no image, check whether the background color is opaque
if (!fillLayer->next() && !fillLayer->hasImage()) {
- StyleColor bgColor = resolveStyleColor(CSSPropertyBackgroundColor);
+ Color bgColor = resolveColor(CSSPropertyBackgroundColor);
if (bgColor.isValid() && bgColor.alpha() == 255)
return true;
}

Powered by Google App Engine
This is Rietveld 408576698