WebCore: https://bugs.webkit.org/show_bug.cgi?id=46835, patch a few more height/logic...