Created attachment 589176 [details] [diff] [review] patch hg diff created a bit strange output. I moved CanSkip* methods, not the other methods. And I changed the ctors. The patch adds CanSkipThis only to NoteRoot, but it could be added perhaps also elsewhere. But that can be done when needed. This patch was required to skip nsJSEventListeners
Comment on attachment 589176 [details] [diff] [review] patch Looks good. Yeah, HG's default diff does not handle moving chunks of code around very well. There's some way to set it so you can manually use a different diff that will produce better results in these situations, but I don't remember how to do that off hand.