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

Side by Side 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, 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 unified diff | Download patch
« no previous file with comments | « Source/core/paint/BoxDecorationData.h ('k') | Source/core/paint/BoxPainter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/BoxDecorationData.h" 6 #include "core/paint/BoxDecorationData.h"
7 7
8 #include "core/layout/LayoutBox.h" 8 #include "core/layout/LayoutBox.h"
9 #include "core/style/BorderEdge.h" 9 #include "core/style/BorderEdge.h"
10 #include "core/style/ComputedStyle.h" 10 #include "core/style/ComputedStyle.h"
11 #include "platform/RuntimeEnabledFeatures.h" 11 #include "platform/RuntimeEnabledFeatures.h"
12 #include "platform/graphics/GraphicsContext.h" 12 #include "platform/graphics/GraphicsContext.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 BoxDecorationData::BoxDecorationData(const LayoutBox& layoutBox) 16 BoxDecorationData::BoxDecorationData(const LayoutBox& layoutBox)
17 { 17 {
18 backgroundColor = layoutBox.style()->visitedDependentColor(CSSPropertyBackgr oundColor); 18 backgroundColor = layoutBox.style()->visitedDependentColor(CSSPropertyBackgr oundColor);
19 hasBackground = backgroundColor.alpha() || layoutBox.style()->hasBackgroundI mage(); 19 hasBackground = backgroundColor.alpha() || layoutBox.style()->hasBackgroundI mage();
20 ASSERT(hasBackground == layoutBox.style()->hasBackground()); 20 ASSERT(hasBackground == layoutBox.style()->hasBackground());
21 hasBorder = layoutBox.style()->hasBorder(); 21 hasBorderDecoration = layoutBox.style()->hasBorderDecoration();
22 hasAppearance = layoutBox.style()->hasAppearance(); 22 hasAppearance = layoutBox.style()->hasAppearance();
23 bleedAvoidance = determineBackgroundBleedAvoidance(layoutBox); 23 bleedAvoidance = determineBackgroundBleedAvoidance(layoutBox);
24 } 24 }
25 25
26 namespace { 26 namespace {
27 27
28 bool borderObscuresBackgroundEdge(const ComputedStyle& style) 28 bool borderObscuresBackgroundEdge(const ComputedStyle& style)
29 { 29 {
30 BorderEdge edges[4]; 30 BorderEdge edges[4];
31 style.getBorderEdgeInfo(edges); 31 style.getBorderEdgeInfo(edges);
32 32
33 for (auto& edge : edges) { 33 for (auto& edge : edges) {
34 if (!edge.obscuresBackgroundEdge()) 34 if (!edge.obscuresBackgroundEdge())
35 return false; 35 return false;
36 } 36 }
37 37
38 return true; 38 return true;
39 } 39 }
40 40
41 } // anonymous namespace 41 } // anonymous namespace
42 42
43 BackgroundBleedAvoidance BoxDecorationData::determineBackgroundBleedAvoidance(co nst LayoutBox& layoutBox) 43 BackgroundBleedAvoidance BoxDecorationData::determineBackgroundBleedAvoidance(co nst LayoutBox& layoutBox)
44 { 44 {
45 if (layoutBox.isDocumentElement()) 45 if (layoutBox.isDocumentElement())
46 return BackgroundBleedNone; 46 return BackgroundBleedNone;
47 47
48 if (!hasBackground) 48 if (!hasBackground)
49 return BackgroundBleedNone; 49 return BackgroundBleedNone;
50 50
51 if (!hasBorder || !layoutBox.style()->hasBorderRadius() || layoutBox.canRend erBorderImage()) { 51 if (!hasBorderDecoration || !layoutBox.style()->hasBorderRadius() || layoutB ox.canRenderBorderImage()) {
52 if (layoutBox.backgroundShouldAlwaysBeClipped()) 52 if (layoutBox.backgroundShouldAlwaysBeClipped())
53 return BackgroundBleedClipOnly; 53 return BackgroundBleedClipOnly;
54 return BackgroundBleedNone; 54 return BackgroundBleedNone;
55 } 55 }
56 56
57 if (borderObscuresBackgroundEdge(*layoutBox.style())) 57 if (borderObscuresBackgroundEdge(*layoutBox.style()))
58 return BackgroundBleedShrinkBackground; 58 return BackgroundBleedShrinkBackground;
59 59
60 if (!hasAppearance && layoutBox.style()->borderObscuresBackground() && layou tBox.backgroundHasOpaqueTopLayer()) 60 if (!hasAppearance && layoutBox.style()->borderObscuresBackground() && layou tBox.backgroundHasOpaqueTopLayer())
61 return BackgroundBleedBackgroundOverBorder; 61 return BackgroundBleedBackgroundOverBorder;
62 62
63 return BackgroundBleedClipLayer; 63 return BackgroundBleedClipLayer;
64 } 64 }
65 65
66 } // namespace blink 66 } // namespace blink
OLDNEW
« 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
This is Rietveld 408576698