Just cherry-picking the relevant cleanup here, as this wouldn't necessitate a Skia update by any stretch of the imagination.
Bug 1642028 Comment 18 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
Just cherry-picking the relevant cleanup here from https://chromium.googlesource.com/skia/+/5d3314c53ce5c966591f0b02349103f51f986e6e, as this wouldn't necessitate a Skia update by any stretch of the imagination.