133026 2014-05-16 22:09:07 -0700 [iOS][WK2] When a page relayout on dynamic resize, keep the same relative width in view 2014-05-19 14:43:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin sam oldest_to_newest 1009940 0 benjamin 2014-05-16 22:09:07 -0700 [iOS][WK2] When a page relayout on dynamic resize, keep the same relative width in view 1009941 1 231623 benjamin 2014-05-16 22:25:15 -0700 Created attachment 231623 Patch 1009942 2 benjamin 2014-05-16 22:25:35 -0700 <rdar://problem/16833971> 1010299 3 231722 benjamin 2014-05-19 14:17:51 -0700 Created attachment 231722 Patch 1010300 4 231722 simon.fraser 2014-05-19 14:19:19 -0700 Comment on attachment 231722 Patch r=me but it would be nice if your bug(s) mentioned a site this happens on. 1010308 5 231722 benjamin 2014-05-19 14:43:03 -0700 Comment on attachment 231722 Patch Clearing flags on attachment: 231722 Committed r169068: <http://trac.webkit.org/changeset/169068> 1010309 6 benjamin 2014-05-19 14:43:05 -0700 All reviewed patches have been landed. Closing bug. 231623 2014-05-16 22:25:15 -0700 2014-05-19 14:17:50 -0700 Patch bug-133026-20140516222451.patch text/plain 6813 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4OTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTFiNjgxZDMyZWMwODJi MzZiODA0NzRlODk0MGU0ZGNlOTE3YWFlMy4uMmNiMDQyOWQ3MzE0MDkzYTU5NjE1MjM1ZmNlZTJh ZThiYWQ2OTE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA1LTE2ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g V2hlbiBhIHBhZ2UgcmVsYXlvdXQgb24gZHluYW1pYyByZXNpemUsIGtlZXAgdGhlIHNhbWUgcmVs YXRpdmUgd2lkdGggaW4gdmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMzMDI2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjgzMzk3MT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgcGFn ZSBkb2VzIG5vdCByZWxheW91dCwgd2Uga2VlcCB0aGUgc2FtZSB3aWR0aCBpbiB2aWV3LgorICAg ICAgICBXaGVuIGEgcGFnZSByZWxheW91dCwgd2Ugc2hvdWxkIGtlZXAgdGhlIHNhbWUgcmVsYXRp dmUgd2lkdGggaW4gdmlldy4KKworICAgICAgICBGb3IgcmVzcG9uc2l2ZSBkZXNpZ24gd2l0aCBj b250ZW50IGJsZWVkaW5nIG91dHNpZGUgdGhlIGxheW91dCB3aWR0aCwgd2UgdXNlIHRoZSBsYXlv dXQKKyAgICAgICAgd2lkdGggaW5zdGVhZCBvZiB0aGUgY29udGVudCB3aWR0aC4gVGhlIHJlYXNv biBpcyBtb3N0IG9mIHRob3NlIHdlYnNpdGVzIGhhdmUgbW9zdCBvZiB0aGVpcgorICAgICAgICBk ZXNpZ24gaW50byB0aGUgbWluaW11bSBsYXlvdXQgd2lkdGguCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OmlzUmVzcG9u c2l2ZURlc2lnbldpdGhDb250ZW50TGFyZ2VyVGhhbkxheW91dCk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUpOgorCiAyMDE0LTA1LTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFB1dCBiYWNrIGEg c3ltYm9sIHJlbW92ZWQgaW4gcjE2ODk3OCB0aGF0IFNhZmFyaSBuZWVkcywgYnV0IGRlcHJlY2F0 ZSBpdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbQppbmRleCA5YzA1OGUyZDg3NGM5Njg5NTQ0NDYwMzhmNmVhODQxZGFjYmQ4ZTUw Li5jYzdhZjU3MThkYTA3YzgzOWUyZDA2ZDZiNWI5ZDAzYTU4NzI2MDg4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0x OTI4LDYgKzE5MjgsMTMgQEAgdm9pZCBXZWJQYWdlOjpyZXNldFRleHRBdXRvc2l6aW5nQmVmb3Jl TGF5b3V0SWZOZWVkZWQoY29uc3QgRmxvYXRTaXplJiBvbGRTaXplLAogICAgIH0KIH0KIAorc3Rh dGljIGJvb2wgaXNSZXNwb25zaXZlRGVzaWduV2l0aENvbnRlbnRMYXJnZXJUaGFuTGF5b3V0KGNv bnN0IEludFNpemUmIGxheW91dFNpemUsIGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNp emVJblNjcm9sbFZpZXdDb29yZGluYXRlcywgY29uc3QgSW50U2l6ZSYgY29udGVudFNpemUpCit7 CisgICAgYm9vbCBsaWtlbHlSZXNwb25zaXZlRGVzaWduVmlld3BvcnQgPSBsYXlvdXRTaXplLndp ZHRoKCkgPT0gbWluaW11bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlcy53aWR0aCgp OworICAgIGJvb2wgY29udGVudEJsZWVkc091dHNpZGVMYXlvdXRXaWR0aCA9IGNvbnRlbnRTaXpl LndpZHRoKCkgPiBsYXlvdXRTaXplLndpZHRoKCk7CisgICAgcmV0dXJuIGxpa2VseVJlc3BvbnNp dmVEZXNpZ25WaWV3cG9ydCAmJiBjb250ZW50QmxlZWRzT3V0c2lkZUxheW91dFdpZHRoOworfQor CiB2b2lkIFdlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUoY29uc3QgRmxvYXRTaXpl JiBtaW5pbXVtTGF5b3V0U2l6ZSwgY29uc3QgRmxvYXRSZWN0JiB0YXJnZXRFeHBvc2VkQ29udGVu dFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgdGFyZ2V0VW5vYnNjdXJlZFJlY3QsIGNvbnN0IFdlYkNv cmU6OkZsb2F0UmVjdCYgdGFyZ2V0VW5vYnNjdXJlZFJlY3RJblNjcm9sbFZpZXdDb29yZGluYXRl cywgZG91YmxlIHRhcmdldFNjYWxlKQogewogICAgIFRlbXBvcmFyeUNoYW5nZTxib29sPiBkeW5h bWljU2l6ZVVwZGF0ZUd1YXJkKG1faW5EeW5hbWljU2l6ZVVwZGF0ZSwgdHJ1ZSk7CkBAIC0xOTM2 LDE1ICsxOTQzLDIyIEBAIHZvaWQgV2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShj b25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplLCBjb25zCiAKICAgICBGcmFtZVZpZXcm IGZyYW1lVmlldyA9ICptX3BhZ2UtPm1haW5GcmFtZSgpLnZpZXcoKTsKICAgICBJbnRTaXplIG9s ZENvbnRlbnRTaXplID0gZnJhbWVWaWV3LmNvbnRlbnRzU2l6ZSgpOworICAgIEludFNpemUgb2xk TGF5b3V0U2l6ZSA9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmxheW91dFNpemUoKTsKKyAgICBG bG9hdFNpemUgb2xkTWluaW11bUxheW91dFNpemUgPSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5t aW5pbXVtTGF5b3V0U2l6ZSgpOwogICAgIGZsb2F0IG9sZFBhZ2VTY2FsZUZhY3RvciA9IG1fcGFn ZS0+cGFnZVNjYWxlRmFjdG9yKCk7CiAKICAgICBtX2R5bmFtaWNTaXplVXBkYXRlSGlzdG9yeS5h ZGQoc3RkOjptYWtlX3BhaXIob2xkQ29udGVudFNpemUsIG9sZFBhZ2VTY2FsZUZhY3RvciksIElu dFBvaW50KGZyYW1lVmlldy5zY3JvbGxPZmZzZXQoKSkpOwogCiAgICAgUmVmUHRyPE5vZGU+IG9s ZE5vZGVBdENlbnRlcjsKKyAgICBkb3VibGUgdmlzaWJsZUhvcml6b250YWxGcmFjdGlvbiA9IDE7 CiAgICAgZmxvYXQgcmVsYXRpdmVIb3Jpem9udGFsUG9zaXRpb25Jbk5vZGVBdENlbnRlciA9IDA7 CiAgICAgZmxvYXQgcmVsYXRpdmVWZXJ0aWNhbFBvc2l0aW9uSW5Ob2RlQXRDZW50ZXIgPSAwOwog ICAgIHsKICAgICAgICAgSW50UmVjdCB1bm9ic2N1cmVkQ29udGVudFJlY3QgPSBmcmFtZVZpZXcu dW5vYnNjdXJlZENvbnRlbnRSZWN0KCk7CisgICAgICAgIGlmIChpc1Jlc3BvbnNpdmVEZXNpZ25X aXRoQ29udGVudExhcmdlclRoYW5MYXlvdXQob2xkTGF5b3V0U2l6ZSwgb2xkTWluaW11bUxheW91 dFNpemUsIG9sZENvbnRlbnRTaXplKSkKKyAgICAgICAgICAgIHZpc2libGVIb3Jpem9udGFsRnJh Y3Rpb24gPSBzdGF0aWNfY2FzdDxmbG9hdD4odW5vYnNjdXJlZENvbnRlbnRSZWN0LndpZHRoKCkp IC8gb2xkTGF5b3V0U2l6ZS53aWR0aCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB2aXNp YmxlSG9yaXpvbnRhbEZyYWN0aW9uID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHVub2JzY3VyZWRDb250 ZW50UmVjdC53aWR0aCgpKSAvIG9sZENvbnRlbnRTaXplLndpZHRoKCk7CiAgICAgICAgIEludFBv aW50IHVub2JzY3VyZWRDb250ZW50UmVjdENlbnRlciA9IHVub2JzY3VyZWRDb250ZW50UmVjdC5j ZW50ZXIoKTsKIAogICAgICAgICBIaXRUZXN0UmVxdWVzdCByZXF1ZXN0KEhpdFRlc3RSZXF1ZXN0 OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBY3RpdmUgfCBIaXRUZXN0UmVxdWVzdDo6RGlz YWxsb3dTaGFkb3dDb250ZW50KTsKQEAgLTE5NjQsNyArMTk3OCw3IEBAIHZvaWQgV2ViUGFnZTo6 ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRT aXplLCBjb25zCiAgICAgICAgIH0KICAgICB9CiAKLSAgICByZXNldFRleHRBdXRvc2l6aW5nQmVm b3JlTGF5b3V0SWZOZWVkZWQobV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bUxheW91dFNp emUoKSwgbWluaW11bUxheW91dFNpemUpOworICAgIHJlc2V0VGV4dEF1dG9zaXppbmdCZWZvcmVM YXlvdXRJZk5lZWRlZChvbGRNaW5pbXVtTGF5b3V0U2l6ZSwgbWluaW11bUxheW91dFNpemUpOwog ICAgIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldE1pbmltdW1MYXlvdXRTaXplKG1pbmltdW1M YXlvdXRTaXplKTsKICAgICBJbnRTaXplIG5ld0xheW91dFNpemUgPSBtX3ZpZXdwb3J0Q29uZmln dXJhdGlvbi5sYXlvdXRTaXplKCk7CiAgICAgc2V0Rml4ZWRMYXlvdXRTaXplKG5ld0xheW91dFNp emUpOwpAQCAtMTk3OCw2ICsxOTkyLDE5IEBAIHZvaWQgV2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0 U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIG1pbmltdW1MYXlvdXRTaXplLCBjb25zCiAgICAg ZWxzZQogICAgICAgICBzY2FsZSA9IHN0ZDo6bWF4KHN0ZDo6bWluKHRhcmdldFNjYWxlLCBtX3Zp ZXdwb3J0Q29uZmlndXJhdGlvbi5tYXhpbXVtU2NhbGUoKSksIG1fdmlld3BvcnRDb25maWd1cmF0 aW9uLm1pbmltdW1TY2FsZSgpKTsKIAorICAgIGJvb2wgcmVzcG9uc2l2ZURlc2lnblNwZWNpYWxD YXNlID0gaXNSZXNwb25zaXZlRGVzaWduV2l0aENvbnRlbnRMYXJnZXJUaGFuTGF5b3V0KG5ld0xh eW91dFNpemUsIG1pbmltdW1MYXlvdXRTaXplLCBuZXdDb250ZW50U2l6ZSk7CisgICAgaWYgKG1f dXNlckhhc0NoYW5nZWRQYWdlU2NhbGVGYWN0b3IgJiYgbmV3Q29udGVudFNpemUud2lkdGgoKSAh PSBvbGRDb250ZW50U2l6ZS53aWR0aCgpKSB7CisgICAgICAgIC8vIFdoZW4gdGhlIGNvbnRlbnQg c2l6ZSBjaGFuZ2UsIHdlIGtlZXAgdGhlIHNhbWUgcmVsYXRpdmUgaG9yaXpvbnRhbCBjb250ZW50 IHdpZHRoIGluIHZpZXcsIG90aGVyd2lzZSB3ZSB3b3VsZAorICAgICAgICAvLyBlbmQgdXAgem9v bSB0byBmYXIgaW4gbGFuZHNjYXBlLT5wb3J0cmFpdCwgYW5kIHRvbyBjbG9zZSBpbiBwb3J0cmFp dC0+bGFuZHNjYXBlLgorICAgICAgICBmbG9hdCB3aWR0aFRvS2VlcEluVmlldzsKKyAgICAgICAg aWYgKHJlc3BvbnNpdmVEZXNpZ25TcGVjaWFsQ2FzZSkKKyAgICAgICAgICAgIHdpZHRoVG9LZWVw SW5WaWV3ID0gdmlzaWJsZUhvcml6b250YWxGcmFjdGlvbiAqIG5ld0xheW91dFNpemUud2lkdGgo KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgd2lkdGhUb0tlZXBJblZpZXcgPSB2aXNpYmxl SG9yaXpvbnRhbEZyYWN0aW9uICogbmV3Q29udGVudFNpemUud2lkdGgoKTsKKyAgICAgICAgZG91 YmxlIG5ld1NjYWxlID0gdGFyZ2V0VW5vYnNjdXJlZFJlY3RJblNjcm9sbFZpZXdDb29yZGluYXRl cy53aWR0aCgpIC8gd2lkdGhUb0tlZXBJblZpZXc7CisgICAgICAgIHNjYWxlID0gc3RkOjptYXgo c3RkOjptaW4obmV3U2NhbGUsIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1heGltdW1TY2FsZSgp KSwgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bVNjYWxlKCkpOworICAgIH0KKwogICAg IEZsb2F0UmVjdCBuZXdVbm9ic2N1cmVkQ29udGVudFJlY3QgPSB0YXJnZXRVbm9ic2N1cmVkUmVj dDsKICAgICBGbG9hdFJlY3QgbmV3RXhwb3NlZENvbnRlbnRSZWN0ID0gdGFyZ2V0RXhwb3NlZENv bnRlbnRSZWN0OwogCkBAIC0yMDUwLDEwICsyMDc3LDcgQEAgdm9pZCBXZWJQYWdlOjpkeW5hbWlj Vmlld3BvcnRTaXplVXBkYXRlKGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNpemUsIGNv bnMKICAgICAgICAgICAgICAgICBuZXdFeHBvc2VkQ29udGVudFJlY3Quc2V0WSgwKTsKICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgYm9vbCBsaWtlbHlSZXNwb25zaXZlRGVzaWduVmlld3Bv cnQgPSBuZXdMYXlvdXRTaXplLndpZHRoKCkgPT0gbWluaW11bUxheW91dFNpemUud2lkdGgoKSAm JiB3aXRoaW5FcHNpbG9uKHNjYWxlLCAxKTsKLSAgICAgICAgICAgIGJvb2wgY29udGVudEJsZWVk c091dHNpZGVMYXlvdXRXaWR0aCA9IG5ld0NvbnRlbnRTaXplLndpZHRoKCkgPiBuZXdMYXlvdXRT aXplLndpZHRoKCk7Ci0gICAgICAgICAgICBib29sIG9yaWdpbmFsU2Nyb2xsUG9zaXRpb25XYXNP blRoZUxlZnRFZGdlID0gdGFyZ2V0VW5vYnNjdXJlZFJlY3QueCgpIDw9IDA7Ci0gICAgICAgICAg ICBpZiAobGlrZWx5UmVzcG9uc2l2ZURlc2lnblZpZXdwb3J0ICYmIGNvbnRlbnRCbGVlZHNPdXRz aWRlTGF5b3V0V2lkdGggJiYgb3JpZ2luYWxTY3JvbGxQb3NpdGlvbldhc09uVGhlTGVmdEVkZ2Up IHsKKyAgICAgICAgICAgIGlmIChyZXNwb25zaXZlRGVzaWduU3BlY2lhbENhc2UgJiYgdGFyZ2V0 VW5vYnNjdXJlZFJlY3QueCgpIDw9IDApIHsKICAgICAgICAgICAgICAgICAvLyBUaGlzIGlzIGEg c3BlY2lhbCBoZXVyaXN0aWNzIGZvciAicmVzcG9uc2l2ZSIgZGVzaWduIHdpdGggb2RkIGxheW91 dC4gSXQgaXMgcXVpdGUgY29tbW9uIGZvciByZXNwb25zaXZlIGRlc2lnbgogICAgICAgICAgICAg ICAgIC8vIHRvIGhhdmUgY29udGVudCAiYmxlZWRpbmciIG91dHNpZGUgb2YgdGhlIG1pbmltYWwg bGF5b3V0IHdpZHRoLCB1c3VhbGx5IGZyb20gYW4gaW1hZ2Ugb3IgdGFibGUgbGFyZ2VyIHRoYW4g ZXhwZWN0ZWQuCiAgICAgICAgICAgICAgICAgLy8gSW4gdGhvc2UgY2FzZXMsIHRoZSBkZXNpZ24g dXN1YWxseSBkb2VzIG5vdCBhZGFwdCB0byB0aGUgbmV3IHdpZHRoIGFuZCByZW1haW4gYXQgdGhl IG5ld0xheW91dFNpemUgZXhjZXB0IGZvciB0aGUK 231722 2014-05-19 14:17:51 -0700 2014-05-19 14:43:03 -0700 Patch bug-133026-20140519141724.patch text/plain 3192 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzAyMjU2M2RiYmMzZDIy Y2E4YTczMDZmOGJlNjgxNzZiMWVkYjMyZS4uNTk3YmE2MzQ2OTE5YmQzNTEyOTQxY2RkOTFlYmZk ZDczOWVkNTI3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA1LTE5ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g V2hlbiBhIHBhZ2UgcmVsYXlvdXQgb24gZHluYW1pYyByZXNpemUsIGtlZXAgdGhlIHNhbWUgcmVs YXRpdmUgd2lkdGggaW4gdmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMzMDI2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjgzMzk3MT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgcGFn ZSBkb2VzIG5vdCByZWxheW91dCwgd2Uga2VlcCB0aGUgc2FtZSB3aWR0aCBpbiB2aWV3LgorICAg ICAgICBXaGVuIGEgcGFnZSByZWxheW91dCwgd2Ugc2hvdWxkIGtlZXAgdGhlIHNhbWUgcmVsYXRp dmUgd2lkdGggaW4gdmlldy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6aXNSZXNwb25zaXZlRGVzaWduV2l0aENvbnRl bnRMYXJnZXJUaGFuTGF5b3V0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZHluYW1pY1Zp ZXdwb3J0U2l6ZVVwZGF0ZSk6CisKIDIwMTQtMDUtMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgU3BsaXQgc2Nyb2xsaW5nIHRyZWUgU2Nyb2xsaW5n Tm9kZXMgaW50byBGcmFtZVNjcm9sbGluZ05vZGVzIGFuZCBPdmVyZmxvd1Njcm9sbGluZ05vZGVz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW0KaW5kZXggOWMwNThlMmQ4NzRjOTY4OTU0NDQ2MDM4ZjZlYTg0MWRhY2JkOGU1MC4uMWRl MWUzOWQwYzJmMzFlZDY1Y2NjNjA4MjQxNjcyMGVlOTYwM2M3OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMTk0MSwx MCArMTk0MSwxMiBAQCB2b2lkIFdlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUoY29u c3QgRmxvYXRTaXplJiBtaW5pbXVtTGF5b3V0U2l6ZSwgY29ucwogICAgIG1fZHluYW1pY1NpemVV cGRhdGVIaXN0b3J5LmFkZChzdGQ6Om1ha2VfcGFpcihvbGRDb250ZW50U2l6ZSwgb2xkUGFnZVNj YWxlRmFjdG9yKSwgSW50UG9pbnQoZnJhbWVWaWV3LnNjcm9sbE9mZnNldCgpKSk7CiAKICAgICBS ZWZQdHI8Tm9kZT4gb2xkTm9kZUF0Q2VudGVyOworICAgIGRvdWJsZSB2aXNpYmxlSG9yaXpvbnRh bEZyYWN0aW9uID0gMTsKICAgICBmbG9hdCByZWxhdGl2ZUhvcml6b250YWxQb3NpdGlvbkluTm9k ZUF0Q2VudGVyID0gMDsKICAgICBmbG9hdCByZWxhdGl2ZVZlcnRpY2FsUG9zaXRpb25Jbk5vZGVB dENlbnRlciA9IDA7CiAgICAgewogICAgICAgICBJbnRSZWN0IHVub2JzY3VyZWRDb250ZW50UmVj dCA9IGZyYW1lVmlldy51bm9ic2N1cmVkQ29udGVudFJlY3QoKTsKKyAgICAgICAgdmlzaWJsZUhv cml6b250YWxGcmFjdGlvbiA9IHN0YXRpY19jYXN0PGZsb2F0Pih1bm9ic2N1cmVkQ29udGVudFJl Y3Qud2lkdGgoKSkgLyBvbGRDb250ZW50U2l6ZS53aWR0aCgpOwogICAgICAgICBJbnRQb2ludCB1 bm9ic2N1cmVkQ29udGVudFJlY3RDZW50ZXIgPSB1bm9ic2N1cmVkQ29udGVudFJlY3QuY2VudGVy KCk7CiAKICAgICAgICAgSGl0VGVzdFJlcXVlc3QgcmVxdWVzdChIaXRUZXN0UmVxdWVzdDo6UmVh ZE9ubHkgfCBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVlc3Q6OkRpc2FsbG93 U2hhZG93Q29udGVudCk7CkBAIC0xOTc4LDYgKzE5ODAsMTQgQEAgdm9pZCBXZWJQYWdlOjpkeW5h bWljVmlld3BvcnRTaXplVXBkYXRlKGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNpemUs IGNvbnMKICAgICBlbHNlCiAgICAgICAgIHNjYWxlID0gc3RkOjptYXgoc3RkOjptaW4odGFyZ2V0 U2NhbGUsIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1heGltdW1TY2FsZSgpKSwgbV92aWV3cG9y dENvbmZpZ3VyYXRpb24ubWluaW11bVNjYWxlKCkpOwogCisgICAgaWYgKG1fdXNlckhhc0NoYW5n ZWRQYWdlU2NhbGVGYWN0b3IgJiYgbmV3Q29udGVudFNpemUud2lkdGgoKSAhPSBvbGRDb250ZW50 U2l6ZS53aWR0aCgpKSB7CisgICAgICAgIC8vIFdoZW4gdGhlIGNvbnRlbnQgc2l6ZSBjaGFuZ2Us IHdlIGtlZXAgdGhlIHNhbWUgcmVsYXRpdmUgaG9yaXpvbnRhbCBjb250ZW50IHdpZHRoIGluIHZp ZXcsIG90aGVyd2lzZSB3ZSB3b3VsZAorICAgICAgICAvLyBlbmQgdXAgem9vbSB0byBmYXIgaW4g bGFuZHNjYXBlLT5wb3J0cmFpdCwgYW5kIHRvbyBjbG9zZSBpbiBwb3J0cmFpdC0+bGFuZHNjYXBl LgorICAgICAgICBmbG9hdCB3aWR0aFRvS2VlcEluVmlldyA9IHZpc2libGVIb3Jpem9udGFsRnJh Y3Rpb24gKiBuZXdDb250ZW50U2l6ZS53aWR0aCgpOworICAgICAgICBkb3VibGUgbmV3U2NhbGUg PSB0YXJnZXRVbm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzLndpZHRoKCkgLyB3 aWR0aFRvS2VlcEluVmlldzsKKyAgICAgICAgc2NhbGUgPSBzdGQ6Om1heChzdGQ6Om1pbihuZXdT Y2FsZSwgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWF4aW11bVNjYWxlKCkpLCBtX3ZpZXdwb3J0 Q29uZmlndXJhdGlvbi5taW5pbXVtU2NhbGUoKSk7CisgICAgfQorCiAgICAgRmxvYXRSZWN0IG5l d1Vub2JzY3VyZWRDb250ZW50UmVjdCA9IHRhcmdldFVub2JzY3VyZWRSZWN0OwogICAgIEZsb2F0 UmVjdCBuZXdFeHBvc2VkQ29udGVudFJlY3QgPSB0YXJnZXRFeHBvc2VkQ29udGVudFJlY3Q7CiAK