228761 2021-08-03 17:22:31 -0700 Use Observer in place of VideoFullscreenManagerProxyClient 2021-08-04 16:47:54 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=228740 InRadar P2 Normal --- 1 jean-yves.avenard jean-yves.avenard jer.noble webkit-bug-importer oldest_to_newest 1781790 0 jean-yves.avenard 2021-08-03 17:22:31 -0700 This will be a nicer fix to bug 228740. We could use a WTF::Observer to notify clients that the PiP/FullScreen state has changed without having to worry about set/clearing clients. 1781791 1 webkit-bug-importer 2021-08-03 17:24:01 -0700 <rdar://problem/81489026> 1781825 2 434884 jean-yves.avenard 2021-08-03 21:46:26 -0700 Created attachment 434884 Patch 1782097 3 ews-feeder 2021-08-04 16:47:53 -0700 Committed r280670 (240275@main): <https://commits.webkit.org/240275@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434884. 434884 2021-08-03 21:46:26 -0700 2021-08-04 16:47:54 -0700 Patch bug-228761-20210804144625.patch text/plain 13694 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA1NTUwMjFlYmMwZWVkYjI3 MGEzOTYxODE2NjU1YjI5M2U1MzE3NGQuLmNlYTMzNTQ3NDQzNTc2YzRlNjI2MDQyMTY0MTJjYTE3 NjkwZjA3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMjEtMDgtMDMgIEplYW4tWXZl cyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgT2JzZXJ2ZXIgaW4gcGxh Y2Ugb2YgVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg3NjEKKyAgICAgICAgcmRhcjovL3By b2JsZW0vODE0ODkwMjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVc2UgYW4gT2JzZXJ2ZXIgbWVtYmVyIHJhdGhlciB0aGFuIGNyZWF0aW5nIGEgY2hp bGQgY2xhc3MgdGhhdCB3b3VsZCBiZSB1c2VkCisgICAgICAgIHdoZW4gdGhlIFBpUCBzdGF0ZSBj aGFuZ2UuIFRoaXMgcHJldmVudHMgaGF2aW5nIHRvIGRlYWwgd2l0aCBsaWZldGltZSBhbmQKKyAg ICAgICAgcG90ZW50aWFsbHkgc2V0dGluZyBpdCB1cCBtdWx0aXBsZSB0aW1lcy4KKyAgICAgICAg Tm8gY2hhbmdlIGluIG9ic2VydmFibGUgYmVoYXZpb3VyLCBjb3ZlcmVkIHdpdGggZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdl clByb3h5Lmg6IFJlbW92ZSBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHlDbGllbnQKKyAgICAg ICAgY2xhc3MuIFVzZSBXZWFrSGFzaFNldCB0byBzdG9yZSBvYnNlcnZlcnMuCisgICAgICAgICog VUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tbToKKyAgICAgICAg KFdlYktpdDo6VmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5OjphZGRWaWRlb0luUGljdHVyZUlu UGljdHVyZURpZENoYW5nZU9ic2VydmVyKToKKyAgICAgICAgTWV0aG9kIGFkZGVkLCByZXBsYWNl IG9sZGVyIHNldENsaWVudAorICAgICAgICAoV2ViS2l0OjpWaWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy UHJveHk6Omhhc1ZpZGVvSW5QaWN0dXJlSW5QaWN0dXJlRGlkQ2hhbmdlKToKKyAgICAgICAgSXRl cmF0ZSBvdmVyIGFsbCBvYnNlcnZlcnMgYW5kIGNhbGwgYWNjb3JkaW5nbHkuCisgICAgICAgICog VUlQcm9jZXNzL2lvcy9mdWxsc2NyZWVuL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXJJT1Mu bW06CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgaW5pdFdpdGhXZWJW aWV3Ol0pOiBSZW1vdmUgbm8gbG9uZ2VyIG5lY2Vzc2FyeQorICAgICAgICBjb2RlLgorICAgICAg ICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGRlYWxsb2NdKTogUmVtb3ZlIG5vIGxv bmdlciBuZWNlc3NhcnkKKyAgICAgICAgY29kZS4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2lu ZG93Q29udHJvbGxlciBiZWdhbkVudGVyRnVsbFNjcmVlbldpdGhJbml0aWFsRnJhbWU6ZmluYWxG cmFtZTpdKToKKyAgICAgICAgc2V0IFBpUCBjaGFuZ2Ugb2JzZXJ2ZXIgaWYgbm9uZSBhbHJlYWR5 IGV4aXN0cy4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRy b2xsZXIubW06CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgaW5pdFdp dGhXaW5kb3c6d2ViVmlldzpwYWdlOl0pOiBSZW1vdmUgbm8gbG9uZ2VyIG5lY2Vzc2FyeQorICAg ICAgICBjb2RlLgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGRlYWxs b2NdKTogUmVtb3ZlIG5vIGxvbmdlciBuZWNlc3NhcnkKKyAgICAgICAgY29kZS4KKyAgICAgICAg KC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBjbGVhclZpZGVvRnVsbHNjcmVlbk1hbmFn ZXJPYnNlcnZlcl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIHNl dFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJPYnNlcnZlcl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3Jl ZW5XaW5kb3dDb250cm9sbGVyIGRpZEV4aXRQaWN0dXJlSW5QaWN0dXJlXSk6CisgICAgICAgICgt W1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgd2luZG93RGlkRW50ZXJGdWxsU2NyZWVuOl0p OgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIHdpbmRvd0RpZEZhaWxU b0V4aXRGdWxsU2NyZWVuOl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9s bGVyIHdpbmRvd0RpZEV4aXRGdWxsU2NyZWVuOl0pOgorCiAyMDIxLTA4LTAzICBKZWFuLVl2ZXMg QXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI4MDU2OCk6 IEFTU0VSVElPTiBGQUlMRUQ6IHZpZGVvRnVsbHNjcmVlbk1hbmFnZXItPmNsaWVudCgpID09ICZf dmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oCmlu ZGV4IDg5ZjAzNmJmMjdiMWQ4MGJlOTFiOWJjZWU1ZjNiNzBkMWRmZDdmZDAuLmM3ZTBhMGFkMTg1 ODcyZjU1ZjhlNGViNTQ3ZTdkMDIxZjkyYzg2ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oCkBA IC0zNyw4ICszNywxMCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvVmlkZW9GdWxsc2NyZWVuTW9kZWwu aD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+Cisj aW5jbHVkZSA8d3RmL09ic2VydmVyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNp bmNsdWRlIDx3dGYvUmVmUHRyLmg+CisjaW5jbHVkZSA8d3RmL1dlYWtIYXNoU2V0Lmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQpA QCAtMTIzLDEzICsxMjUsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9oYXNWaWRlbyB7IGZhbHNl IH07CiB9OwogCi1jbGFzcyBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHlDbGllbnQgOiBwdWJs aWMgQ2FuTWFrZVdlYWtQdHI8VmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50PiB7Ci1w dWJsaWM6Ci0gICAgdmlydHVhbCB+VmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50KCkg eyB9OwotCi0gICAgdmlydHVhbCB2b2lkIGhhc1ZpZGVvSW5QaWN0dXJlSW5QaWN0dXJlRGlkQ2hh bmdlKGJvb2wgdmFsdWUpID0gMDsKLX07Ci0KIGNsYXNzIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQ cm94eSA6IHB1YmxpYyBSZWZDb3VudGVkPFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eT4sIHBy aXZhdGUgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8Vmlk ZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5PiBjcmVhdGUoV2ViUGFnZVByb3h5JiwgUGxheWJhY2tT ZXNzaW9uTWFuYWdlclByb3h5Jik7CkBAIC0xNTAsOCArMTQ1LDggQEAgcHVibGljOgogICAgIGJv b2wgaXNQbGF5aW5nVmlkZW9JbkVuaGFuY2VkRnVsbHNjcmVlbigpIGNvbnN0OwogCiAgICAgUGxh dGZvcm1WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2UqIGNvbnRyb2xzTWFuYWdlckludGVyZmFjZSgp OwotICAgIHZvaWQgc2V0Q2xpZW50KFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eUNsaWVudCog Y2xpZW50KSB7IG1fY2xpZW50ID0gbWFrZVdlYWtQdHIoY2xpZW50KTsgfQotICAgIFZpZGVvRnVs bHNjcmVlbk1hbmFnZXJQcm94eUNsaWVudCogY2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGll bnQuZ2V0KCk7IH0KKyAgICB1c2luZyBWaWRlb0luUGljdHVyZUluUGljdHVyZURpZENoYW5nZU9i c2VydmVyID0gV1RGOjpPYnNlcnZlcjx2b2lkKGJvb2wpPjsKKyAgICB2b2lkIGFkZFZpZGVvSW5Q aWN0dXJlSW5QaWN0dXJlRGlkQ2hhbmdlT2JzZXJ2ZXIoY29uc3QgVmlkZW9JblBpY3R1cmVJblBp Y3R1cmVEaWRDaGFuZ2VPYnNlcnZlciYpOwogCiAgICAgdm9pZCBmb3JFYWNoU2Vzc2lvbihGdW5j dGlvbjx2b2lkKFZpZGVvRnVsbHNjcmVlbk1vZGVsQ29udGV4dCYsIFBsYXRmb3JtVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlJik+JiYpOwogCkBAIC0yMTIsOCArMjA3LDggQEAgcHJpdmF0ZToKICAg ICBIYXNoTWFwPFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyLCBNb2RlbEludGVyZmFj ZVR1cGxlPiBtX2NvbnRleHRNYXA7CiAgICAgUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZp ZXIgbV9jb250cm9sc01hbmFnZXJDb250ZXh0SWQ7CiAgICAgSGFzaE1hcDxQbGF5YmFja1Nlc3Np b25Db250ZXh0SWRlbnRpZmllciwgaW50PiBtX2NsaWVudENvdW50czsKLSAgICBXZWFrUHRyPFZp ZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eUNsaWVudD4gbV9jbGllbnQ7CiAgICAgVmVjdG9yPENv bXBsZXRpb25IYW5kbGVyPHZvaWQoKT4+IG1fY2xvc2VDb21wbGV0aW9uSGFuZGxlcnM7CisgICAg V2Vha0hhc2hTZXQ8VmlkZW9JblBpY3R1cmVJblBpY3R1cmVEaWRDaGFuZ2VPYnNlcnZlcj4gbV9w aXBDaGFuZ2VPYnNlcnZlcnM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQ cm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1h bmFnZXJQcm94eS5tbQppbmRleCAzM2UzM2E1NWRjOTU0YWY4ZjEyZWI4ZDIxODJjNzgyNzk0MjU3 OWU1Li4zNGU3NjY5ZjlkOGQ1YWFmY2Y5Y2VkNGRkYjFkNDBmZTk2NjFlYWNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJv eHkubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVu TWFuYWdlclByb3h5Lm1tCkBAIC01MTEsMTEgKzUxMSwxNiBAQCB2b2lkIFZpZGVvRnVsbHNjcmVl bk1hbmFnZXJQcm94eTo6Zm9yRWFjaFNlc3Npb24oRnVuY3Rpb248dm9pZChWaWRlb0Z1bGxzY3Jl ZW5NbwogICAgIH0KIH0KIAordm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OmFkZFZp ZGVvSW5QaWN0dXJlSW5QaWN0dXJlRGlkQ2hhbmdlT2JzZXJ2ZXIoY29uc3QgVmlkZW9JblBpY3R1 cmVJblBpY3R1cmVEaWRDaGFuZ2VPYnNlcnZlciYgb2JzZXJ2ZXIpCit7CisgICAgQVNTRVJUKCFt X3BpcENoYW5nZU9ic2VydmVycy5jb250YWlucyhvYnNlcnZlcikpOworICAgIG1fcGlwQ2hhbmdl T2JzZXJ2ZXJzLmFkZChvYnNlcnZlcik7Cit9CisKIHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFuYWdl clByb3h5OjpoYXNWaWRlb0luUGljdHVyZUluUGljdHVyZURpZENoYW5nZShib29sIHZhbHVlKQog ewogICAgIG1fcGFnZS0+dWlDbGllbnQoKS5oYXNWaWRlb0luUGljdHVyZUluUGljdHVyZURpZENo YW5nZShtX3BhZ2UsIHZhbHVlKTsKLSAgICBpZiAobV9jbGllbnQpCi0gICAgICAgIG1fY2xpZW50 LT5oYXNWaWRlb0luUGljdHVyZUluUGljdHVyZURpZENoYW5nZSh2YWx1ZSk7CisgICAgbV9waXBD aGFuZ2VPYnNlcnZlcnMuZm9yRWFjaChbdmFsdWVdIChhdXRvJiBvYnNlcnZlcikgeyBvYnNlcnZl cih2YWx1ZSk7IH0pOwogfQogCiAjcHJhZ21hIG1hcmsgTWVzc2FnZXMgZnJvbSBWaWRlb0Z1bGxz Y3JlZW5NYW5hZ2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZnVs bHNjcmVlbi9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVySU9TLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL2Z1bGxzY3JlZW4vV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcklP Uy5tbQppbmRleCBmMjA0YjE4MzQzNWJiZjYyY2UxNmM4ODRlOTY3YjY5NzA3YTFlNTI5Li5lMTlm ZjVjYjI0ZjAxZTkzMTA4MmQ1NThmMzNlZGQyYWUwZDNiZjBkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZnVsbHNjcmVlbi9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9s bGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mdWxsc2NyZWVuL1dL RnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXJJT1MubW0KQEAgLTQzNSwyMyArNDM1LDYgQEAgLSAo dm9pZClkaWRFbnRlclBpY3R1cmVJblBpY3R1cmU7CiAtICh2b2lkKWRpZEV4aXRQaWN0dXJlSW5Q aWN0dXJlOwogQGVuZAogCi1jbGFzcyBXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyVmlkZW9G dWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50IDogcHVibGljIFdlYktpdDo6VmlkZW9GdWxsc2Ny ZWVuTWFuYWdlclByb3h5Q2xpZW50IHsKLSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1 YmxpYzoKLSAgICB2b2lkIHNldFBhcmVudChXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyICpw YXJlbnQpIHsgbV9wYXJlbnQgPSBwYXJlbnQ7IH0KLQotcHJpdmF0ZToKLSAgICB2b2lkIGhhc1Zp ZGVvSW5QaWN0dXJlSW5QaWN0dXJlRGlkQ2hhbmdlKGJvb2wgdmFsdWUpIGZpbmFsCi0gICAgewot ICAgICAgICBpZiAodmFsdWUpCi0gICAgICAgICAgICBbbV9wYXJlbnQgZGlkRW50ZXJQaWN0dXJl SW5QaWN0dXJlXTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgW21fcGFyZW50IGRpZEV4aXRQ aWN0dXJlSW5QaWN0dXJlXTsKLSAgICB9Ci0KLSAgICBXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9s bGVyICptX3BhcmVudCB7IG51bGxwdHIgfTsKLX07Ci0KICNwcmFnbWEgbWFyayAtCiAKIEBpbXBs ZW1lbnRhdGlvbiBXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIHsKQEAgLTQ3MCw3ICs0NTMs NyBAQCBAaW1wbGVtZW50YXRpb24gV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciB7CiAgICAg UmV0YWluUHRyPFVJUGluY2hHZXN0dXJlUmVjb2duaXplcj4gX2ludGVyYWN0aXZlUGluY2hEaXNt aXNzR2VzdHVyZVJlY29nbml6ZXI7CiAgICAgUmV0YWluUHRyPFdLRnVsbFNjcmVlbkludGVyYWN0 aXZlVHJhbnNpdGlvbj4gX2ludGVyYWN0aXZlRGlzbWlzc1RyYW5zaXRpb25Db29yZGluYXRvcjsK IAotICAgIFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy UHJveHlDbGllbnQgX3ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eUNsaWVudDsKKyAgICBzdGQ6 OnVuaXF1ZV9wdHI8V2ViS2l0OjpWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OlZpZGVvSW5Q aWN0dXJlSW5QaWN0dXJlRGlkQ2hhbmdlT2JzZXJ2ZXI+IF9waXBPYnNlcnZlcjsKICAgICBCT09M IF9zaG91bGRSZXR1cm5Ub0Z1bGxzY3JlZW5Gcm9tUGljdHVyZUluUGljdHVyZTsKICAgICBCT09M IF9lbnRlckZ1bGxzY3JlZW5OZWVkc0V4aXRQaWN0dXJlSW5QaWN0dXJlOwogICAgIEJPT0wgX3Jl dHVyblRvRnVsbHNjcmVlbkZyb21QaWN0dXJlSW5QaWN0dXJlOwpAQCAtNDk3LDcgKzQ4MCw2IEBA IC0gKGlkKWluaXRXaXRoV2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldwogICAgICAgICByZXR1 cm4gbmlsOwogCiAgICAgc2VsZi5fd2ViVmlldyA9IHdlYlZpZXc7Ci0gICAgX3ZpZGVvRnVsbHNj cmVlbk1hbmFnZXJQcm94eUNsaWVudC5zZXRQYXJlbnQoc2VsZik7CiAKICAgICByZXR1cm4gc2Vs ZjsKIH0KQEAgLTUwNyw4ICs0ODksNiBAQCAtICh2b2lkKWRlYWxsb2MKICAgICBbTlNPYmplY3Qg Y2FuY2VsUHJldmlvdXNQZXJmb3JtUmVxdWVzdHNXaXRoVGFyZ2V0OnNlbGZdOwogICAgIFtbTlNO b3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2VsZl07CiAK LSAgICBfdmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50LnNldFBhcmVudChudWxscHRy KTsKLQogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KIApAQCAtNjk1LDggKzY3NSwxNSBAQCAtICh2 b2lkKWJlZ2FuRW50ZXJGdWxsU2NyZWVuV2l0aEluaXRpYWxGcmFtZTooQ0dSZWN0KWluaXRpYWxG cmFtZSBmaW5hbEZyYW1lOihDRwogI2VuZGlmCiAKICAgICAgICAgICAgIGlmIChhdXRvKiB2aWRl b0Z1bGxzY3JlZW5NYW5hZ2VyID0gc2VsZi5fdmlkZW9GdWxsc2NyZWVuTWFuYWdlcikgewotICAg ICAgICAgICAgICAgIHZpZGVvRnVsbHNjcmVlbk1hbmFnZXItPnNldENsaWVudCgmX3ZpZGVvRnVs bHNjcmVlbk1hbmFnZXJQcm94eUNsaWVudCk7Ci0KKyAgICAgICAgICAgICAgICBpZiAoIV9waXBP YnNlcnZlcikgeworICAgICAgICAgICAgICAgICAgICBfcGlwT2JzZXJ2ZXIgPSBXVEY6Om1ha2VV bmlxdWU8V2ViS2l0OjpWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OlZpZGVvSW5QaWN0dXJl SW5QaWN0dXJlRGlkQ2hhbmdlT2JzZXJ2ZXI+KFtzZWxmXSAoYm9vbCBpblBpUCkgeworICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKGluUGlQKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg IFtzZWxmIGRpZEVudGVyUGljdHVyZUluUGljdHVyZV07CisgICAgICAgICAgICAgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgW3NlbGYgZGlkRXhpdFBpY3R1cmVJ blBpY3R1cmVdOworICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICAgICAg dmlkZW9GdWxsc2NyZWVuTWFuYWdlci0+YWRkVmlkZW9JblBpY3R1cmVJblBpY3R1cmVEaWRDaGFu Z2VPYnNlcnZlcigqX3BpcE9ic2VydmVyKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgaWYgKGF1dG8qIHZpZGVvRnVsbHNjcmVlbkludGVyZmFjZSA9IHZpZGVvRnVsbHNjcmVl bk1hbmFnZXIgPyB2aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLT5jb250cm9sc01hbmFnZXJJbnRlcmZh Y2UoKSA6IG51bGxwdHIpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKF9yZXR1cm5Ub0Z1bGxz Y3JlZW5Gcm9tUGljdHVyZUluUGljdHVyZSkKICAgICAgICAgICAgICAgICAgICAgICAgIHZpZGVv RnVsbHNjcmVlbkludGVyZmFjZS0+cHJlcGFyZWRUb1JldHVyblRvU3RhbmRieSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRy b2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93 Q29udHJvbGxlci5tbQppbmRleCBjMzFmYjk1NjBhMDJkZWMzNzM2NTNiOWFkYmU2MDJiYjQ5ZTNm ZDdiLi5lODM5ZWZiMmU1YTQ1M2U4OWRjYWMzMjBmZDk1ZGY1ZDUwZGZkMTg3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93 Q29udHJvbGxlci5tbQpAQCAtNTksMjMgKzU5LDYgQEAgLSAodm9pZClkaWRFbnRlclBpY3R1cmVJ blBpY3R1cmU7CiAtICh2b2lkKWRpZEV4aXRQaWN0dXJlSW5QaWN0dXJlOwogQGVuZAogCi1jbGFz cyBXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5 Q2xpZW50IDogcHVibGljIFdlYktpdDo6VmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50 IHsKLSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICB2b2lkIHNldFBh cmVudChXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyICpwYXJlbnQpIHsgbV9wYXJlbnQgPSBw YXJlbnQ7IH0KLQotcHJpdmF0ZToKLSAgICB2b2lkIGhhc1ZpZGVvSW5QaWN0dXJlSW5QaWN0dXJl RGlkQ2hhbmdlKGJvb2wgdmFsdWUpIGZpbmFsCi0gICAgewotICAgICAgICBpZiAodmFsdWUpCi0g ICAgICAgICAgICBbbV9wYXJlbnQgZGlkRW50ZXJQaWN0dXJlSW5QaWN0dXJlXTsKLSAgICAgICAg ZWxzZQotICAgICAgICAgICAgW21fcGFyZW50IGRpZEV4aXRQaWN0dXJlSW5QaWN0dXJlXTsKLSAg ICB9Ci0KLSAgICBXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyICptX3BhcmVudCB7IG51bGxw dHIgfTsKLX07Ci0KIGVudW0gRnVsbFNjcmVlblN0YXRlIDogTlNJbnRlZ2VyIHsKICAgICBOb3RJ bkZ1bGxTY3JlZW4sCiAgICAgV2FpdGluZ1RvRW50ZXJGdWxsU2NyZWVuLApAQCAtMTA0LDcgKzg3 LDcgQEAgc3RhdGljIHZvaWQgbWFrZVJlc3BvbmRlckZpcnN0UmVzcG9uZGVySWZEZXNjZW5kYW50 T2ZWaWV3KE5TV2luZG93ICp3aW5kb3csIE5TUmUKIH0KIAogQGltcGxlbWVudGF0aW9uIFdLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgewotICAgIFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHlDbGllbnQgX3ZpZGVvRnVsbHNjcmVlbk1hbmFn ZXJQcm94eUNsaWVudDsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpWaWRlb0Z1bGxzY3Jl ZW5NYW5hZ2VyUHJveHk6OlZpZGVvSW5QaWN0dXJlSW5QaWN0dXJlRGlkQ2hhbmdlT2JzZXJ2ZXI+ IF9waXBPYnNlcnZlcjsKIH0KIAogI3ByYWdtYSBtYXJrIC0KQEAgLTE0MSw4ICsxMjQsNiBAQCAt IChpZClpbml0V2l0aFdpbmRvdzooTlNXaW5kb3cgKil3aW5kb3cgd2ViVmlldzooTlNWaWV3ICop d2ViVmlldyBwYWdlOihOYWtlZFJlZgogICAgIF93ZWJWaWV3ID0gd2ViVmlldzsKICAgICBfcGFn ZSA9IHBhZ2UucHRyKCk7CiAKLSAgICBfdmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xpZW50 LnNldFBhcmVudChzZWxmKTsKLQogICAgIFtzZWxmIHZpZGVvQ29udHJvbHNNYW5hZ2VyRGlkQ2hh bmdlXTsKIAogICAgIHJldHVybiBzZWxmOwpAQCAtMTU2LDggKzEzNyw2IEBAIC0gKHZvaWQpZGVh bGxvYwogICAgIAogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVt b3ZlT2JzZXJ2ZXI6c2VsZl07CiAKLSAgICBfdmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Q2xp ZW50LnNldFBhcmVudChudWxscHRyKTsKLQogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KIApAQCAt NjM5LDIzICs2MTgsNDAgQEAgLSAodm9pZCl2aWRlb0NvbnRyb2xzTWFuYWdlckRpZENoYW5nZQog ewogfQogCi0tICh2b2lkKWRpZEVudGVyUGljdHVyZUluUGljdHVyZQorLSAodm9pZCljbGVhclZp ZGVvRnVsbHNjcmVlbk1hbmFnZXJPYnNlcnZlcgogewotICAgIGlmIChbc2VsZiBpc0Z1bGxTY3Jl ZW5dKQotICAgICAgICBbc2VsZiByZXF1ZXN0RXhpdEZ1bGxTY3JlZW5dOworICAgIF9waXBPYnNl cnZlciA9IG51bGxwdHI7CiB9CiAKLS0gKHZvaWQpc2V0VmlkZW9GdWxsc2NyZWVuTWFuYWdlckNs aWVudDooV2ViS2l0OjpWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHlDbGllbnQgKiljbGllbnQK Ky0gKHZvaWQpc2V0VmlkZW9GdWxsc2NyZWVuTWFuYWdlck9ic2VydmVyCiB7Ci0gICAgaWYgKGF1 dG8qIHZpZGVvRnVsbHNjcmVlbk1hbmFnZXIgPSBzZWxmLl92aWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy KSB7Ci0gICAgICAgIEFTU0VSVCgoY2xpZW50ICYmICF2aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLT5j bGllbnQoKSkgfHwgKCFjbGllbnQgJiYgdmlkZW9GdWxsc2NyZWVuTWFuYWdlci0+Y2xpZW50KCkg PT0gJl92aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHlDbGllbnQpKTsKLSAgICAgICAgdmlkZW9G dWxsc2NyZWVuTWFuYWdlci0+c2V0Q2xpZW50KGNsaWVudCk7Ci0gICAgfQorICAgIGF1dG8qIHZp ZGVvRnVsbHNjcmVlbk1hbmFnZXIgPSBzZWxmLl92aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOworICAg IGlmICghdmlkZW9GdWxsc2NyZWVuTWFuYWdlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgQVNT RVJUKCFfcGlwT2JzZXJ2ZXIpOworICAgIGlmIChfcGlwT2JzZXJ2ZXIpCisgICAgICAgIHJldHVy bjsKKworICAgIF9waXBPYnNlcnZlciA9IFdURjo6bWFrZVVuaXF1ZTxXZWJLaXQ6OlZpZGVvRnVs bHNjcmVlbk1hbmFnZXJQcm94eTo6VmlkZW9JblBpY3R1cmVJblBpY3R1cmVEaWRDaGFuZ2VPYnNl cnZlcj4oW3NlbGZdIChib29sIGluUGlQKSB7CisgICAgICAgIGlmIChpblBpUCkKKyAgICAgICAg ICAgIFtzZWxmIGRpZEVudGVyUGljdHVyZUluUGljdHVyZV07CisgICAgICAgIGVsc2UKKyAgICAg ICAgICAgIFtzZWxmIGRpZEV4aXRQaWN0dXJlSW5QaWN0dXJlXTsKKyAgICB9KTsKKworICAgIHZp ZGVvRnVsbHNjcmVlbk1hbmFnZXItPmFkZFZpZGVvSW5QaWN0dXJlSW5QaWN0dXJlRGlkQ2hhbmdl T2JzZXJ2ZXIoKl9waXBPYnNlcnZlcik7Cit9CisKKy0gKHZvaWQpZGlkRW50ZXJQaWN0dXJlSW5Q aWN0dXJlCit7CisgICAgaWYgKFtzZWxmIGlzRnVsbFNjcmVlbl0pCisgICAgICAgIFtzZWxmIHJl cXVlc3RFeGl0RnVsbFNjcmVlbl07CiB9CiAKIC0gKHZvaWQpZGlkRXhpdFBpY3R1cmVJblBpY3R1 cmUKIHsKLSAgICBbc2VsZiBzZXRWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyQ2xpZW50Om51bGxwdHJd OworICAgIFtzZWxmIGNsZWFyVmlkZW9GdWxsc2NyZWVuTWFuYWdlck9ic2VydmVyXTsKIH0KIAog I3ByYWdtYSBtYXJrIC0KQEAgLTY5MCwyMSArNjg2LDIxIEBAIC0gKHZvaWQpd2luZG93RGlkRW50 ZXJGdWxsU2NyZWVuOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgogewogICAgIFJldGFp blB0cjxXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyPiByZXRhaW4gPSBzZWxmOwogICAgIFtz ZWxmIGZpbmlzaGVkRW50ZXJGdWxsU2NyZWVuQW5pbWF0aW9uOllFU107Ci0gICAgW3NlbGYgc2V0 VmlkZW9GdWxsc2NyZWVuTWFuYWdlckNsaWVudDomX3ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94 eUNsaWVudF07CisgICAgW3NlbGYgc2V0VmlkZW9GdWxsc2NyZWVuTWFuYWdlck9ic2VydmVyXTsK IH0KIAogLSAodm9pZCl3aW5kb3dEaWRGYWlsVG9FeGl0RnVsbFNjcmVlbjooTlNXaW5kb3cgKil3 aW5kb3cKIHsKICAgICBSZXRhaW5QdHI8V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcj4gcmV0 YWluID0gc2VsZjsKICAgICBbc2VsZiBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOk5P XTsKLSAgICBbc2VsZiBzZXRWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyQ2xpZW50Om51bGxwdHJdOwor ICAgIFtzZWxmIGNsZWFyVmlkZW9GdWxsc2NyZWVuTWFuYWdlck9ic2VydmVyXTsKIH0KIAogLSAo dm9pZCl3aW5kb3dEaWRFeGl0RnVsbFNjcmVlbjooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRp b24KIHsKICAgICBSZXRhaW5QdHI8V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcj4gcmV0YWlu ID0gc2VsZjsKICAgICBbc2VsZiBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOllFU107 Ci0gICAgW3NlbGYgc2V0VmlkZW9GdWxsc2NyZWVuTWFuYWdlckNsaWVudDpudWxscHRyXTsKKyAg ICBbc2VsZiBjbGVhclZpZGVvRnVsbHNjcmVlbk1hbmFnZXJPYnNlcnZlcl07CiB9CiAKIC0gKE5T V2luZG93ICopZGVzdGluYXRpb25XaW5kb3dUb0V4aXRGdWxsU2NyZWVuRm9yV2luZG93OihOU1dp bmRvdyAqKXdpbmRvdwo=