Source/core/rendering/RenderTableCell.cpp - Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderTableCell.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

« Source/core/css/resolver/FilterOperationResolver.cpp ('K') | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderTheme.h » ('j') | Source/core/rendering/RenderTheme.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderTableCell.cpp

diff --git a/Source/core/rendering/RenderTableCell.cpp b/Source/core/rendering/RenderTableCell.cpp

index 048e66af9124334398ed777250bdc533bbb54122..1d759148eb0f06cb55aab88ddb884d8c716b20e7 100644

--- a/Source/core/rendering/RenderTableCell.cpp

+++ b/Source/core/rendering/RenderTableCell.cpp

@@ -1170,7 +1170,7 @@ void RenderTableCell::paintBackgroundsBehindCell(PaintInfo& paintInfo, const Lay

if (backgroundObject != this)

adjustedPaintOffset.moveBy(location());

- StyleColor c = backgroundObject->resolveStyleColor(CSSPropertyBackgroundColor);

+ Color c = backgroundObject->resolveColor(CSSPropertyBackgroundColor);

const FillLayer* bgLayer = backgroundObject->style()->backgroundLayers();

if (bgLayer->hasImage() || c.isValid()) {

@@ -1183,7 +1183,7 @@ void RenderTableCell::paintBackgroundsBehindCell(PaintInfo& paintInfo, const Lay

width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());

paintInfo.context->clip(clipRect);

}

- paintFillLayers(paintInfo, c.color(), bgLayer, LayoutRect(adjustedPaintOffset, pixelSnappedSize()), BackgroundBleedNone, CompositeSourceOver, backgroundObject);

+ paintFillLayers(paintInfo, c, bgLayer, LayoutRect(adjustedPaintOffset, pixelSnappedSize()), BackgroundBleedNone, CompositeSourceOver, backgroundObject);

}