commit ed9e60bc6238f29c78a85229e57a07256c4f66e4
author Timothy Loh <timloh@chromium.org> Fri Aug 12 04:33:40 2016
committer Timothy Loh <timloh@chromium.org> Fri Aug 12 04:38:24 2016
tree d7463c6cab013c8dc0dabeadcfac16646298a231
parent 8b9ea832e62cbe3c5e3bcad2b8d1d9281462f30a

Fix EditingStyle::mergeStyle()'s handling of custom properties

This patch fixes the logic of EditingStyle::mergeStyle() to correctly
handle custom properties. Currently it serializes the CSSValue and then
reparses it, which, aside from being inefficient, doesn't work for
custom properties as the custom property name is lost (since we only
have the enum value CSSPropertyVariable).

BUG=622420

Review-Url: https://codereview.chromium.org/2103043004
Cr-Commit-Position: refs/heads/master@{#410614}
(cherry picked from commit aadb63893e4c1358d1e5139aa29552eb190682c8)

Review URL: https://codereview.chromium.org/2245573002 .

Cr-Commit-Position: refs/branch-heads/2785@{#574}
Cr-Branched-From: 68623971be0cfc492a2cb0427d7f478e7b214c24-refs/heads/master@{#403382}