third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp - Issue 2225033003: Separate backgroundObscurationStatus and hasBoxDecorationBackground

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: third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

Issue 2225033003: Separate backgroundObscurationStatus and hasBoxDecorationBackground (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: - Created 4 years, 4 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 | « third_party/WebKit/Source/core/paint/TableSectionPainter.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

diff --git a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

index 8fc7a58df884f63646d1f1a3db3eafd9a3a498a7..952f28a9d4e6aa49792821fe584484f30bf219a9 100644

--- a/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

+++ b/third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

@@ -177,7 +177,7 @@ bool ThemePainterDefault::paintButton(const LayoutObject& o, const PaintInfo& i,

WebCanvas* canvas = i.context.canvas();

extraParams.button.hasBorder = true;

extraParams.button.backgroundColor = useMockTheme() ? 0xffc0c0c0 : defaultButtonBackgroundColor;

- if (o.hasBackground())

+ if (o.styleRef().hasBackground())

extraParams.button.backgroundColor = o.resolveColor(CSSPropertyBackgroundColor).rgb();

Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartButton, getWebThemeState(o), WebRect(rect), &extraParams);

@@ -218,7 +218,7 @@ bool ThemePainterDefault::paintMenuList(const LayoutObject& o, const PaintInfo&

extraParams.menuList.hasBorderRadius = o.styleRef().hasBorderRadius();

// Fallback to transparent if the specified color object is invalid.

Color backgroundColor(Color::transparent);

- if (o.hasBackground())

+ if (o.styleRef().hasBackground())

backgroundColor = o.resolveColor(CSSPropertyBackgroundColor);

extraParams.menuList.backgroundColor = backgroundColor.rgb();