179509 2017-11-09 15:27:16 -0800 [LayoutState cleanup] Remove explicit pop from LayoutState 2017-11-09 16:31:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1370072 0 zalan 2017-11-09 15:27:16 -0800 d'tor should take care of the pop. 1370073 1 webkit-bug-importer 2017-11-09 15:27:41 -0800 <rdar://problem/35454323> 1370077 2 326497 zalan 2017-11-09 15:32:59 -0800 Created attachment 326497 Patch 1370104 3 326497 commit-queue 2017-11-09 16:31:27 -0800 Comment on attachment 326497 Patch Clearing flags on attachment: 326497 Committed r224653: <https://trac.webkit.org/changeset/224653> 1370105 4 commit-queue 2017-11-09 16:31:29 -0800 All reviewed patches have been landed. Closing bug. 326497 2017-11-09 15:32:59 -0800 2017-11-09 16:31:27 -0800 Patch bug-179509-20171109153259.patch text/plain 10432 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRjMDNkOWVlOGYzMmUz YzExMzY0NjViMDAzZmEzNWNlODEzN2ZlMS4uMjFmNDk1ODQ3NDViOTRmNjYyYTEzNTJhMjcyNzY5 OWU3MzZmYWI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTExLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFN0YXRlIGNsZWFu dXBdIFJlbW92ZSBleHBsaWNpdCBwb3AgZnJvbSBMYXlvdXRTdGF0ZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NTA5CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8zNTQ1NDMyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBCb3RoIHJlbGF5b3V0Rm9yUGFnaW5hdGlvbigpL3JlbGF5b3V0VG9Bdm9pZFdp ZG93cygpIGNhbGwgbGF5b3V0IHJlY3Vyc2l2ZWx5IHdoaWNoIHJlcXVpcmVzCisgICAgICAgIG1h bnVhbCBsYXlvdXQgc3RhdGUgcG9wLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyB0aGlzIGlzc3VlIGJ5 IGNvbnN0cnVjdGluZyBhIG5ldyBMYXlvdXRTdGF0ZSBvYmplY3QKKyAgICAgICAgZm9yIHRoZSBw b3NpdGlvbmVkIGRlc2NlbmRhbnRzLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0U3RhdGVNYWludGFpbmVyOjp+TGF5b3V0U3RhdGVNYWludGFpbmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRlTWFpbnRhaW5lcjo6cG9wKTogRGVsZXRlZC4KKyAg ICAgICAgKiByZW5kZXJpbmcvTGF5b3V0U3RhdGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6bGF5 b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpyZWxheW91dFRv QXZvaWRXaWRvd3MpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpyZWxheW91 dEZvclBhZ2luYXRpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoK KwogMjAxNy0xMS0wOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMYXlvdXRTdGF0ZSBjbGVhbnVwXSBSZW1vdmUgcmVkdW5kYW50IExheW91dFN0YXRlIGMndG9y CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcAppbmRleCA5YzFlMmQ3ZGUw ZTJhODhmYzZkM2NiOTExZTRjMDIwNmIxZTI1ZmUzLi5kN2IzOTU1ZDdhOGFhY2I4ZTIzNmFmMTRl OTFlZTYwNDQ2ZWZkNTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5 b3V0U3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5j cHAKQEAgLTI4MywxNSArMjgzLDYgQEAgTGF5b3V0U3RhdGVNYWludGFpbmVyOjpMYXlvdXRTdGF0 ZU1haW50YWluZXIoUmVuZGVyQm94JiByb290LCBMYXlvdXRTaXplIG9mZnNldCwKIAogTGF5b3V0 U3RhdGVNYWludGFpbmVyOjp+TGF5b3V0U3RhdGVNYWludGFpbmVyKCkKIHsKLSAgICAvLyBGSVhN RTogUmVtb3ZlIGNvbmRpdGlvbmFsIHBvcC4KLSAgICBpZiAoIW1fZGlkQ2FsbFBvcCkKLSAgICAg ICAgcG9wKCk7Ci19Ci0KLXZvaWQgTGF5b3V0U3RhdGVNYWludGFpbmVyOjpwb3AoKQotewotICAg IEFTU0VSVCghbV9kaWRDYWxsUG9wKTsKLSAgICBtX2RpZENhbGxQb3AgPSB0cnVlOwogICAgIGlm ICghbV9kaWRQdXNoTGF5b3V0U3RhdGUpCiAgICAgICAgIHJldHVybjsKICAgICBtX2NvbnRleHQu cG9wTGF5b3V0U3RhdGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9M YXlvdXRTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmgKaW5k ZXggYzIxZTM5MGE4ZmRjMmY5MTE2NTc3MGVhZDllOTA3YmY2ZWViMjc0Ny4uM2QzYzk3MzBjMjk3 Nzg2ZWNhZDEzYjYzMDQ1NjYyYjkxOThiNTM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0xheW91dFN0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xh eW91dFN0YXRlLmgKQEAgLTE0MSwxMiArMTQxLDkgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IExh eW91dFN0YXRlTWFpbnRhaW5lcihSZW5kZXJCb3gmLCBMYXlvdXRTaXplIG9mZnNldCwgYm9vbCBk aXNhYmxlU3RhdGUgPSBmYWxzZSwgTGF5b3V0VW5pdCBwYWdlSGVpZ2h0ID0gMCwgYm9vbCBwYWdl SGVpZ2h0Q2hhbmdlZCA9IGZhbHNlKTsKICAgICB+TGF5b3V0U3RhdGVNYWludGFpbmVyKCk7CiAK LSAgICB2b2lkIHBvcCgpOwotCiBwcml2YXRlOgogICAgIExheW91dENvbnRleHQmIG1fY29udGV4 dDsKICAgICBib29sIG1fcGFpbnRPZmZzZXRDYWNoZUlzRGlzYWJsZWQgeyBmYWxzZSB9OwotICAg IGJvb2wgbV9kaWRDYWxsUG9wIHsgZmFsc2UgfTsKICAgICBib29sIG1fZGlkUHVzaExheW91dFN0 YXRlIHsgZmFsc2UgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5jcHAKaW5kZXggYjJkMWJkNjU5Yjk5ZDEzNmM5MzU3NTIyZmExZGY1MzZhZTA2NDUw NC4uNzg0ZTA5MGNiYThhYTgzNjgzOGI2MzA4ZDkwOTdiZGI5MmMwZmYyZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTQ3Nyw2ICs0NzcsNyBA QCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2soYm9vbCByZWxheW91dENoaWxkcmVu LCBMYXlvdXRVbml0IHBhZ2VMb2dpY2FsSAogCiAgICAgTGF5b3V0VW5pdCByZXBhaW50TG9naWNh bFRvcCA9IDA7CiAgICAgTGF5b3V0VW5pdCByZXBhaW50TG9naWNhbEJvdHRvbSA9IDA7CisgICAg TGF5b3V0VW5pdCBtYXhGbG9hdExvZ2ljYWxCb3R0b20gPSAwOwogICAgIGNvbnN0IFJlbmRlclN0 eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKICAgICB7CiAgICAgICAgIExheW91dFN0YXRlTWFp bnRhaW5lciBzdGF0ZVB1c2hlcigqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzVHJhbnNmb3Jt KCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlVG9Vc2UuaXNGbGlwcGVkQmxvY2tzV3JpdGlu Z01vZGUoKSwgcGFnZUxvZ2ljYWxIZWlnaHQsIHBhZ2VMb2dpY2FsSGVpZ2h0Q2hhbmdlZCk7CkBA IC01MDEsMzUgKzUwMiwzOSBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2soYm9v bCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0IHBhZ2VMb2dpY2FsSAogICAgICAgICAgICAg c2V0SGFzTWFyZ2luQWZ0ZXJRdWlyayhzdHlsZVRvVXNlLmhhc01hcmdpbkFmdGVyUXVpcmsoKSk7 CiAgICAgICAgICAgICBzZXRQYWdpbmF0aW9uU3RydXQoMCk7CiAgICAgICAgIH0KLSAgICAgICAg TGF5b3V0VW5pdCBtYXhGbG9hdExvZ2ljYWxCb3R0b20gPSAwOwogICAgICAgICBpZiAoIWZpcnN0 Q2hpbGQoKSAmJiAhaXNBbm9ueW1vdXNCbG9jaygpKQogICAgICAgICAgICAgc2V0Q2hpbGRyZW5J bmxpbmUodHJ1ZSk7CiAgICAgICAgIGlmIChjaGlsZHJlbklubGluZSgpKQogICAgICAgICAgICAg bGF5b3V0SW5saW5lQ2hpbGRyZW4ocmVsYXlvdXRDaGlsZHJlbiwgcmVwYWludExvZ2ljYWxUb3As IHJlcGFpbnRMb2dpY2FsQm90dG9tKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbGF5b3V0 QmxvY2tDaGlsZHJlbihyZWxheW91dENoaWxkcmVuLCBtYXhGbG9hdExvZ2ljYWxCb3R0b20pOwor ICAgIH0KIAotICAgICAgICAvLyBFeHBhbmQgb3VyIGludHJpbnNpYyBoZWlnaHQgdG8gZW5jb21w YXNzIGZsb2F0cy4KLSAgICAgICAgTGF5b3V0VW5pdCB0b0FkZCA9IGJvcmRlckFuZFBhZGRpbmdB ZnRlcigpICsgc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpOwotICAgICAgICBpZiAobG93ZXN0Rmxv YXRMb2dpY2FsQm90dG9tKCkgPiAobG9naWNhbEhlaWdodCgpIC0gdG9BZGQpICYmIGNyZWF0ZXNO ZXdGb3JtYXR0aW5nQ29udGV4dCgpKQotICAgICAgICAgICAgc2V0TG9naWNhbEhlaWdodChsb3dl c3RGbG9hdExvZ2ljYWxCb3R0b20oKSArIHRvQWRkKTsKKyAgICAvLyBFeHBhbmQgb3VyIGludHJp bnNpYyBoZWlnaHQgdG8gZW5jb21wYXNzIGZsb2F0cy4KKyAgICBMYXlvdXRVbml0IHRvQWRkID0g Ym9yZGVyQW5kUGFkZGluZ0FmdGVyKCkgKyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7CisgICAg aWYgKGxvd2VzdEZsb2F0TG9naWNhbEJvdHRvbSgpID4gKGxvZ2ljYWxIZWlnaHQoKSAtIHRvQWRk KSAmJiBjcmVhdGVzTmV3Rm9ybWF0dGluZ0NvbnRleHQoKSkKKyAgICAgICAgc2V0TG9naWNhbEhl aWdodChsb3dlc3RGbG9hdExvZ2ljYWxCb3R0b20oKSArIHRvQWRkKTsKKyAgICBpZiAocmVsYXlv dXRGb3JQYWdpbmF0aW9uKCkgfHwgcmVsYXlvdXRUb0F2b2lkV2lkb3dzKCkpIHsKKyAgICAgICAg QVNTRVJUKCFzaG91bGRCcmVha0F0TGluZVRvQXZvaWRXaWRvdygpKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KIAotICAgICAgICBpZiAocmVsYXlvdXRGb3JQYWdpbmF0aW9uKHN0YXRlUHVzaGVy KSB8fCByZWxheW91dFRvQXZvaWRXaWRvd3Moc3RhdGVQdXNoZXIpKSB7Ci0gICAgICAgICAgICBB U1NFUlQoIXNob3VsZEJyZWFrQXRMaW5lVG9Bdm9pZFdpZG93KCkpOwotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB9CisgICAgLy8gQ2FsY3VsYXRlIG91ciBuZXcgaGVpZ2h0LgorICAgIExh eW91dFVuaXQgb2xkSGVpZ2h0ID0gbG9naWNhbEhlaWdodCgpOworICAgIExheW91dFVuaXQgb2xk Q2xpZW50QWZ0ZXJFZGdlID0gY2xpZW50TG9naWNhbEJvdHRvbSgpOwogCi0gICAgICAgIC8vIENh bGN1bGF0ZSBvdXIgbmV3IGhlaWdodC4KLSAgICAgICAgTGF5b3V0VW5pdCBvbGRIZWlnaHQgPSBs b2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgIExheW91dFVuaXQgb2xkQ2xpZW50QWZ0ZXJFZGdlID0g Y2xpZW50TG9naWNhbEJvdHRvbSgpOworICAgIC8vIEJlZm9yZSB1cGRhdGluZyB0aGUgZmluYWwg c2l6ZSBvZiB0aGUgZmxvdyB0aHJlYWQgbWFrZSBzdXJlIGEgZm9yY2VkIGJyZWFrIGlzIGFwcGxp ZWQgYWZ0ZXIgdGhlIGNvbnRlbnQuCisgICAgLy8gVGhpcyBlbnN1cmVzIHRoZSBzaXplIGluZm9y bWF0aW9uIGlzIGNvcnJlY3RseSBjb21wdXRlZCBmb3IgdGhlIGxhc3QgYXV0by1oZWlnaHQgZnJh Z21lbnQgcmVjZWl2aW5nIGNvbnRlbnQuCisgICAgaWYgKGlzPFJlbmRlckZyYWdtZW50ZWRGbG93 PigqdGhpcykpCisgICAgICAgIGRvd25jYXN0PFJlbmRlckZyYWdtZW50ZWRGbG93PigqdGhpcyku YXBwbHlCcmVha0FmdGVyQ29udGVudChvbGRDbGllbnRBZnRlckVkZ2UpOwogCi0gICAgICAgIC8v IEJlZm9yZSB1cGRhdGluZyB0aGUgZmluYWwgc2l6ZSBvZiB0aGUgZmxvdyB0aHJlYWQgbWFrZSBz dXJlIGEgZm9yY2VkIGJyZWFrIGlzIGFwcGxpZWQgYWZ0ZXIgdGhlIGNvbnRlbnQuCi0gICAgICAg IC8vIFRoaXMgZW5zdXJlcyB0aGUgc2l6ZSBpbmZvcm1hdGlvbiBpcyBjb3JyZWN0bHkgY29tcHV0 ZWQgZm9yIHRoZSBsYXN0IGF1dG8taGVpZ2h0IGZyYWdtZW50IHJlY2VpdmluZyBjb250ZW50Lgot ICAgICAgICBpZiAoaXM8UmVuZGVyRnJhZ21lbnRlZEZsb3c+KCp0aGlzKSkKLSAgICAgICAgICAg IGRvd25jYXN0PFJlbmRlckZyYWdtZW50ZWRGbG93PigqdGhpcykuYXBwbHlCcmVha0FmdGVyQ29u dGVudChvbGRDbGllbnRBZnRlckVkZ2UpOworICAgIHVwZGF0ZUxvZ2ljYWxIZWlnaHQoKTsKKyAg ICBMYXlvdXRVbml0IG5ld0hlaWdodCA9IGxvZ2ljYWxIZWlnaHQoKTsKKyAgICB7CisgICAgICAg IC8vIEZJWE1FOiBUaGlzIGNvdWxkIGJlIHJlbW92ZWQgb25jZSByZWxheW91dEZvclBhZ2luYXRp b24oKS9yZWxheW91dFRvQXZvaWRXaWRvd3MoKSBlaXRoZXIgc3RvcCByZWN1cnNpbmcgb3Igd2Ug bWFuYWdlIHRvCisgICAgICAgIC8vIHJlLW9yZGVyIHRoZW0uCisgICAgICAgIExheW91dFN0YXRl TWFpbnRhaW5lciBzdGF0ZVB1c2hlcigqdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzVHJhbnNm b3JtKCkgfHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlVG9Vc2UuaXNGbGlwcGVkQmxvY2tzV3Jp dGluZ01vZGUoKSwgcGFnZUxvZ2ljYWxIZWlnaHQsIHBhZ2VMb2dpY2FsSGVpZ2h0Q2hhbmdlZCk7 CiAKLSAgICAgICAgdXBkYXRlTG9naWNhbEhlaWdodCgpOwotICAgICAgICBMYXlvdXRVbml0IG5l d0hlaWdodCA9IGxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgaWYgKG9sZEhlaWdodCAhPSBuZXdI ZWlnaHQpIHsKICAgICAgICAgICAgIGlmIChvbGRIZWlnaHQgPiBuZXdIZWlnaHQgJiYgbWF4Rmxv YXRMb2dpY2FsQm90dG9tID4gbmV3SGVpZ2h0ICYmICFjaGlsZHJlbklubGluZSgpKSB7CiAgICAg ICAgICAgICAgICAgLy8gT25lIG9mIG91ciBjaGlsZHJlbidzIGZsb2F0cyBtYXkgaGF2ZSBiZWNv bWUgYW4gb3ZlcmhhbmdpbmcgZmxvYXQgZm9yIHVzLiBXZSBuZWVkIHRvIGxvb2sgZm9yIGl0LgpA QCAtNTQ1LDE0ICs1NTAsMTMgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmxheW91dEJsb2NrKGJv b2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCBwYWdlTG9naWNhbEgKICAgICAgICAgYm9v bCBoZWlnaHRDaGFuZ2VkID0gKHByZXZpb3VzSGVpZ2h0ICE9IG5ld0hlaWdodCk7CiAgICAgICAg IGlmIChoZWlnaHRDaGFuZ2VkKQogICAgICAgICAgICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRydWU7 Ci0KICAgICAgICAgbGF5b3V0UG9zaXRpb25lZE9iamVjdHMocmVsYXlvdXRDaGlsZHJlbiB8fCBp c0RvY3VtZW50RWxlbWVudFJlbmRlcmVyKCkpOworICAgIH0KKyAgICAvLyBBZGQgb3ZlcmZsb3cg ZnJvbSBjaGlsZHJlbiAodW5sZXNzIHdlJ3JlIG11bHRpLWNvbHVtbiwgc2luY2UgaW4gdGhhdCBj YXNlIGFsbCBvdXIgY2hpbGQgb3ZlcmZsb3cgaXMgY2xpcHBlZCBhbnl3YXkpLgorICAgIGNvbXB1 dGVPdmVyZmxvdyhvbGRDbGllbnRBZnRlckVkZ2UpOwogCi0gICAgICAgIC8vIEFkZCBvdmVyZmxv dyBmcm9tIGNoaWxkcmVuICh1bmxlc3Mgd2UncmUgbXVsdGktY29sdW1uLCBzaW5jZSBpbiB0aGF0 IGNhc2UgYWxsIG91ciBjaGlsZCBvdmVyZmxvdyBpcyBjbGlwcGVkIGFueXdheSkuCi0gICAgICAg IGNvbXB1dGVPdmVyZmxvdyhvbGRDbGllbnRBZnRlckVkZ2UpOworICAgIGZpdEJvcmRlclRvTGlu ZXNJZk5lZWRlZCgpOwogCi0gICAgICAgIGZpdEJvcmRlclRvTGluZXNJZk5lZWRlZCgpOwotICAg IH0KICAgICBhdXRvKiBzdGF0ZSA9IHZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCku bGF5b3V0U3RhdGUoKTsKICAgICBpZiAoc3RhdGUgJiYgc3RhdGUtPnBhZ2VMb2dpY2FsSGVpZ2h0 KCkpCiAgICAgICAgIHNldFBhZ2VMb2dpY2FsT2Zmc2V0KHN0YXRlLT5wYWdlTG9naWNhbE9mZnNl dCh0aGlzLCBsb2dpY2FsVG9wKCkpKTsKQEAgLTE3OTYsMTIgKzE4MDAsMTEgQEAgdm9pZCBSZW5k ZXJCbG9ja0Zsb3c6OmNsZWFyU2hvdWxkQnJlYWtBdExpbmVUb0F2b2lkV2lkb3coKSBjb25zdAog ICAgIHJhcmVCbG9ja0Zsb3dEYXRhKCktPm1fbGluZUJyZWFrVG9Bdm9pZFdpZG93ID0gLTE7CiB9 CiAKLWJvb2wgUmVuZGVyQmxvY2tGbG93OjpyZWxheW91dFRvQXZvaWRXaWRvd3MoTGF5b3V0U3Rh dGVNYWludGFpbmVyJiBzdGF0ZVB1c2hlcikKK2Jvb2wgUmVuZGVyQmxvY2tGbG93OjpyZWxheW91 dFRvQXZvaWRXaWRvd3MoKQogewogICAgIGlmICghc2hvdWxkQnJlYWtBdExpbmVUb0F2b2lkV2lk b3coKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgc3RhdGVQdXNoZXIucG9wKCk7CiAg ICAgc2V0RXZlckhhZExheW91dCh0cnVlKTsKICAgICBsYXlvdXRCbG9jayhmYWxzZSk7CiAgICAg cmV0dXJuIHRydWU7CkBAIC0zNDk4LDcgKzM1MDEsNyBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6 cGFpbnRJbmxpbmVDaGlsZHJlbihQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9p bgogICAgIG1fbGluZUJveGVzLnBhaW50KHRoaXMsIHBhaW50SW5mbywgcGFpbnRPZmZzZXQpOwog fQogCi1ib29sIFJlbmRlckJsb2NrRmxvdzo6cmVsYXlvdXRGb3JQYWdpbmF0aW9uKExheW91dFN0 YXRlTWFpbnRhaW5lciYgc3RhdGVQdXNoZXIpCitib29sIFJlbmRlckJsb2NrRmxvdzo6cmVsYXlv dXRGb3JQYWdpbmF0aW9uKCkKIHsKICAgICBpZiAoIW11bHRpQ29sdW1uRmxvdygpIHx8ICFtdWx0 aUNvbHVtbkZsb3coKS0+c2hvdWxkUmVsYXlvdXRGb3JQYWdpbmF0aW9uKCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKQEAgLTM1MzIsOCArMzUzNSw2IEBAIGJvb2wgUmVuZGVyQmxvY2tGbG93Ojpy ZWxheW91dEZvclBhZ2luYXRpb24oTGF5b3V0U3RhdGVNYWludGFpbmVyJiBzdGF0ZVB1c2hlcikK ICAgICAgICAgICAgIG5lZWRlZFJlbGF5b3V0ID0gdHJ1ZTsKICAgICAgICAgICAgIG11bHRpQ29s dW1uRmxvdygpLT5zZXRDaGlsZE5lZWRzTGF5b3V0KE1hcmtPbmx5VGhpcyk7CiAgICAgICAgICAg ICBzZXRDaGlsZE5lZWRzTGF5b3V0KE1hcmtPbmx5VGhpcyk7Ci0gICAgICAgICAgICBpZiAoZmly c3RQYXNzKQotICAgICAgICAgICAgICAgIHN0YXRlUHVzaGVyLnBvcCgpOwogICAgICAgICAgICAg bGF5b3V0QmxvY2soZmFsc2UpOwogICAgICAgICB9CiAgICAgICAgIGZpcnN0UGFzcyA9IGZhbHNl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCmluZGV4IDAwNjhj MDZhOThiZTAxZjkzMWRmZWM3MzcwYzI0NTZjNzUxMTA4YTkuLjAxNDYyYWNlZDkxMDE4NTM4NDIz ZTA1MGMwOTEzMjQ5ZWI4YmJmNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmgKQEAgLTMzLDcgKzMzLDYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xh c3MgRmxvYXRXaXRoUmVjdDsKLWNsYXNzIExheW91dFN0YXRlTWFpbnRhaW5lcjsKIGNsYXNzIExp bmVCcmVha2VyOwogY2xhc3MgTGluZUluZm87CiBjbGFzcyBSZW5kZXJNdWx0aUNvbHVtbkZsb3c7 CkBAIC0yNTgsNyArMjU3LDcgQEAgcHVibGljOgogICAgIHZvaWQgY2xlYXJEaWRCcmVha0F0TGlu ZVRvQXZvaWRXaWRvdygpOwogICAgIHZvaWQgc2V0RGlkQnJlYWtBdExpbmVUb0F2b2lkV2lkb3co KTsKICAgICBib29sIGRpZEJyZWFrQXRMaW5lVG9Bdm9pZFdpZG93KCkgY29uc3QgeyByZXR1cm4g aGFzUmFyZUJsb2NrRmxvd0RhdGEoKSAmJiByYXJlQmxvY2tGbG93RGF0YSgpLT5tX2RpZEJyZWFr QXRMaW5lVG9Bdm9pZFdpZG93OyB9Ci0gICAgYm9vbCByZWxheW91dFRvQXZvaWRXaWRvd3MoTGF5 b3V0U3RhdGVNYWludGFpbmVyJik7CisgICAgYm9vbCByZWxheW91dFRvQXZvaWRXaWRvd3MoKTsK IAogICAgIFJvb3RJbmxpbmVCb3gqIGxpbmVHcmlkQm94KCkgY29uc3QgeyByZXR1cm4gaGFzUmFy ZUJsb2NrRmxvd0RhdGEoKSA/IHJhcmVCbG9ja0Zsb3dEYXRhKCktPm1fbGluZUdyaWRCb3guZ2V0 KCkgOiBudWxscHRyOyB9CiAgICAgdm9pZCBzZXRMaW5lR3JpZEJveChzdGQ6OnVuaXF1ZV9wdHI8 Um9vdElubGluZUJveD4gYm94KQpAQCAtNjAxLDcgKzYwMCw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHVwZGF0ZUZyYWdtZW50Rm9yTGluZShSb290SW5saW5lQm94KikgY29uc3Q7CiAKICAgICAvLyBQ YWdpbmF0aW9uIHJvdXRpbmVzLgotICAgIGJvb2wgcmVsYXlvdXRGb3JQYWdpbmF0aW9uKExheW91 dFN0YXRlTWFpbnRhaW5lciYpOworICAgIGJvb2wgcmVsYXlvdXRGb3JQYWdpbmF0aW9uKCk7CiAK ICAgICBib29sIGhhc1JhcmVCbG9ja0Zsb3dEYXRhKCkgY29uc3QgeyByZXR1cm4gbV9yYXJlQmxv Y2tGbG93RGF0YS5nZXQoKTsgfQogICAgIFJlbmRlckJsb2NrRmxvd1JhcmVEYXRhKiByYXJlQmxv Y2tGbG93RGF0YSgpIGNvbnN0IHsgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oaGFz UmFyZUJsb2NrRmxvd0RhdGEoKSk7IHJldHVybiBtX3JhcmVCbG9ja0Zsb3dEYXRhLmdldCgpOyB9 Cg==