third_party/WebKit/Source/core/css/StylePropertySet.cpp - Issue 2103043004: Fix EditingStyle::mergeStyle()'s handling of custom properties

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

Issue 2103043004: Fix EditingStyle::mergeStyle()'s handling of custom properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: test tweak Created 4 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 side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/editing/execCommand/remove-format-variable-crash.html ('K') | « third_party/WebKit/LayoutTests/editing/execCommand/remove-format-variable-crash.html ('k') | third_party/WebKit/Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/StylePropertySet.cpp

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

index da2011104f05b9186b55b600b5a4bcb4d182da7b..680039f26f1dd69cdc70ab9d14ac52b5cfbf858d 100644

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

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

@@ -290,6 +290,8 @@ bool StylePropertySet::isPropertyImplicit(CSSPropertyID propertyID) const

bool MutableStylePropertySet::setProperty(CSSPropertyID unresolvedProperty, const String& value, bool important, StyleSheetContents* contextStyleSheet)

{

+ DCHECK_GE(unresolvedProperty, firstCSSProperty);

// Setting the value to an empty string just removes the property in both IE and Gecko.

// Setting it to null seems to produce less consistent results, but we treat it just the same.

if (value.isEmpty())