234708 2021-12-27 14:16:08 -0800 Teach modal container observer to make the body element scrollable if necessary 2022-01-07 12:29:18 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 234695 1 wenson_hsieh wenson_hsieh akeerthi bdakin hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1826980 0 wenson_hsieh 2021-12-27 14:16:08 -0800 . 1827112 1 webkit-bug-importer 2021-12-28 11:34:56 -0800 <rdar://problem/86960677> 1828924 2 448602 wenson_hsieh 2022-01-07 08:56:55 -0800 Created attachment 448602 For EWS 1829013 3 448602 wenson_hsieh 2022-01-07 11:40:56 -0800 Comment on attachment 448602 For EWS Thanks for taking a look! 1829032 4 ews-feeder 2022-01-07 12:29:15 -0800 Committed r287777 (245837@main): <https://commits.webkit.org/245837@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448602. 448602 2022-01-07 08:56:55 -0800 2022-01-07 12:29:17 -0800 For EWS bug-234708-20220107085654.patch text/plain 14166 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWIyOWE3N2ZhOGMzMjIy MDRhYTBmZGRjODE3OGI2MTA0YjEzNWVmOS4uZWM3YzMwYWQ2ZmU0MzA1NDZiY2MzMjU4NDRiZWQ2 OTIzYTY0MGVkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDIyLTAxLTA2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRlYWNoIG1vZGFs IGNvbnRhaW5lciBvYnNlcnZlciB0byBtYWtlIHRoZSBib2R5IGVsZW1lbnQgc2Nyb2xsYWJsZSBp ZiBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNDcwOAorICAgICAgICByZGFyOi8vODY5NjA2NzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBtZWNoYW5pc20gdG8gYWxsb3cgTW9k YWxDb250YWluZXJPYnNlcnZlciB0byBmb3JjZSB0aGUgYm9keSBhbmQvb3IgZG9jdW1lbnQgZWxl bWVudHMgaW4gdGhlIG1haW4gZG9jdW1lbnQKKyAgICAgICAgdG8gYmVjb21lIHZlcnRpY2FsbHkg c2Nyb2xsYWJsZSwgaW4gdGhlIGNhc2Ugd2hlcmUgYSBtb2RhbCBjb250YWluZXIgaGFzIGJlZW4g ZGV0ZWN0ZWQuCisKKyAgICAgICAgSW4gcGFydGljdWxhciwgaWYgYSBtb2RhbCBjb250YWluZXIg aGFzIGFscmVhZHkgYmVlbiBkZXRlY3RlZCBhbmQgaGlkZGVuIGF3YXksIHRoZSBmcmFtZSBpcyBu b24tc2Nyb2xsYWJsZSwgYW5kCisgICAgICAgIHRoZSBib2R5IGFuZC9vciBkb2N1bWVudCBlbGVt ZW50IHNhdGlzZmllcyBib3RoIGNvbmRpdGlvbnM6CisKKyAgICAgICAgMS4gSGFzIGEgaGVpZ2h0 IHRoYXQgaXMgdGFsbGVyIHRoYW4gdGhlIHZpc2libGUgaGVpZ2h0IG9mIHRoZSB0b3AgRnJhbWVW aWV3CisgICAgICAgIDIuIEhhcyBgb3ZlcmZsb3cteTogaGlkZGVuO2AKKworICAgICAgICAuLi50 aGVuIHdlJ2xsIGZsYWcgb25lIG9yIGJvdGggb2YgdGhvc2UgZWxlbWVudHMgYW5kIGZvcmNlIHRo ZW0gdG8gYmUgdmVydGljYWxseSBzY3JvbGxhYmxlIGR1cmluZyBzdHlsZQorICAgICAgICBhZGp1 c3RtZW50IChpLmUuIHJldHVybiBgdHJ1ZWAgZnJvbSBgc2hvdWxkTWFrZVZlcnRpY2FsbHlTY3Jv bGxhYmxlKClgKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGF1Z21lbnRpbmcgYW4gZXhpc3Rpbmcg QVBJIHRlc3Q6CisgICAgICAgIE1vZGFsQ29udGFpbmVyT2JzZXJ2YXRpb24uSGlkZVVzZXJJbnRl cmFjdGlvbkJsb2NraW5nRWxlbWVudEFuZE1ha2VEb2N1bWVudFNjcm9sbGFibGUKKworICAgICAg ICAqIHBhZ2UvTW9kYWxDb250YWluZXJPYnNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN b2RhbENvbnRhaW5lck9ic2VydmVyOjpzZXRDb250YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6 TW9kYWxDb250YWluZXJPYnNlcnZlcjo6Y29sbGVjdENsaWNrYWJsZUVsZW1lbnRzVGltZXJGaXJl ZCk6CisgICAgICAgIChXZWJDb3JlOjpNb2RhbENvbnRhaW5lck9ic2VydmVyOjptYWtlQm9keUFu ZERvY3VtZW50RWxlbWVudFNjcm9sbGFibGVJZk5lZWRlZCk6CisKKyAgICAgICAgSGVscGVyIG1l dGhvZCB0aGF0IGNvbnRhaW5zIGxvZ2ljIGZvciBvdmVycmlkaW5nIHNjcm9sbGFiaWxpdHkgb24g dGhlIGJvZHkgb3IgaHRtbCBlbGVtZW50LCBpZiBuZWVkZWQuCisKKyAgICAgICAgKFdlYkNvcmU6 Ok1vZGFsQ29udGFpbmVyT2JzZXJ2ZXI6OmNsZWFyU2Nyb2xsYWJpbGl0eU92ZXJyaWRlcyk6Cisg ICAgICAgIChXZWJDb3JlOjpNb2RhbENvbnRhaW5lck9ic2VydmVyOjpoaWRlVXNlckludGVyYWN0 aW9uQmxvY2tpbmdFbGVtZW50SWZOZWVkZWQpOgorCisgICAgICAgIERyaXZlLWJ5IGZpeDogYHRh cmdldGAgaXMganVzdCBhIHJhdyBwb2ludGVyIGhlcmUsIHNvIGp1c3QgYXNzaWduIGl0IGRpcmVj dGx5IHRvIGBmb3VuZEVsZW1lbnRgIGluc3RlYWQgb2YKKyAgICAgICAgdHJ5aW5nIHRvIHVzZSBt b3ZlIHNlbWFudGljcy4KKworICAgICAgICAoV2ViQ29yZTo6TW9kYWxDb250YWluZXJPYnNlcnZl cjo6cmV2ZWFsTW9kYWxDb250YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6TW9kYWxDb250YWlu ZXJPYnNlcnZlcjo6c2hvdWxkTWFrZVZlcnRpY2FsbHlTY3JvbGxhYmxlIGNvbnN0KToKKworICAg ICAgICBBZGQgYSBoZWxwZXIgbWV0aG9kIChzaW1pbGFyIHRvIGBzaG91bGRIaWRlKClgKSB0aGF0 IGNhbiBiZSB1c2VkIHRvIG1ha2UgZWxlbWVudHMgdmVydGljYWxseSBzY3JvbGxhYmxlIGR1cmlu ZworICAgICAgICBzdHlsZSBhZGp1c3RtZW50IHRpbWUuIFNlZSBhYm92ZSBmb3IgbW9yZSBkZXRh aWxzLgorCisgICAgICAgIChXZWJDb3JlOjpNb2RhbENvbnRhaW5lck9ic2VydmVyOjp0cnlUb01h a2VCb2R5QW5kRG9jdW1lbnRFbGVtZW50U2Nyb2xsYWJsZVRocm91Z2hRdWlya3MpOgorICAgICAg ICAqIHBhZ2UvTW9kYWxDb250YWluZXJPYnNlcnZlci5oOgorICAgICAgICAqIHN0eWxlL1N0eWxl QWRqdXN0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3Qg Y29uc3QpOgorCisgICAgICAgIENvbnN1bHQgYHNob3VsZE1ha2VWZXJ0aWNhbGx5U2Nyb2xsYWJs ZWAgaW4gYWRkaXRpb24gdG8gYHNob3VsZEhpZGVgIGlmIGBNb2RhbENvbnRhaW5lck9ic2VydmVy YCBpcyBwcmVzZW50LgorCiAyMDIyLTAxLTA2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhA YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIGhlbHBlciBmdW5jdGlvbiB0aGF0IHJldHVybnMg dGhlIHZhbHVlIG9mIGEgc3RkOjpvcHRpb25hbDxUPiBvciBjb25zdHJ1Y3RzIFQgaWYgbmVlZGVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL01vZGFsQ29udGFpbmVyT2JzZXJ2ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Nb2RhbENvbnRhaW5lck9ic2VydmVyLmNwcAppbmRl eCA5MjgwMmFmN2U0NjUwODhiY2JhNzhhNGMyNjRhMmQzYjNiYTI4N2QwLi5hYjFlMTdhYjkxMWZi MDgyNjVjMjQ2YzZhMjQ1MmI5NzM1OWRmZTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL01vZGFsQ29udGFpbmVyT2JzZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv TW9kYWxDb250YWluZXJPYnNlcnZlci5jcHAKQEAgLTI2Miw4ICsyNjIsMTIgQEAgdm9pZCBNb2Rh bENvbnRhaW5lck9ic2VydmVyOjpzZXRDb250YWluZXIoRWxlbWVudCYgbmV3Q29udGFpbmVyLCBI VE1MRnJhbWVPd25lckUKICAgICAgICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgICAgICByZXR1 cm47CiAKLSAgICAgICAgaWYgKGF1dG8gb2JzZXJ2ZXIgPSBjb250YWluZXItPmRvY3VtZW50KCku bW9kYWxDb250YWluZXJPYnNlcnZlcklmRXhpc3RzKCk7IG9ic2VydmVyICYmIGNvbnRhaW5lciA9 PSBvYnNlcnZlci0+Y29udGFpbmVyKCkpCi0gICAgICAgICAgICBvYnNlcnZlci0+aGlkZVVzZXJJ bnRlcmFjdGlvbkJsb2NraW5nRWxlbWVudElmTmVlZGVkKCk7CisgICAgICAgIGF1dG8gb2JzZXJ2 ZXIgPSBjb250YWluZXItPmRvY3VtZW50KCkubW9kYWxDb250YWluZXJPYnNlcnZlcklmRXhpc3Rz KCk7CisgICAgICAgIGlmICghb2JzZXJ2ZXIgfHwgY29udGFpbmVyICE9IG9ic2VydmVyLT5jb250 YWluZXIoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBvYnNlcnZlci0+aGlkZVVz ZXJJbnRlcmFjdGlvbkJsb2NraW5nRWxlbWVudElmTmVlZGVkKCk7CisgICAgICAgIG9ic2VydmVy LT5tYWtlQm9keUFuZERvY3VtZW50RWxlbWVudFNjcm9sbGFibGVJZk5lZWRlZCgpOwogICAgIH0p OwogfQogCkBAIC01MzgsOCArNTQyLDEwIEBAIHZvaWQgTW9kYWxDb250YWluZXJPYnNlcnZlcjo6 Y29sbGVjdENsaWNrYWJsZUVsZW1lbnRzVGltZXJGaXJlZCgpCiAgICAgICAgICAgICAgICAgaWYg KGRlY2lzaW9uID09IE1vZGFsQ29udGFpbmVyRGVjaXNpb246OlNob3cpCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgICAgIGlmIChSZWZQdHIgY29udHJvbFRvQ2xp Y2sgPSBjbGFzc2lmaWVkQ29udHJvbHMuY29udHJvbFRvQ2xpY2soZGVjaXNpb24pKQorICAgICAg ICAgICAgICAgIGlmIChSZWZQdHIgY29udHJvbFRvQ2xpY2sgPSBjbGFzc2lmaWVkQ29udHJvbHMu Y29udHJvbFRvQ2xpY2soZGVjaXNpb24pKSB7CisgICAgICAgICAgICAgICAgICAgIG9ic2VydmVy LT5jbGVhclNjcm9sbGFiaWxpdHlPdmVycmlkZXMoKmRvY3VtZW50KTsKICAgICAgICAgICAgICAg ICAgICAgY29udHJvbFRvQ2xpY2stPmRpc3BhdGNoU2ltdWxhdGVkQ2xpY2sobnVsbHB0ciwgU2Vu ZE1vdXNlVXBEb3duRXZlbnRzLCBEb05vdFNob3dQcmVzc2VkTG9vayk7CisgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgZGVjaXNpb25TY29wZS5jb250aW51ZUhpZGluZ01vZGFs Q29udGFpbmVyQWZ0ZXJTY29wZSgpOwogICAgICAgICAgICAgfSk7CkBAIC01NDcsMTMgKzU1Myw2 MyBAQCB2b2lkIE1vZGFsQ29udGFpbmVyT2JzZXJ2ZXI6OmNvbGxlY3RDbGlja2FibGVFbGVtZW50 c1RpbWVyRmlyZWQoKQogICAgIH0pOwogfQogCi12b2lkIE1vZGFsQ29udGFpbmVyT2JzZXJ2ZXI6 OmhpZGVVc2VySW50ZXJhY3Rpb25CbG9ja2luZ0VsZW1lbnRJZk5lZWRlZCgpCit2b2lkIE1vZGFs Q29udGFpbmVyT2JzZXJ2ZXI6Om1ha2VCb2R5QW5kRG9jdW1lbnRFbGVtZW50U2Nyb2xsYWJsZUlm TmVlZGVkKCkKIHsKLSAgICBpZiAobV91c2VySW50ZXJhY3Rpb25CbG9ja2luZ0VsZW1lbnQpIHsK LSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgaWYgKCFjb250YWluZXIoKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgUmVmIGRvY3VtZW50ID0gY29udGFpbmVyKCktPmRvY3VtZW50 KCk7CisgICAgUmVmUHRyIHZpZXcgPSBkb2N1bWVudC0+dmlldygpOworICAgIGlmICghdmlldyB8 fCB2aWV3LT5pc1Njcm9sbGFibGUoKSkKICAgICAgICAgcmV0dXJuOworCisgICAgZG9jdW1lbnQt PnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOworCisgICAgYXV0byB2aXNp YmxlSGVpZ2h0ID0gdmlldy0+dmlzaWJsZVNpemUoKS5oZWlnaHQoKTsKKyAgICBhdXRvIHNob3Vs ZE1ha2VFbGVtZW50U2Nyb2xsYWJsZSA9IFt2aXNpYmxlSGVpZ2h0XSAoRWxlbWVudCogZWxlbWVu dCkgeworICAgICAgICBpZiAoIWVsZW1lbnQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisK KyAgICAgICAgYXV0byByZW5kZXJlciA9IGVsZW1lbnQtPnJlbmRlcmVyKCk7CisgICAgICAgIGlm ICghcmVuZGVyZXIgfHwgcmVuZGVyZXItPnN0eWxlKCkub3ZlcmZsb3dZKCkgIT0gT3ZlcmZsb3c6 OkhpZGRlbikKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gZWxl bWVudC0+Ym91bmRpbmdDbGllbnRSZWN0KCkuaGVpZ2h0KCkgPiB2aXNpYmxlSGVpZ2h0OworICAg IH07CisKKyAgICBpZiAoIW1fbWFrZUJvZHlFbGVtZW50U2Nyb2xsYWJsZSkgeworICAgICAgICBp ZiAoUmVmUHRyIGJvZHkgPSBkb2N1bWVudC0+Ym9keSgpOyBzaG91bGRNYWtlRWxlbWVudFNjcm9s bGFibGUoYm9keS5nZXQoKSkpIHsKKyAgICAgICAgICAgIG1fbWFrZUJvZHlFbGVtZW50U2Nyb2xs YWJsZSA9IHRydWU7CisgICAgICAgICAgICBib2R5LT5pbnZhbGlkYXRlU3R5bGUoKTsKKyAgICAg ICAgfQogICAgIH0KIAorICAgIGlmICghbV9tYWtlRG9jdW1lbnRFbGVtZW50U2Nyb2xsYWJsZSkg eworICAgICAgICBpZiAoUmVmUHRyIGRvY3VtZW50RWxlbWVudCA9IGRvY3VtZW50LT5kb2N1bWVu dEVsZW1lbnQoKTsgc2hvdWxkTWFrZUVsZW1lbnRTY3JvbGxhYmxlKGRvY3VtZW50RWxlbWVudC5n ZXQoKSkpIHsKKyAgICAgICAgICAgIG1fbWFrZURvY3VtZW50RWxlbWVudFNjcm9sbGFibGUgPSB0 cnVlOworICAgICAgICAgICAgZG9jdW1lbnRFbGVtZW50LT5pbnZhbGlkYXRlU3R5bGUoKTsKKyAg ICAgICAgfQorICAgIH0KK30KKwordm9pZCBNb2RhbENvbnRhaW5lck9ic2VydmVyOjpjbGVhclNj cm9sbGFiaWxpdHlPdmVycmlkZXMoRG9jdW1lbnQmIGRvY3VtZW50KQoreworICAgIGlmIChzdGQ6 OmV4Y2hhbmdlKG1fbWFrZUJvZHlFbGVtZW50U2Nyb2xsYWJsZSwgZmFsc2UpKSB7CisgICAgICAg IGlmIChhdXRvIGVsZW1lbnQgPSBkb2N1bWVudC5ib2R5KCkpCisgICAgICAgICAgICBlbGVtZW50 LT5pbnZhbGlkYXRlU3R5bGUoKTsKKyAgICB9CisKKyAgICBpZiAoc3RkOjpleGNoYW5nZShtX21h a2VEb2N1bWVudEVsZW1lbnRTY3JvbGxhYmxlLCBmYWxzZSkpIHsKKyAgICAgICAgaWYgKGF1dG8g ZWxlbWVudCA9IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpKQorICAgICAgICAgICAgZWxlbWVu dC0+aW52YWxpZGF0ZVN0eWxlKCk7CisgICAgfQorfQorCit2b2lkIE1vZGFsQ29udGFpbmVyT2Jz ZXJ2ZXI6OmhpZGVVc2VySW50ZXJhY3Rpb25CbG9ja2luZ0VsZW1lbnRJZk5lZWRlZCgpCit7Cisg ICAgaWYgKG1fdXNlckludGVyYWN0aW9uQmxvY2tpbmdFbGVtZW50KQorICAgICAgICByZXR1cm47 CisKICAgICBSZWZQdHIgY29udGFpbmVyID0gdGhpcy0+Y29udGFpbmVyKCk7CiAgICAgaWYgKCFj b250YWluZXIpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC01OTMsNyArNjQ5 LDcgQEAgdm9pZCBNb2RhbENvbnRhaW5lck9ic2VydmVyOjpoaWRlVXNlckludGVyYWN0aW9uQmxv Y2tpbmdFbGVtZW50SWZOZWVkZWQoKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlm ICghZm91bmRFbGVtZW50KQotICAgICAgICAgICAgZm91bmRFbGVtZW50ID0gV1RGTW92ZSh0YXJn ZXQpOworICAgICAgICAgICAgZm91bmRFbGVtZW50ID0gdGFyZ2V0OwogICAgIH0KIAogICAgIG1f dXNlckludGVyYWN0aW9uQmxvY2tpbmdFbGVtZW50ID0gZm91bmRFbGVtZW50LmdldCgpOwpAQCAt NjAzLDggKzY1OSwxMCBAQCB2b2lkIE1vZGFsQ29udGFpbmVyT2JzZXJ2ZXI6OmhpZGVVc2VySW50 ZXJhY3Rpb25CbG9ja2luZ0VsZW1lbnRJZk5lZWRlZCgpCiB2b2lkIE1vZGFsQ29udGFpbmVyT2Jz ZXJ2ZXI6OnJldmVhbE1vZGFsQ29udGFpbmVyKCkKIHsKICAgICBhdXRvIFtjb250YWluZXIsIGZy YW1lT3duZXJdID0gc3RkOjpleGNoYW5nZShtX2NvbnRhaW5lckFuZEZyYW1lT3duZXJGb3JDb250 cm9scywgeyB9KTsKLSAgICBpZiAoY29udGFpbmVyKQorICAgIGlmIChjb250YWluZXIpIHsKICAg ICAgICAgY29udGFpbmVyLT5pbnZhbGlkYXRlU3R5bGUoKTsKKyAgICAgICAgY2xlYXJTY3JvbGxh YmlsaXR5T3ZlcnJpZGVzKGNvbnRhaW5lci0+ZG9jdW1lbnQoKSk7CisgICAgfQogCiAgICAgaWYg KGF1dG8gZWxlbWVudCA9IHN0ZDo6ZXhjaGFuZ2UobV91c2VySW50ZXJhY3Rpb25CbG9ja2luZ0Vs ZW1lbnQsIHsgfSkpCiAgICAgICAgIGVsZW1lbnQtPmludmFsaWRhdGVTdHlsZSgpOwpAQCAtNjYw LDQgKzcxOCwxNSBAQCBzdGQ6OnBhaXI8VmVjdG9yPFdlYWtQdHI8SFRNTEVsZW1lbnQ+PiwgVmVj dG9yPFN0cmluZz4+IE1vZGFsQ29udGFpbmVyT2JzZXJ2ZXI6OgogICAgIHJldHVybiB7IFdURk1v dmUoY2xhc3NpZmlhYmxlQ29udHJvbHMpLCBXVEZNb3ZlKGNvbnRyb2xUZXh0c1RvQ2xhc3NpZnkp IH07CiB9CiAKK2Jvb2wgTW9kYWxDb250YWluZXJPYnNlcnZlcjo6c2hvdWxkTWFrZVZlcnRpY2Fs bHlTY3JvbGxhYmxlKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpIGNvbnN0Cit7CisgICAgaWYgKG1f bWFrZUJvZHlFbGVtZW50U2Nyb2xsYWJsZSAmJiBlbGVtZW50LmRvY3VtZW50KCkuYm9keSgpID09 ICZlbGVtZW50KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGlmIChtX21ha2VEb2N1bWVu dEVsZW1lbnRTY3JvbGxhYmxlICYmIGVsZW1lbnQuZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQo KSA9PSAmZWxlbWVudCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1cm4gZmFsc2U7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvTW9kYWxDb250YWluZXJPYnNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Nb2Rh bENvbnRhaW5lck9ic2VydmVyLmgKaW5kZXggODhiNTY1M2E3ODJjZjZiMDFhM2U1NGU5MjM0MDY4 MDdlMjgxMmI4ZS4uYWQxYjY1ZDkxOTRkNWQyNWExNGE5ZDQ2MGViMjZmNDA3MjBjNjM3MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Nb2RhbENvbnRhaW5lck9ic2VydmVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9Nb2RhbENvbnRhaW5lck9ic2VydmVyLmgKQEAgLTUwLDYg KzUwLDcgQEAgcHVibGljOgogICAgIE1vZGFsQ29udGFpbmVyT2JzZXJ2ZXIoKTsKICAgICB+TW9k YWxDb250YWluZXJPYnNlcnZlcigpOwogCisgICAgYm9vbCBzaG91bGRNYWtlVmVydGljYWxseVNj cm9sbGFibGUoY29uc3QgRWxlbWVudCYpIGNvbnN0OwogICAgIGlubGluZSBib29sIHNob3VsZEhp ZGUoY29uc3QgRWxlbWVudCYpIGNvbnN0OwogICAgIHZvaWQgdXBkYXRlTW9kYWxDb250YWluZXJJ Zk5lZWRlZChjb25zdCBGcmFtZVZpZXcmKTsKIApAQCAtNjQsNiArNjUsOSBAQCBwcml2YXRlOgog ICAgIHZvaWQgc2V0Q29udGFpbmVyKEVsZW1lbnQmLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqID0g bnVsbHB0cik7CiAgICAgdm9pZCBzZWFyY2hGb3JNb2RhbENvbnRhaW5lck9uQmVoYWxmT2ZGcmFt ZU93bmVySWZOZWVkZWQoSFRNTEZyYW1lT3duZXJFbGVtZW50Jik7CiAKKyAgICB2b2lkIG1ha2VC b2R5QW5kRG9jdW1lbnRFbGVtZW50U2Nyb2xsYWJsZUlmTmVlZGVkKCk7CisgICAgdm9pZCBjbGVh clNjcm9sbGFiaWxpdHlPdmVycmlkZXMoRG9jdW1lbnQmKTsKKwogICAgIEVsZW1lbnQqIGNvbnRh aW5lcigpIGNvbnN0OwogICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCogZnJhbWVPd25lckZvckNv bnRyb2xzKCkgY29uc3Q7CiAKQEAgLTc4LDYgKzgyLDggQEAgcHJpdmF0ZToKICAgICBUaW1lciBt X2NvbGxlY3RDbGlja2FibGVFbGVtZW50c1RpbWVyOwogICAgIGJvb2wgbV9jb2xsZWN0aW5nQ2xp Y2thYmxlRWxlbWVudHMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNBdHRlbXB0ZWRUb0Z1bGZp bGxQb2xpY3kgeyBmYWxzZSB9OworICAgIGJvb2wgbV9tYWtlQm9keUVsZW1lbnRTY3JvbGxhYmxl IHsgZmFsc2UgfTsKKyAgICBib29sIG1fbWFrZURvY3VtZW50RWxlbWVudFNjcm9sbGFibGUgeyBm YWxzZSB9OwogfTsKIAogaW5saW5lIHZvaWQgTW9kYWxDb250YWluZXJPYnNlcnZlcjo6b3ZlcnJp ZGVTZWFyY2hUZXJtRm9yVGVzdGluZyhjb25zdCBTdHJpbmcmIHNlYXJjaFRlcm0pCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCmluZGV4IDgyNzhhMzMzOTQ0N2UyNGEyZTBkZmFk MGIyZDkxODUwMDM5YWMyZTkuLmY3ZmZkMTFiZmNlOGE0NGFhYWM2YzNjYzFhYWJlZDJkOWQ3YWE1 OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCkBAIC01NTEsOCArNTUx LDEyIEBAIHZvaWQgQWRqdXN0ZXI6OmFkanVzdChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJl bmRlclN0eWxlKiB1c2VyQWdlbnRBcHBlYXJhbmNlCiAjZW5kaWYKIAogICAgIGlmIChtX2VsZW1l bnQpIHsKLSAgICAgICAgaWYgKGF1dG8gb2JzZXJ2ZXIgPSBtX2VsZW1lbnQtPmRvY3VtZW50KCku bW9kYWxDb250YWluZXJPYnNlcnZlcigpOyBvYnNlcnZlciAmJiBvYnNlcnZlci0+c2hvdWxkSGlk ZSgqbV9lbGVtZW50KSkKLSAgICAgICAgICAgIHN0eWxlLnNldERpc3BsYXkoRGlzcGxheVR5cGU6 Ok5vbmUpOworICAgICAgICBpZiAoYXV0byBvYnNlcnZlciA9IG1fZWxlbWVudC0+ZG9jdW1lbnQo KS5tb2RhbENvbnRhaW5lck9ic2VydmVySWZFeGlzdHMoKSkgeworICAgICAgICAgICAgaWYgKG9i c2VydmVyLT5zaG91bGRIaWRlKCptX2VsZW1lbnQpKQorICAgICAgICAgICAgICAgIHN0eWxlLnNl dERpc3BsYXkoRGlzcGxheVR5cGU6Ok5vbmUpOworICAgICAgICAgICAgaWYgKG9ic2VydmVyLT5z aG91bGRNYWtlVmVydGljYWxseVNjcm9sbGFibGUoKm1fZWxlbWVudCkpCisgICAgICAgICAgICAg ICAgc3R5bGUuc2V0T3ZlcmZsb3dZKE92ZXJmbG93OjpBdXRvKTsKKyAgICAgICAgfQogICAgIH0K IAogICAgIGFkanVzdEZvclNpdGVTcGVjaWZpY1F1aXJrcyhzdHlsZSk7CmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGFhZTI4N2EwYzVmZGJiNTY1 ZTYzZDMwZGY5YWZjYjI3NWMxMjdkNy4uMDA1ODFhZGRiM2YzODYyYThiYzc0YzA5YmQwNzRkZTVl MDE4YTE1YSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAxLTA2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNp ZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRlYWNoIG1vZGFsIGNvbnRhaW5lciBvYnNlcnZlciB0 byBtYWtlIHRoZSBib2R5IGVsZW1lbnQgc2Nyb2xsYWJsZSBpZiBuZWNlc3NhcnkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDcwOAorICAgICAgICBy ZGFyOi8vODY5NjA2NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGp1c3QgYW4gZXhpc3RpbmcgQVBJIHRlc3QgdG8gZXhlcmNpc2UgdGhlIGNoYW5n ZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21vZGFsLWNvbnRhaW5l ci13aXRoLW92ZXJsYXkuaHRtbDoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL01vZGFsQ29udGFpbmVyT2JzZXJ2YXRpb24ubW06CisgICAgICAgIChUZXN0V2ViS2l0 QVBJOjpURVNUKToKKwogMjAyMi0wMS0wNiAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR0xJQl0gTWFrZSBBUEkgdGVzdCBpbml0aWFsaXplIGxvY2Fsc3RvcmFn ZSB0byBlbnN1cmUgdGhlIGRhdGFiYXNlIGZpbGUgaXMgY3JlYXRlZApkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbW9kYWwtY29udGFpbmVyLXdpdGgtb3Zlcmxh eS5odG1sIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbW9kYWwtY29udGFpbmVy LXdpdGgtb3ZlcmxheS5odG1sCmluZGV4IDgyNmEzMmZiMzEwMzJlYTE5ODEzMmQ2YWJkMmU4ZGU4 Y2Y3ZTg0ZTQuLjA4NDI3ZDgzMzI4OTRmMmFlMGRmMjM5ZGQyNWEwMWNlYzA4NTc5ODkgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L21vZGFsLWNvbnRhaW5lci13 aXRoLW92ZXJsYXkuaHRtbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9t b2RhbC1jb250YWluZXItd2l0aC1vdmVybGF5Lmh0bWwKQEAgLTEsNSArMSw1IEBACiA8IURPQ1RZ UEUgaHRtbD4KLTxodG1sPgorPGh0bWwgc3R5bGU9Im92ZXJmbG93OiBoaWRkZW47Ij4KIDxoZWFk PgogPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5p dGlhbC1zY2FsZT0xIj4KIDxzdHlsZT4KQEAgLTksNiArOSwxMCBAQCBib2R5LCBodG1sIHsKICAg ICBmb250LWZhbWlseTogc3lzdGVtLXVpOwogfQogCitib2R5IHsKKyAgICBoZWlnaHQ6IDMwMDBw eDsKK30KKwogYnV0dG9uIHsKICAgICBwYWRkaW5nOiA2cHg7CiAgICAgYm9yZGVyLXJhZGl1czog NnB4OwpAQCAtNTgsNyArNjIsNyBAQCBpZiAod2luZG93LmludGVybmFscykKICAgICBpbnRlcm5h bHMub3ZlcnJpZGVNb2RhbENvbnRhaW5lclNlYXJjaFRlcm1Gb3JUZXN0aW5nKCJoZWxsbyB3b3Js ZCIpOwogPC9zY3JpcHQ+CiA8L2hlYWQ+Ci08Ym9keT4KKzxib2R5IHN0eWxlPSJvdmVyZmxvdzog aGlkZGVuOyI+CiA8cCBpZD0iY29udGVudCI+TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNv bnNldGV0dXIgc2FkaXBzY2luZyBlbGl0ciwgc2VkIGRpYW0gbm9udW15IGVpcm1vZCB0ZW1wb3Ig aW52aWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdXlhbSBlcmF0LCBzZWQgZGlh bSB2b2x1cHR1YS48L3A+CiA8ZGl2IGlkPSJvdmVybGF5Ij48L2Rpdj4KIDxkaXYgaWQ9ImZpeGVk Ij4KQEAgLTY3LDYgKzcxLDggQEAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCiA8L2Rpdj4KIDxzY3Jp cHQ+CiBidXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCAoKSA9PiB7CisgICAgZG9jdW1l bnQuYm9keS5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgib3ZlcmZsb3ciKTsKKyAgICBkb2N1bWVudC5k b2N1bWVudEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoIm92ZXJmbG93Iik7CiAgICAgZml4 ZWQucmVtb3ZlKCk7CiAgICAgb3ZlcmxheS5yZW1vdmUoKTsKIH0pOwpkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Nb2RhbENvbnRhaW5lck9ic2VydmF0 aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Nb2RhbENvbnRh aW5lck9ic2VydmF0aW9uLm1tCmluZGV4IDQ4MDY5MzNlMmM0YzBjNTQyMmM0YTVjYzcyODVkN2E2 ZjkzMGU5M2QuLjM2ODY1NzQ3N2QzZTNjZGM4Y2FmYzIxZDRmNzFhMGI1ZTJjNjE4ODEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTW9kYWxDb250YWlu ZXJPYnNlcnZhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL01vZGFsQ29udGFpbmVyT2JzZXJ2YXRpb24ubW0KQEAgLTI1Niw3ICsyNTYsNyBAQCBURVNU KE1vZGFsQ29udGFpbmVyT2JzZXJ2YXRpb24sIERldGVjdFNlYXJjaFRlcm1JbkJvbGRUYWcpCiAg ICAgRVhQRUNUX0VRKFt3ZWJWaWV3IGxhc3RNb2RhbENvbnRhaW5lckluZm9dLmF2YWlsYWJsZVR5 cGVzLCBfV0tNb2RhbENvbnRhaW5lckNvbnRyb2xUeXBlUG9zaXRpdmUgfCBfV0tNb2RhbENvbnRh aW5lckNvbnRyb2xUeXBlTmVnYXRpdmUpOwogfQogCi1URVNUKE1vZGFsQ29udGFpbmVyT2JzZXJ2 YXRpb24sIEhpZGVVc2VySW50ZXJhY3Rpb25CbG9ja2luZ0VsZW1lbnQpCitURVNUKE1vZGFsQ29u dGFpbmVyT2JzZXJ2YXRpb24sIEhpZGVVc2VySW50ZXJhY3Rpb25CbG9ja2luZ0VsZW1lbnRBbmRN YWtlRG9jdW1lbnRTY3JvbGxhYmxlKQogewogICAgIGF1dG8gd2ViVmlldyA9IGNyZWF0ZU1vZGFs Q29udGFpbmVyV2ViVmlldygpOwogICAgIFt3ZWJWaWV3IGxvYWRCdW5kbGVQYWdlOkAibW9kYWwt Y29udGFpbmVyLXdpdGgtb3ZlcmxheSIgYW5kRGVjaWRlUG9saWN5Ol9XS01vZGFsQ29udGFpbmVy RGVjaXNpb25IaWRlQW5kSWdub3JlXTsKQEAgLTI2Niw2ICsyNjYsOCBAQCBURVNUKE1vZGFsQ29u dGFpbmVyT2JzZXJ2YXRpb24sIEhpZGVVc2VySW50ZXJhY3Rpb25CbG9ja2luZ0VsZW1lbnQpCiAK ICAgICBOU1N0cmluZyAqaGl0VGVzdGVkVGV4dCA9IFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGlu Z0phdmFTY3JpcHQ6QCJkb2N1bWVudC5lbGVtZW50RnJvbVBvaW50KDUwLCA1MCkudGV4dENvbnRl bnQiXTsKICAgICBFWFBFQ1RfVFJVRShbaGl0VGVzdGVkVGV4dCBjb250YWluc1N0cmluZzpAIkxv cmVtIl0pOworICAgIEVYUEVDVF9XS19TVFJFUSgiYXV0byIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZh bHVhdGluZ0phdmFTY3JpcHQ6QCJnZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmRvY3VtZW50RWxl bWVudCkub3ZlcmZsb3dZIl0pOworICAgIEVYUEVDVF9XS19TVFJFUSgiYXV0byIsIFt3ZWJWaWV3 IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJnZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50 LmJvZHkpLm92ZXJmbG93WSJdKTsKIH0KIAogVEVTVChNb2RhbENvbnRhaW5lck9ic2VydmF0aW9u LCBJZ25vcmVGaXhlZERvY3VtZW50RWxlbWVudCkK