third_party/WebKit/Source/core/editing/EditingStyle.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/editing/EditingStyle.cpp

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

Patch Set: gtest instead of layout test Created 4 years, 4 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

« no previous file with comments | « third_party/WebKit/Source/core/editing/EditingStyle.h ('k') | third_party/WebKit/Source/core/editing/EditingStyleTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/EditingStyle.cpp

diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.cpp b/third_party/WebKit/Source/core/editing/EditingStyle.cpp

index 163cbfb17e46d3197edc3447aae00c755f919209..edca53680c2b26d723d228b46bfce27ca1c95ffe 100644

--- a/third_party/WebKit/Source/core/editing/EditingStyle.cpp

+++ b/third_party/WebKit/Source/core/editing/EditingStyle.cpp

@@ -1180,7 +1180,7 @@ void EditingStyle::mergeStyle(const StylePropertySet* style, CSSPropertyOverride

}

if (mode == OverrideValues || (mode == DoNotOverrideValues && !value))

- m_mutableStyle->setProperty(property.id(), property.value().cssText(), property.isImportant());

+ m_mutableStyle->setProperty(property.toCSSProperty());

}