Chromium Code Reviews

Unified Diff: Source/core/paint/BoxDecorationData.cpp

Issue 1159773005: Handle border-image with fill and zero-width borders (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address review comment Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « Source/core/paint/BoxDecorationData.h ('k') | Source/core/paint/BoxPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/BoxDecorationData.cpp
diff --git a/Source/core/paint/BoxDecorationData.cpp b/Source/core/paint/BoxDecorationData.cpp
index 0e7f93ac2bfd0c119776091ee20662eb5633011d..9acda2062b8c4e7f50304e8ccdc2c62edc3660f9 100644
--- a/Source/core/paint/BoxDecorationData.cpp
+++ b/Source/core/paint/BoxDecorationData.cpp
@@ -18,7 +18,7 @@ BoxDecorationData::BoxDecorationData(const LayoutBox& layoutBox)
backgroundColor = layoutBox.style()->visitedDependentColor(CSSPropertyBackgroundColor);
hasBackground = backgroundColor.alpha() || layoutBox.style()->hasBackgroundImage();
ASSERT(hasBackground == layoutBox.style()->hasBackground());
- hasBorder = layoutBox.style()->hasBorder();
+ hasBorderDecoration = layoutBox.style()->hasBorderDecoration();
hasAppearance = layoutBox.style()->hasAppearance();
bleedAvoidance = determineBackgroundBleedAvoidance(layoutBox);
}
@@ -48,7 +48,7 @@ BackgroundBleedAvoidance BoxDecorationData::determineBackgroundBleedAvoidance(co
if (!hasBackground)
return BackgroundBleedNone;
- if (!hasBorder || !layoutBox.style()->hasBorderRadius() || layoutBox.canRenderBorderImage()) {
+ if (!hasBorderDecoration || !layoutBox.style()->hasBorderRadius() || layoutBox.canRenderBorderImage()) {
if (layoutBox.backgroundShouldAlwaysBeClipped())
return BackgroundBleedClipOnly;
return BackgroundBleedNone;
« no previous file with comments | « Source/core/paint/BoxDecorationData.h ('k') | Source/core/paint/BoxPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine