157441 2016-05-06 18:31:37 -0700 [iOS WK2] Font size increases on some pages after navigating then going back 2016-05-11 15:06:36 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=157589 InRadar P2 Normal --- 1 simon.fraser simon.fraser enrica simon.fraser thorton zalan oldest_to_newest 1190853 0 simon.fraser 2016-05-06 18:31:37 -0700 [iOS WK2] Font size increases on some pages after navigating then going back 1190854 1 278302 simon.fraser 2016-05-06 18:35:43 -0700 Created attachment 278302 Patch 1190961 2 278302 darin 2016-05-07 12:36:29 -0700 Comment on attachment 278302 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278302&action=review > Source/WebCore/ChangeLog:9 > + Sometimes I want to dump ViewportConfigurations from WebKit2 so export dump(). Seems like we’d want to export all or most of these “debug only for calling from the debugger” functions, not just this one. > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:2652 > - setFixedLayoutSize(newLayoutSize); > + if (setFixedLayoutSize(newLayoutSize)) > + resetTextAutosizing(); Should we build this behavior into the setFixedLayoutSize function instead of changing all call sites, or is there a valuable separation of responsibilities here? 1191310 3 simon.fraser 2016-05-09 14:16:30 -0700 http://trac.webkit.org/changeset/200588 rdar://problem/22873240 278302 2016-05-06 18:35:43 -0700 2016-05-07 12:36:29 -0700 Patch bug-157441-20160506183626.patch text/plain 12631 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwNTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTlkNWVhMWU2ODMzYzQw NWRlMTExNTI0YjJlZmJiMjJiMDYxYzU4My4uNTJmNDlkMDE2NWQ5YjY3YTZmMTBlNzZmZDQyODY1 ODgwODdlY2FkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE2LTA1LTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1MgV0syXSBG b250IHNpemUgaW5jcmVhc2VzIG9uIHNvbWUgcGFnZXMgYWZ0ZXIgbmF2aWdhdGluZyB0aGVuIGdv aW5nIGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1NzQ0MQorICAgICAgICByZGFyOi8vcHJvYmxlbS8yMjg3MzI0MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgU29tZXRpbWVzIEkgd2Fu dCB0byBkdW1wIFZpZXdwb3J0Q29uZmlndXJhdGlvbnMgZnJvbSBXZWJLaXQyIHNvIGV4cG9ydCBk dW1wKCkuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0LWF1dG9zaXppbmcvaW9zL3RleHQtYXV0 b3NpemluZy1hZnRlci1iYWNrLmh0bWwKKworICAgICAgICAqIHBhZ2UvVmlld3BvcnRDb25maWd1 cmF0aW9uLmg6CisKKzIwMTYtMDUtMDYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKICAgICAgICAgRW5hYmxlIElPU19URVhUX0FVVE9TSVpJTkcgb24gTWFjIGFuZCBt YWtlIGl0IHRlc3RhYmxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTc0MzIKICAgICAgICAgcmRhcjovL3Byb2JsZW0vMTY0MDY3MjAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpp bmRleCBkYzU0YTIzZjZiOWE1YzYxNzIxZTg5ODhlNTYzY2Q5MGQyYmY3ODJhLi5kZjEyM2JjNWYx NDkyMTY2NDZjYzZlZDRkMTkwNGY0OTAwMzMzYTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzkg QEAKIDIwMTYtMDUtMDYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK KyAgICAgICAgW2lPUyBXSzJdIEZvbnQgc2l6ZSBpbmNyZWFzZXMgb24gc29tZSBwYWdlcyBhZnRl ciBuYXZpZ2F0aW5nIHRoZW4gZ29pbmcgYmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NDQxCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIyODcz MjQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAg ICAgICBUaGVyZSdzIGFuIG9yZGVyaW5nIGRlcGVuZGVuY3kgYmV0d2VlbiBzZXR0aW5nIHRoZSB2 aWV3cG9ydCBjb25maWd1cmF0aW9uIGFuZCBkb2luZworICAgICAgICBsYXlvdXRzIHdoZW4gZ29p bmcgYmFjayB0byBhIHBhZ2UgZnJvbSB0aGUgcGFnZSBjYWNoZSB0aGF0IGlzIGluY29ycmVjdGx5 IGhhbmRsZWQuCisKKyAgICAgICAgSW4gRnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9h ZCgpLCBDYWNoZWRQYWdlOjpyZXN0b3JlKCkgdHJpZ2dlcnMgYSBsYXlvdXQgdW5kZXIKKyAgICAg ICAgdXBkYXRlQ29udGVudHNTaXplKCksIGJ1dCB0aGlzIGhhcHBlbnMgYmVmb3JlIGRpc3BhdGNo RGlkQ29tbWl0TG9hZCgpIHdoaWNoIHVwZGF0ZXMKKyAgICAgICAgdGhlIHZpZXdwb3J0IGFyZ3Vt ZW50cyB2aWEgVmlld3BvcnRDb25maWd1cmF0aW9uOjpzZXRWaWV3cG9ydEFyZ3VtZW50cygpLgor CisgICAgICAgIFRoaXMgaXNzdWUgaXMgbm90IGFkZHJlc3NlZCBieSB0aGUgY3VycmVudCBjb21t aXQuIEJ1dCBhIHNlY29uZCBwcm9ibGVtIGlzOgorICAgICAgICBpZiB0aGUgaW5wdXRzIHRvIHRl eHQgYXV0b3NpemluZyBjaGFuZ2UsIHdlIG5lZWQgdG8gaW52YWxpZGF0ZSB0aGUgYXV0b3Npemlu ZyBzdGF0ZS4KKyAgICAgICAgVGhlIHJlbGV2YW50IGlucHV0IGhlcmUgaXMgdGhlIGZpeGVkIGxh eW91dCB3aWR0aCAod2hpY2ggaXMgZGV0ZXJtaW5lZCBmcm9tIHRoZSB2aWV3cG9ydAorICAgICAg ICBjb25maWd1cmF0aW9uKS4KKworICAgICAgICBUaGUgY3VycmVudCBjb2RlIGludmFsaWRhdGVk IHRleHQgYXV0b3NpemluZyB3aGVuIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1MYXlv dXRTaXplKCkKKyAgICAgICAgY2hhbmdlZCwgYnV0IHRoZSBjb3JyZWN0IGJlaGF2aW9yIGlzIHRv IGludmFsaWRhdGUgYmFzZWQgb24gZml4ZWQgbGF5b3V0IHNpemUgY2hhbmdpbmcuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OnNlbmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6c2V0Rml4ZWRMYXlvdXRTaXplKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlP Uy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVzZXRUZXh0QXV0b3NpemluZyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjp2aWV3cG9ydENvbmZpZ3VyYXRpb25DaGFuZ2VkKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxh eW91dFNpemUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXNldFRleHRB dXRvc2l6aW5nQmVmb3JlTGF5b3V0SWZOZWVkZWQpOiBEZWxldGVkLgorCisyMDE2LTA1LTA2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIEVuYWJsZSBJ T1NfVEVYVF9BVVRPU0laSU5HIG9uIE1hYyBhbmQgbWFrZSBpdCB0ZXN0YWJsZQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NDMyCiAgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzE2NDA2NzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Zp ZXdwb3J0Q29uZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZp Z3VyYXRpb24uaAppbmRleCAyMzBlZjgwOTk4OGRmMmM3ZjRiM2FkYTNlNTEyZjVlYjVhYjc1Zjc1 Li5kY2Y2YTZkOWRiYmI3YzRmZGI2NzhlM2M0NDc0NzM1N2MzZTkyMTc5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKQEAgLTEwMyw3ICsxMDMsNyBAQCBw dWJsaWM6CiAgICAgCiAjaWZuZGVmIE5ERUJVRwogICAgIFdURjo6Q1N0cmluZyBkZXNjcmlwdGlv bigpIGNvbnN0OwotICAgIHZvaWQgZHVtcCgpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgZHVtcCgpIGNvbnN0OwogI2VuZGlmCiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMjQxMDdiMmFkZWJiNGE3Y2Y1Yjkz ZGNjODc1ZjBmNjJkOTMwMjVkNS4uZjJhNDgyZDRlMzFkYjYzYTUwODVlYzU3Yzg0YmM1YjUxN2Fl ZDhiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cApAQCAtMTM4OSw2ICsxMzg5LDcgQEAgdm9pZCBXZWJQYWdlOjpzZW5kVmlld3BvcnRBdHRyaWJ1 dGVzQ2hhbmdlZCgpCiAKICAgICAvLyBUaGlzIGFsc28gdGFrZXMgY2FyZSBvZiB0aGUgcmVsYXlv dXQuCiAgICAgc2V0Rml4ZWRMYXlvdXRTaXplKHJvdW5kZWRJbnRTaXplKGF0dHIubGF5b3V0U2l6 ZSkpOworICAgIC8vIEZJWE1FOiBpbnZhbGlkYXRlIHRleHQgYXV0b3NpemluZz8KIAogI2lmIFVT RShDT09SRElOQVRFRF9HUkFQSElDU19USFJFQURFRCkKICAgICBpZiAobV9kcmF3aW5nQXJlYS0+ bGF5ZXJUcmVlSG9zdCgpKQpAQCAtMTY3NiwxNSArMTY3NywxNiBAQCB2b2lkIFdlYlBhZ2U6OnNl dFVzZUZpeGVkTGF5b3V0KGJvb2wgZml4ZWQpCiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpVc2VGaXhlZExheW91dERpZENoYW5nZShmaXhlZCkpOwogfQogCi12b2lkIFdlYlBhZ2U6 OnNldEZpeGVkTGF5b3V0U2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQorYm9vbCBXZWJQYWdlOjpz ZXRGaXhlZExheW91dFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICBGcmFtZVZpZXcq IHZpZXcgPSBtYWluRnJhbWVWaWV3KCk7CiAgICAgaWYgKCF2aWV3IHx8IHZpZXctPmZpeGVkTGF5 b3V0U2l6ZSgpID09IHNpemUpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgdmlldy0+c2V0Rml4ZWRMYXlvdXRTaXplKHNpemUpOwogCiAgICAgc2VuZChNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpGaXhlZExheW91dFNpemVEaWRDaGFuZ2Uoc2l6ZSkpOworICAg IHJldHVybiB0cnVlOwogfQogCiBJbnRTaXplIFdlYlBhZ2U6OmZpeGVkTGF5b3V0U2l6ZSgpIGNv bnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA0 YWNkZTNmNWYzMDdiOWE2Mzc4MzQ5MDFjYWFmMTU0ZTBlMDdlNWRjLi5mNjkxM2VhZGRiM2M0NWE1 NWMxMGVjY2JjZTM5NTgwYTJiYjRjYjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKQEAgLTM5Myw3ICszOTMsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lk IHNldFVzZUZpeGVkTGF5b3V0KGJvb2wpOwogICAgIGJvb2wgdXNlRml4ZWRMYXlvdXQoKSBjb25z dCB7IHJldHVybiBtX3VzZUZpeGVkTGF5b3V0OyB9Ci0gICAgdm9pZCBzZXRGaXhlZExheW91dFNp emUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOworICAgIGJvb2wgc2V0Rml4ZWRMYXlvdXRTaXpl KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICBXZWJDb3JlOjpJbnRTaXplIGZpeGVkTGF5 b3V0U2l6ZSgpIGNvbnN0OwogCiAgICAgdm9pZCBsaXN0ZW5Gb3JMYXlvdXRNaWxlc3RvbmVzKHVp bnQzMl90IC8qIExheW91dE1pbGVzdG9uZXMgKi8pOwpAQCAtOTc1LDcgKzk3NSw3IEBAIHByaXZh dGU6CiAgICAgdm9pZCBoYW5kbGVTeW50aGV0aWNDbGljayhXZWJDb3JlOjpOb2RlKiBub2RlUmVz cG9uZGluZ1RvQ2xpY2ssIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGxvY2F0aW9uKTsKICAg ICB2b2lkIGNvbXBsZXRlU3ludGhldGljQ2xpY2soV2ViQ29yZTo6Tm9kZSogbm9kZVJlc3BvbmRp bmdUb0NsaWNrLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBsb2NhdGlvbik7CiAgICAgdm9p ZCBzZW5kVGFwSGlnaGxpZ2h0Rm9yTm9kZUlmTmVjZXNzYXJ5KHVpbnQ2NF90IHJlcXVlc3RJRCwg V2ViQ29yZTo6Tm9kZSopOwotICAgIHZvaWQgcmVzZXRUZXh0QXV0b3NpemluZ0JlZm9yZUxheW91 dElmTmVlZGVkKGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgb2xkU2l6ZSwgY29uc3QgV2ViQ29y ZTo6RmxvYXRTaXplJiBuZXdTaXplKTsKKyAgICB2b2lkIHJlc2V0VGV4dEF1dG9zaXppbmcoKTsK ICAgICBXZWJDb3JlOjpWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uSW5Gb2N1c2VkTm9k ZUZvclBvaW50KGNvbnN0IFdlYkNvcmU6OkZyYW1lJiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQm LCBib29sIGlzSW50ZXJhY3RpbmdXaXRoQXNzaXN0ZWROb2RlKTsKICAgICBQYXNzUmVmUHRyPFdl YkNvcmU6OlJhbmdlPiByYW5nZUZvckdyYW51bGFyaXR5QXRQb2ludChjb25zdCBXZWJDb3JlOjpG cmFtZSYsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiwgdWludDMyX3QgZ3JhbnVsYXJpdHksIGJv b2wgaXNJbnRlcmFjdGluZ1dpdGhBc3Npc3RlZE5vZGUpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggNTRk ZDgzODdmMGY5OTUxNzQ5NjhmYmQyMzJmMjAyYzlkMzUyMGNiYS4uNDUzMmUyMzhkYzFmYzdlMThj YjRkNDEzYmQ5YjY3ZTNhNTcwOTQ1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjU3NCw4ICsyNTc0LDYgQEAgdm9p ZCBXZWJQYWdlOjplbGVtZW50RGlkQmx1cihXZWJDb3JlOjpOb2RlKiBub2RlKQogCiB2b2lkIFdl YlBhZ2U6OnNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKGNvbnN0IEZs b2F0U2l6ZSYgc2l6ZSkKIHsKLSAgICByZXNldFRleHRBdXRvc2l6aW5nQmVmb3JlTGF5b3V0SWZO ZWVkZWQobV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bUxheW91dFNpemUoKSwgc2l6ZSk7 Ci0gICAgCiAgICAgaWYgKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldE1pbmltdW1MYXlvdXRT aXplKHNpemUpKQogICAgICAgICB2aWV3cG9ydENvbmZpZ3VyYXRpb25DaGFuZ2VkKCk7CiB9CkBA IC0yNjAxLDExICsyNTk5LDggQEAgc3RhdGljIGlubGluZSBib29sIGFyZUVzc2VudGlhbGx5RXF1 YWxBc0Zsb2F0KGZsb2F0IGEsIGZsb2F0IGIpCiAgICAgcmV0dXJuIFdURjo6YXJlRXNzZW50aWFs bHlFcXVhbChhLCBiKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpyZXNldFRleHRBdXRvc2l6aW5nQmVm b3JlTGF5b3V0SWZOZWVkZWQoY29uc3QgRmxvYXRTaXplJiBvbGRTaXplLCBjb25zdCBGbG9hdFNp emUmIG5ld1NpemUpCit2b2lkIFdlYlBhZ2U6OnJlc2V0VGV4dEF1dG9zaXppbmcoKQogewotICAg IGlmIChvbGRTaXplLndpZHRoKCkgPT0gbmV3U2l6ZS53aWR0aCgpKQotICAgICAgICByZXR1cm47 Ci0KICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZtX3BhZ2UtPm1haW5GcmFtZSgpOyBmcmFtZTsg ZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKSB7CiAgICAgICAgIERvY3VtZW50 KiBkb2N1bWVudCA9IGZyYW1lLT5kb2N1bWVudCgpOwogICAgICAgICBpZiAoIWRvY3VtZW50IHx8 ICFkb2N1bWVudC0+cmVuZGVyVmlldygpKQpAQCAtMjY1MCwxMSArMjY0NSwxMiBAQCB2b2lkIFdl YlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUoY29uc3QgRmxvYXRTaXplJiBtaW5pbXVt TGF5b3V0U2l6ZSwgY29ucwogICAgICAgICB9CiAgICAgfQogCi0gICAgcmVzZXRUZXh0QXV0b3Np emluZ0JlZm9yZUxheW91dElmTmVlZGVkKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1M YXlvdXRTaXplKCksIG1pbmltdW1MYXlvdXRTaXplKTsKICAgICBtX3ZpZXdwb3J0Q29uZmlndXJh dGlvbi5zZXRNaW5pbXVtTGF5b3V0U2l6ZShtaW5pbXVtTGF5b3V0U2l6ZSk7CiAgICAgSW50U2l6 ZSBuZXdMYXlvdXRTaXplID0gbV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubGF5b3V0U2l6ZSgpOwog Ci0gICAgc2V0Rml4ZWRMYXlvdXRTaXplKG5ld0xheW91dFNpemUpOworICAgIGlmIChzZXRGaXhl ZExheW91dFNpemUobmV3TGF5b3V0U2l6ZSkpCisgICAgICAgIHJlc2V0VGV4dEF1dG9zaXppbmco KTsKKwogICAgIHNldE1heGltdW1Vbm9ic2N1cmVkU2l6ZShtYXhpbXVtVW5vYnNjdXJlZFNpemUp OwogCiAgICAgZnJhbWVWaWV3LnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUo KTsKQEAgLTI4MTEsNyArMjgwNyw4IEBAIHZvaWQgV2ViUGFnZTo6cmVzZXRWaWV3cG9ydERlZmF1 bHRDb25maWd1cmF0aW9uKFdlYkZyYW1lKiBmcmFtZSkKIAogdm9pZCBXZWJQYWdlOjp2aWV3cG9y dENvbmZpZ3VyYXRpb25DaGFuZ2VkKCkKIHsKLSAgICBzZXRGaXhlZExheW91dFNpemUobV92aWV3 cG9ydENvbmZpZ3VyYXRpb24ubGF5b3V0U2l6ZSgpKTsKKyAgICBpZiAoc2V0Rml4ZWRMYXlvdXRT aXplKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmxheW91dFNpemUoKSkpCisgICAgICAgIHJlc2V0 VGV4dEF1dG9zaXppbmcoKTsKIAogICAgIGRvdWJsZSBpbml0aWFsU2NhbGUgPSBtX3ZpZXdwb3J0 Q29uZmlndXJhdGlvbi5pbml0aWFsU2NhbGUoKTsKICAgICBkb3VibGUgc2NhbGU7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NzkxMTg0NTE1ODI4OWFmYzhhYmIxZGQxOGI0Y2E3MWZlNmI4ZGQ3Yi4uNWU2NDcxYTAyYzlhODU2 NGViZTMxN2Q1ZmZhNjRhNmE4ODNkOTFlYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE2LTA1 LTA2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFtp T1MgV0syXSBGb250IHNpemUgaW5jcmVhc2VzIG9uIHNvbWUgcGFnZXMgYWZ0ZXIgbmF2aWdhdGlu ZyB0aGVuIGdvaW5nIGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1NzQ0MQorICAgICAgICByZGFyOi8vcHJvYmxlbS8yMjg3MzI0MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90ZXh0LWF1 dG9zaXppbmcvaW9zL3RleHQtYXV0b3NpemluZy1hZnRlci1iYWNrLWV4cGVjdGVkLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvdGV4dC1hdXRvc2l6aW5nL2lvcy90ZXh0LWF1dG9zaXppbmct YWZ0ZXItYmFjay5odG1sOiBBZGRlZC4KKworMjAxNi0wNS0wNiAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBFbmFibGUgSU9TX1RFWFRfQVVUT1NJWklO RyBvbiBNYWMgYW5kIG1ha2UgaXQgdGVzdGFibGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzQzMgogICAgICAgICByZGFyOi8vcHJvYmxlbS8xNjQw NjcyMApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0LWF1dG9zaXppbmcvaW9zL3Rl eHQtYXV0b3NpemluZy1hZnRlci1iYWNrLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3RleHQtYXV0b3NpemluZy9pb3MvdGV4dC1hdXRvc2l6aW5nLWFmdGVyLWJhY2stZXhwZWN0ZWQu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4xNzNmYTBkZTU5MTIwYzg3NTMwMjAzZmFlMjA2NjI2MzU5MGM0ZDcw Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0LWF1dG9zaXppbmcvaW9z L3RleHQtYXV0b3NpemluZy1hZnRlci1iYWNrLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxOSBA QAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgdXNlRmxleGlibGVW aWV3cG9ydD10cnVlIF0gLS0+CisKKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBuYW1lPSJ2aWV3cG9y dCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoIi8+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5p bnRlcm5hbHMpIHsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldFRleHRBdXRvc2l6 aW5nRW5hYmxlZCh0cnVlKTsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldFRleHRB dXRvc2l6aW5nV2luZG93U2l6ZU92ZXJyaWRlKDMyMCwgNDgwKTsKK30KKzwvc2NyaXB0PgorPC9o ZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD0iY29udGVudCI+PGEgaWQ9J2FuY2hvcicgaHJlZj0n ZGF0YTp0ZXh0L2h0bWwsPGJvZHkgb25sb2FkPSJoaXN0b3J5LmJhY2soKSI+PGRpdiBzdHlsZT0i d2lkdGg6IDUwMHB4Ij5UZXh0PC9kaXY+PC9ib2R5Pic+QW5jaG9yIHRvIGFub3RoZXIgcGFnZTwv YT48L2Rpdj4KKyAgICA8ZGl2PgorICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwg Y29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdC4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC1hdXRvc2l6aW5nL2lvcy90ZXh0 LWF1dG9zaXppbmctYWZ0ZXItYmFjay5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0LWF1dG9z aXppbmcvaW9zL3RleHQtYXV0b3NpemluZy1hZnRlci1iYWNrLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWE4 N2UyNTI3YTVlYzVmN2MyOTRlOGE3ZjM1MTE5YWQxMDE4MGIxYQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvdGV4dC1hdXRvc2l6aW5nL2lvcy90ZXh0LWF1dG9zaXppbmctYWZ0 ZXItYmFjay5odG1sCkBAIC0wLDAgKzEsNTQgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtp dC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBdIC0tPgorCis8aHRtbD4K KzxoZWFkPgorPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0 aCIvPgorICAgIDxzY3JpcHQ+CisgICAgICAgIGZ1bmN0aW9uIG5hdmlnYXRlQXdheUFuZEJhY2so KSAKKyAgICAgICAgeworICAgICAgICAgICAgLy8gU2ltdWxhdGUgYSBsaW5rIGNsaWNrIHRvIGNy ZWF0ZSBhIGhpc3RvcnkgZW50cnkKKyAgICAgICAgICAgIHZhciBldnQgPSBuZXcgTW91c2VFdmVu dCgiY2xpY2siLCB7CisgICAgICAgICAgICAgICAgYnViYmxlczogdHJ1ZSwKKyAgICAgICAgICAg ICAgICBjYW5jZWxhYmxlOiB0cnVlLAorICAgICAgICAgICAgICAgIHZpZXc6IHdpbmRvdworICAg ICAgICAgICAgfSk7CisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnYW5jaG9y JykuZGlzcGF0Y2hFdmVudChldnQpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gcnVu VGVzdCgpIAorICAgICAgICB7CisgICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsK KyAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgICAg ICAgICB0ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0VXNlc1BhZ2VDYWNoZVBy ZWZlcmVuY2VLZXkiLCAxKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKHdpbmRv dy5pbnRlcm5hbHMpIHsKKyAgICAgICAgICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdz LnNldFRleHRBdXRvc2l6aW5nRW5hYmxlZCh0cnVlKTsKKyAgICAgICAgICAgICAgICB3aW5kb3cu aW50ZXJuYWxzLnNldHRpbmdzLnNldFRleHRBdXRvc2l6aW5nV2luZG93U2l6ZU92ZXJyaWRlKDMy MCwgNDgwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KCJu YXZpZ2F0ZUF3YXlBbmRCYWNrKCkiLCAwKTsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBzaG93 Q291bnQgPSAwOworICAgICAgICBmdW5jdGlvbiBwYWdlU2hvd2VkKCkKKyAgICAgICAgeworICAg ICAgICAgICAgaWYgKCsrc2hvd0NvdW50ID09IDIpIHsKKyAgICAgICAgICAgICAgICAvLyBUaW1l b3V0IHJlcXVpcmVkIHRvIGdldCByZW5kZXJpbmcgaW4gV0sxLgorICAgICAgICAgICAgICAgIHdp bmRvdy5zZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlm eURvbmUoKTsKKyAgICAgICAgICAgICAgICB9LCAwKQorICAgICAgICAgICAgfQorICAgICAgICB9 CisKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBydW5UZXN0LCBmYWxz ZSk7CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdwYWdlc2hvdycsIHBhZ2VTaG93 ZWQsIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgaWQ9 ImNvbnRlbnQiPjxhIGlkPSdhbmNob3InIGhyZWY9J2RhdGE6dGV4dC9odG1sLDxib2R5IG9ubG9h ZD0iaGlzdG9yeS5iYWNrKCkiPjxkaXYgc3R5bGU9IndpZHRoOiA1MDBweCI+VGV4dDwvZGl2Pjwv Ym9keT4nPkFuY2hvciB0byBhbm90aGVyIHBhZ2U8L2E+PC9kaXY+CisgICAgPGRpdj4KKyAgICAg ICAgTG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2ljaW5nIGVs aXQuCisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==