132893 2014-05-13 17:23:01 -0700 REGRESSION(WK2): Many pages have very wrong text size after rotating 2014-05-14 11:03:38 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica oldest_to_newest 1009148 0 enrica 2014-05-13 17:23:01 -0700 Text autosizing seems to break most pages on rotation. <rdar://problem/16806958> 1009149 1 231423 enrica 2014-05-13 17:27:32 -0700 Created attachment 231423 Patch 1009150 2 231423 benjamin 2014-05-13 17:30:40 -0700 Comment on attachment 231423 Patch lgtm 1009190 3 231423 darin 2014-05-13 22:43:13 -0700 Comment on attachment 231423 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231423&action=review Sure would be nice to have some kind of bottleneck function rather than having a width check in three different places. > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:1910 > + for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext(&m_page->mainFrame())) { This should just call traverseNext() with no arguments. There’s no reason to pass the main frame explicitly since there are no additional frames outside the main frame. 1009298 4 enrica 2014-05-14 10:58:44 -0700 Thanks for the feedback. I've removed the parameter to traverseNext and changed resetTextAutosizingBeforeLayout to resetTextAutosizingBeforeLayoutIfNeeded which takes p;d and new size. This way the width check is inside the new method. 1009300 5 enrica 2014-05-14 11:03:38 -0700 Committed revision 168848. 231423 2014-05-13 17:27:32 -0700 2014-05-13 22:43:13 -0700 Patch textautosize.txt text/plain 3905 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODc2MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA1LTEzICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihXSzIpOiBN YW55IHBhZ2VzIGhhdmUgdmVyeSB3cm9uZyB0ZXh0IHNpemUgYWZ0ZXIgcm90YXRpbmcuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI4OTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE2ODA2OTU4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoZW5ldmVyIG91ciB2aWV3cG9ydCB3aWR0aCBjaGFuZ2Vz IHdlIG11c3QgcmVzZXQgdGV4dCBhdXRvc2l6aW5nCisgICAgICAgIG9uIHRoZSByZW5kZXJlci4K KworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OnNldE1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVzZXRUZXh0QXV0b3NpemluZ0JlZm9yZUxheW91dCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUpOgor CiAyMDE0LTA1LTEzICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OICh0b3BDb250ZW50SW5zZXQpOiBTZWFyY2hpbmcgdGhyb3VnaCBGYWNlYm9vayBN ZXNzZW5nZXIncyBjaGF0IGNhdXNlcyAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMTY4NzQzKQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtODI3LDYgKzgy Nyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBoYW5kbGVTeW50aGV0aWNDbGljayhXZWJDb3JlOjpO b2RlKiBub2RlUmVzcG9uZGluZ1RvQ2xpY2ssIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGxv Y2F0aW9uKTsKICAgICB2b2lkIGNvbXBsZXRlU3ludGhldGljQ2xpY2soV2ViQ29yZTo6Tm9kZSog bm9kZVJlc3BvbmRpbmdUb0NsaWNrLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBsb2NhdGlv bik7CiAgICAgdm9pZCBzZW5kVGFwSGlnaGxpZ2h0Rm9yTm9kZUlmTmVjZXNzYXJ5KHVpbnQ2NF90 IHJlcXVlc3RJRCwgV2ViQ29yZTo6Tm9kZSopOworICAgIHZvaWQgcmVzZXRUZXh0QXV0b3Npemlu Z0JlZm9yZUxheW91dCgpOwogI2VuZGlmCiAjaWYgIVBMQVRGT1JNKENPQ09BKQogICAgIHN0YXRp YyBjb25zdCBjaGFyKiBpbnRlcnByZXRLZXlFdmVudChjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2 ZW50Kik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tCShyZXZpc2lvbiAxNjg3NDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTE4 ODYsMTIgKzE4ODYsMTYgQEAgdm9pZCBXZWJQYWdlOjplbGVtZW50RGlkQmx1cihXZWJDb3JlOjpO bwogCiB2b2lkIFdlYlBhZ2U6OnNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRT aXplKGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSkKIHsKKyAgICBpZiAoc2l6ZS53aWR0aCgpICE9IG1f dmlld3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1MYXlvdXRTaXplKCkud2lkdGgoKSkKKyAgICAg ICAgcmVzZXRUZXh0QXV0b3NpemluZ0JlZm9yZUxheW91dCgpOwogICAgIG1fdmlld3BvcnRDb25m aWd1cmF0aW9uLnNldE1pbmltdW1MYXlvdXRTaXplKHNpemUpOwogICAgIHZpZXdwb3J0Q29uZmln dXJhdGlvbkNoYW5nZWQoKTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzZXRNaW5pbXVtTGF5b3V0U2l6 ZUZvck1pbmltYWxVSShjb25zdCBGbG9hdFNpemUmIHNpemUpCiB7CisgICAgaWYgKHNpemUud2lk dGgoKSAhPSBtX21pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJLndpZHRoKCkpCisgICAgICAg IHJlc2V0VGV4dEF1dG9zaXppbmdCZWZvcmVMYXlvdXQoKTsKICAgICBtX21pbmltdW1MYXlvdXRT aXplRm9yTWluaW1hbFVJID0gc2l6ZTsKICAgICB2aWV3cG9ydENvbmZpZ3VyYXRpb25DaGFuZ2Vk KCk7CiB9CkBAIC0xOTAxLDYgKzE5MDUsMTYgQEAgc3RhdGljIGlubGluZSBib29sIHdpdGhpbkVw c2lsb24oZmxvYXQgYQogICAgIHJldHVybiBmYWJzKGEgLSBiKSA8IHN0ZDo6bnVtZXJpY19saW1p dHM8ZmxvYXQ+OjplcHNpbG9uKCk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6cmVzZXRUZXh0QXV0b3Np emluZ0JlZm9yZUxheW91dCgpCit7CisgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbV9wYWdlLT5t YWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoJm1f cGFnZS0+bWFpbkZyYW1lKCkpKSB7CisgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1l LT5kb2N1bWVudCgpOworICAgICAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+cmVuZGVy VmlldygpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGRvY3VtZW50LT5yZW5kZXJW aWV3KCktPnJlc2V0VGV4dEF1dG9zaXppbmcoKTsKKyAgICB9Cit9CisKIHZvaWQgV2ViUGFnZTo6 ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRT aXplLCBjb25zdCBGbG9hdFJlY3QmIHRhcmdldEV4cG9zZWRDb250ZW50UmVjdCwgY29uc3QgRmxv YXRSZWN0JiB0YXJnZXRVbm9ic2N1cmVkUmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB0 YXJnZXRVbm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzLCBkb3VibGUgdGFyZ2V0 U2NhbGUpCiB7CiAgICAgVGVtcG9yYXJ5Q2hhbmdlPGJvb2w+IGR5bmFtaWNTaXplVXBkYXRlR3Vh cmQobV9pbkR5bmFtaWNTaXplVXBkYXRlLCB0cnVlKTsKQEAgLTE5MzcsNiArMTk1MSw4IEBAIHZv aWQgV2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZSgKICAgICAgICAgfQogICAgIH0K IAorICAgIGlmIChtaW5pbXVtTGF5b3V0U2l6ZS53aWR0aCgpICE9IG1fdmlld3BvcnRDb25maWd1 cmF0aW9uLm1pbmltdW1MYXlvdXRTaXplKCkud2lkdGgoKSkKKyAgICAgICAgcmVzZXRUZXh0QXV0 b3NpemluZ0JlZm9yZUxheW91dCgpOwogICAgIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldE1p bmltdW1MYXlvdXRTaXplKG1pbmltdW1MYXlvdXRTaXplKTsKICAgICBJbnRTaXplIG5ld0xheW91 dFNpemUgPSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5sYXlvdXRTaXplKCk7CiAgICAgc2V0Rml4 ZWRMYXlvdXRTaXplKG5ld0xheW91dFNpemUpOwo=