Source/core/css/StylePropertySet.cpp - Issue 1036653002: Clamp shape-margin to zero

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/css/StylePropertySet.cpp

Issue 1036653002: Clamp shape-margin to zero (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add contentWidthExcludingScrollbar Created 5 years, 8 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:

Index: Source/core/css/StylePropertySet.cpp

diff --git a/Source/core/css/StylePropertySet.cpp b/Source/core/css/StylePropertySet.cpp

index e5c546159c2e13d1ff44bdb87690f14d8c6b1d00..fdcdc7845d0a835b54420549f8b0c5aaf83d13af 100644

--- a/Source/core/css/StylePropertySet.cpp

+++ b/Source/core/css/StylePropertySet.cpp

@@ -357,7 +357,7 @@ void MutableStylePropertySet::addParsedProperties(const WillBeHeapVector<CSSProp

void MutableStylePropertySet::addParsedProperty(const CSSProperty& property)

{

// Only add properties that have no !important counterpart present

- if (!propertyIsImportant(property.id()) || property.isImportant())

+ if (!propertyIsImportant(property.id()) || property.isImportant() || forceOverride())

setProperty(property);

}