If these are the only 2 troublesome things, then maybe during the rename we can just edit third_party/WebKit/Source/core/css/CSSProperties.json5 so that it explicitly names the getters - for an example see: https://codereview.chromium.org/2329463004/patch/590001/600071

Changing the json5 file the intuitive way didn't produce the results expected. Additionally, the generator produces m_fooBar named member variables, which we also need to update.

RE: #c2

Do changes to third_party/WebKit/Source/build/scripts/make_computed_style_base.py from https://codereview.chromium.org/2329463004/patch/590001/600039 still apply cleanly?  There was one place that needed to be tweaked to pick-up the getter override from json5:

-    getter_method_name = property_name_lower
+    getter_method_name = property_['getter']

(AFAIR property_['getter'] would contain the right thing in absence of an explicit getter override in json5).

BTW: If the one-line change above helps, then we can probably pre-land it.   

I think this area of the code got refactored in the meantime, but I haven't had a chance to see if we can do something there to fix it. https://codereview.chromium.org/2762573005

We worked around this enough to make things work :)