third_party/WebKit/Source/core/style/BorderData.h - Issue 1457323004: Don't render border images when border-style is none

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/style/BorderData.h

Issue 1457323004: Don't render border images when border-style is none (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased, removed unnecessary border colors, etc. Created 5 years, 1 month 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/LayoutTests/svg/as-border-image/svg-as-border-image-2.html ('k') | third_party/WebKit/Source/core/style/BorderValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/style/BorderData.h

diff --git a/third_party/WebKit/Source/core/style/BorderData.h b/third_party/WebKit/Source/core/style/BorderData.h

index 2e1dc4a1ed94c27dea0b11f3f0ca08b87da61a9c..72bbb57701cee8c503a2c4f393debdc98840ebda 100644

--- a/third_party/WebKit/Source/core/style/BorderData.h

+++ b/third_party/WebKit/Source/core/style/BorderData.h

@@ -46,8 +46,7 @@ public:

bool hasBorder() const

{

- bool haveImage = m_image.hasImage();

- return m_left.nonZero(!haveImage) || m_right.nonZero(!haveImage) || m_top.nonZero(!haveImage) || m_bottom.nonZero(!haveImage);

+ return m_left.nonZero() || m_right.nonZero() || m_top.nonZero() || m_bottom.nonZero();

}

bool hasBorderFill() const

@@ -70,28 +69,28 @@ public:

int borderLeftWidth() const

{

- if (!m_image.hasImage() && (m_left.style() == BNONE || m_left.style() == BHIDDEN))

+ if (m_left.style() == BNONE || m_left.style() == BHIDDEN)

return 0;

return m_left.width();

}

int borderRightWidth() const

{

- if (!m_image.hasImage() && (m_right.style() == BNONE || m_right.style() == BHIDDEN))

+ if (m_right.style() == BNONE || m_right.style() == BHIDDEN)

return 0;

return m_right.width();

}

int borderTopWidth() const

{

- if (!m_image.hasImage() && (m_top.style() == BNONE || m_top.style() == BHIDDEN))

+ if (m_top.style() == BNONE || m_top.style() == BHIDDEN)

return 0;

return m_top.width();

}

int borderBottomWidth() const

{

- if (!m_image.hasImage() && (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN))

+ if (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN)

return 0;

return m_bottom.width();

}