232228 2021-10-25 02:12:19 -0700 [WPE][Qt] Do not use WebKit internals in the implementation 2021-10-28 13:59:18 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aperez aperez annulen cgarcia clopez ews-watchlist gyuyoung.kim mcatanzaro pnormand psaavedra ryuan.choi sergio webkit-bug-importer oldest_to_newest 1808325 0 aperez 2021-10-25 02:12:19 -0700 Currently the WPE Qt implementation still has a few uses of GRefPtr and GUniquePtr. These are only a handful, and could be easily removed. Doing this would allow packagers to split building of the Qt API away from the rest of a WPE port build, in its own package, without needing to rebuild all WebKit for something that is essentially a layer which build on top of the public WPE port API. 1809649 1 442702 aperez 2021-10-28 06:46:44 -0700 Created attachment 442702 Patch 1809781 2 442729 aperez 2021-10-28 12:20:22 -0700 Created attachment 442729 Patch Same patch as before, rebased after the fix for bug #232435 got landed 1809786 3 mcatanzaro 2021-10-28 12:38:37 -0700 All looks good to me. I assume Phil will want to review it, though. 1809811 4 aperez 2021-10-28 13:33:58 -0700 (In reply to Michael Catanzaro from comment #3) > All looks good to me. I assume Phil will want to review it, though. I had discussed with Philippe the possibility of making this patch before submitting it, so I was indeed waiting for his review :) Thanks to you both! 1809820 5 ews-feeder 2021-10-28 13:58:06 -0700 Committed r285000 (243646@main): <https://commits.webkit.org/243646@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442729. 1809821 6 webkit-bug-importer 2021-10-28 13:59:18 -0700 <rdar://problem/84776484> 442702 2021-10-28 06:46:44 -0700 2021-10-28 12:20:17 -0700 Patch bug-232228-20211028164642.patch text/plain 10742 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjMGQzYjNlMmZkODZiMTI5 MjI0NjI4MmU2MjczMmJhMzRjZDM1MWUuLjQwNzYxMTc5ODJlNWRhYzNiMDlkOGYzNGM5YmQzZWZi YTYwMzQ3YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMTAtMjggIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbV1BFXVtRdF0g RG8gbm90IHVzZSBXZWJLaXQgaW50ZXJuYWxzIGluIHRoZSBpbXBsZW1lbnRhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMjI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHVzYWdlIG9m IEdSZWZQdHIsIEdVbmlxdWVQdHIsIFdURiBtYWNyb3MsIGFuZCB1c2FnZSBvZiB0aGUgY29uZmln LmggaGVhZGVyIGZyb20KKyAgICAgICAgdGhlIFdQRSBRdCBBUEkgaW1wbGVtZW50YXRpb24sIGFz IGFsbCB0aGUgZnVuY2lvbmFsaXR5IGNhbiBiZSBhY2hpZXZlZCBvbiB0b3Agb2YgdGhlCisgICAg ICAgIHB1YmxpYyBBUEkuIFRoaXMgYWxsb3dzIGJ1aWxkaW5nIHRoZSBRdCBwbHVnLWluIGluIGEg c3RhbmRhbG9uZSBmYXNoaW9uLCB3aXRob3V0IGludm9sdmluZworICAgICAgICBhbnkgb2YgdGhl IFdlYktpdCBtYWNoaW5lcnksIGFuZCBhIHNhbXBsZSBDTWFrZUxpc3RzLnR4dCB3aGljaCBkb2Vz IHRoYXQgaXMgcHJvdmlkZWQgYXMKKyAgICAgICAgd2VsbC4gRGlzdHJpYnV0b3JzIG1heSBwcmVm ZXIgdG8gYnVpbGQgdXNpbmcgdGhpcyBhcHByb2FjaCBpbnN0ZWFkIG9mIGFzIHBhcnQgb2YgdGhl IHdob2xlCisgICAgICAgIFdlYktpdCBjb21waWxhdGlvbiBwcm9jZXNzLCBzcGVjaWFsbHkgaWYg d2hlbiBwcm92aWRpbmcgc3BsaXQgcGFja2FnZXMgb24gdG9wIG9mIHRoZWlyCisgICAgICAgIGJh c2UgV1BFIFdlYktpdCBvbmVzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9xdC9DTWFrZUxpc3RzLnR4dDogQWRkZWQuCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUW1sRXh0ZW5zaW9uUGx1Z2luLmNwcDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuY3BwOgorICAgICAgICAoV1BF UXRWaWV3OjpjcmVhdGVXZWJWaWV3KToKKyAgICAgICAgKGpzQXN5bmNSZWFkeUNhbGxiYWNrKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXdCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdQRVF0 Vmlld0JhY2tlbmQ6OmRpc3BsYXlJbWFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS93cGUv cXQvV1BFUXRWaWV3TG9hZFJlcXVlc3QuY3BwOgorCiAyMDIxLTEwLTI4ICBZb3Vlbm4gRmFibGV0 ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBGZXRjaCBBUEk6IE5ldHdvcmsgcHJvY2Vz cyBsZWFrcyB3aGVuIGJsb2JzIGFyZSB1bnVzZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS93cGUvcXQvQ01ha2VMaXN0cy50eHQgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvd3BlL3F0L0NNYWtlTGlzdHMudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRhNDE3ZjllNzEzZjFj YmI4MDcwOGQwYzA5ZDkxZGRiM2E2MzJhMjMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L0NNYWtlTGlzdHMudHh0CkBAIC0wLDAgKzEsNTkgQEAK K2NtYWtlX21pbmltdW1fcmVxdWlyZWQoVkVSU0lPTiAzLjE4KQorcHJvamVjdChxdHdwZSBMQU5H VUFHRVMgQ1hYKQorCitmaW5kX3BhY2thZ2UoUXQ1IFJFUVVJUkVEIENPTVBPTkVOVFMgQ29yZSBR dWljayBHdWkpCitmaW5kX3BhY2thZ2UoUXQ1VGVzdCBSRVFVSVJFRCkKK2ZpbmRfcGFja2FnZShQ a2dDb25maWcgUkVRVUlSRUQpCitwa2dfY2hlY2tfbW9kdWxlcyhFcG94eSBSRVFVSVJFRCBJTVBP UlRFRF9UQVJHRVQgZXBveHkpCitwa2dfY2hlY2tfbW9kdWxlcyhXUEVXZWJLaXQgUkVRVUlSRUQg SU1QT1JURURfVEFSR0VUIHdwZS13ZWJraXQtMS4wKQorcGtnX2NoZWNrX21vZHVsZXMoV1BFQmFj a2VuZEZETyBSRVFVSVJFRCBJTVBPUlRFRF9UQVJHRVQgd3BlYmFja2VuZC1mZG8tMS4wPj0xLjUu MCkKKworYWRkX2xpYnJhcnkocXR3cGUgTU9EVUxFCisgICAgV1BFUXRWaWV3QmFja2VuZC5jcHAK KyAgICBXUEVRbWxFeHRlbnNpb25QbHVnaW4uY3BwCisgICAgV1BFUXRWaWV3LmNwcAorICAgIFdQ RVF0Vmlld0xvYWRSZXF1ZXN0LmNwcAorKQorc2V0X3RhcmdldF9wcm9wZXJ0aWVzKHF0d3BlIFBS T1BFUlRJRVMKKyAgICBPVVRQVVRfTkFNRSBxdHdwZQorICAgIEFVVE9NT0MgT04KKykKK3Rhcmdl dF9jb21waWxlX2RlZmluaXRpb25zKHF0d3BlIFBVQkxJQworICAgIFFUX05PX0tFWVdPUkRTPTEK KykKK3RhcmdldF9saW5rX2xpYnJhcmllcyhxdHdwZSBQUklWQVRFCisgICAgUGtnQ29uZmlnOjpF cG94eQorICAgIFBrZ0NvbmZpZzo6V1BFV2ViS2l0CisgICAgUGtnQ29uZmlnOjpXUEVCYWNrZW5k RkRPCisgICAgUXQ1OjpDb3JlCisgICAgUXQ1OjpRdWljaworKQordGFyZ2V0X2luY2x1ZGVfZGly ZWN0b3JpZXMocXR3cGUgUFJJVkFURQorICAgICR7UXQ1R3VpX1BSSVZBVEVfSU5DTFVERV9ESVJT fQorKQorCitpbnN0YWxsKAorICAgIFRBUkdFVFMKKyAgICAgICAgcXR3cGUKKyAgICBERVNUSU5B VElPTgorICAgICAgICAiJHtDTUFLRV9JTlNUQUxMX0xJQkRJUn0vcXQ1L3FtbC9vcmcvd3Bld2Vi a2l0L3F0d3BlLyIKKyAgICBDT01QT05FTlQKKyAgICAgICAgcnVudGltZQorKQoraW5zdGFsbCgK KyAgICBGSUxFUworICAgICAgICBxbWxkaXIKKyAgICBERVNUSU5BVElPTgorICAgICAgICAiJHtD TUFLRV9JTlNUQUxMX0xJQkRJUn0vcXQ1L3FtbC9vcmcvd3Bld2Via2l0L3F0d3BlLyIKKyAgICBD T01QT05FTlQKKyAgICAgICAgcnVudGltZQorKQoraW5zdGFsbCgKKyAgICBGSUxFUworICAgICAg ICBXUEVRdFZpZXcuaAorICAgICAgICBXUEVRdFZpZXdMb2FkUmVxdWVzdC5oCisgICAgREVTVElO QVRJT04KKyAgICAgICAgaW5jbHVkZS93cGUtd2Via2l0LTEuMC93cGUvcXQKKyAgICBDT01QT05F TlQKKyAgICAgICAgZGV2ZWxvcG1lbnQKKykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS93cGUvcXQvV1BFUW1sRXh0ZW5zaW9uUGx1Z2luLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUW1sRXh0ZW5zaW9uUGx1Z2luLmNwcAppbmRleCA3 OWRiZmE1Njk3OTAzN2ExZmU3MDM4MjIzZjBlNjY5NGQxMDlhOGNkLi5lYTJjY2FmODhlYjU5NzJi MTRhYTE1ODQ5OTA2YjFiNWEyNmU0YWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvd3BlL3F0L1dQRVFtbEV4dGVuc2lvblBsdWdpbi5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRbWxFeHRlbnNpb25QbHVnaW4uY3BwCkBAIC0x LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxOCwgMjAxOSBJZ2FsaWEgUy5MCisg KiBDb3B5cmlnaHQgKEMpIDIwMTgsIDIwMTksIDIwMjEgSWdhbGlhIFMuTAogICogQ29weXJpZ2h0 IChDKSAyMDE4LCAyMDE5IFpvZGlhYyBJbmZsaWdodCBJbm5vdmF0aW9ucwogICoKICAqIFRoaXMg bGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IK QEAgLTE4LDcgKzE4LDYgQEAKICAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgogICovCiAK LSNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXUEVRbWxFeHRlbnNpb25QbHVnaW4uaCIK IAogI2luY2x1ZGUgIldQRVF0Vmlldy5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL3dwZS9xdC9XUEVRdFZpZXcuY3BwCmluZGV4IGY3NTNmZTIzZDAxMTMwNTNhYmFjNzA5Njdj OGM3NzNhMzE2ZjQ5NjIuLjFjNTBmZjdjMmE4YjNiN2E0MGY1ZmE4ZTRkOTE1YWVlNTQyNzQ2NDIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlldy5j cHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4LCAyMDE5IElnYWxp YSBTLkwKKyAqIENvcHlyaWdodCAoQykgMjAxOCwgMjAxOSwgMjAyMSBJZ2FsaWEgUy5MCiAgKiBD b3B5cmlnaHQgKEMpIDIwMTgsIDIwMTkgWm9kaWFjIEluZmxpZ2h0IElubm92YXRpb25zCiAgKgog ICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vcgpAQCAtMTgsNyArMTgsNiBAQAogICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0Eu CiAgKi8KIAotI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldQRVF0Vmlldy5oIgogCiAj aW5jbHVkZSAiV1BFUXRWaWV3QmFja2VuZC5oIgpAQCAtMzEsNyArMzAsNiBAQAogI2luY2x1ZGUg PFF0R2xvYmFsPgogI2luY2x1ZGUgPFF0UGxhdGZvcm1IZWFkZXJzL1FFR0xOYXRpdmVDb250ZXh0 PgogI2luY2x1ZGUgPHFwYS9xcGxhdGZvcm1uYXRpdmVpbnRlcmZhY2UuaD4KLSNpbmNsdWRlIDx3 dGYvZ2xpYi9HVW5pcXVlUHRyLmg+CiAKIC8qIQogICBccW1sdHlwZSBXUEVWaWV3CkBAIC05Nywx OCArOTUsMjAgQEAgdm9pZCBXUEVRdFZpZXc6OmNyZWF0ZVdlYlZpZXcoKQogICAgIGF1dG8gZGlz cGxheSA9IHN0YXRpY19jYXN0PEVHTERpc3BsYXk+KFFHdWlBcHBsaWNhdGlvbjo6cGxhdGZvcm1O YXRpdmVJbnRlcmZhY2UoKS0+bmF0aXZlUmVzb3VyY2VGb3JJbnRlZ3JhdGlvbigiZWdsZGlzcGxh eSIpKTsKICAgICBhdXRvKiBjb250ZXh0ID0gd2luZG93KCktPm9wZW5nbENvbnRleHQoKTsKICAg ICBzdGQ6OnVuaXF1ZV9wdHI8V1BFUXRWaWV3QmFja2VuZD4gYmFja2VuZCA9IFdQRVF0Vmlld0Jh Y2tlbmQ6OmNyZWF0ZShtX3NpemUsIGNvbnRleHQsIGRpc3BsYXksIFFQb2ludGVyPFdQRVF0Vmll dz4odGhpcykpOwotICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfTUVTU0FHRShiYWNrZW5kLCAiRUdM IGluaXRpYWxpemF0aW9uIGZhaWxlZCIpOwotICAgIGlmICghYmFja2VuZCkKKyAgICBpZiAoIWJh Y2tlbmQpIHsKKyAgICAgICAgcUZhdGFsKCJXUEVRdFZpZXc6OmNyZWF0ZVdlYlZpZXcoKTogRUdM IGluaXRpYWxpemF0aW9uIGZhaWxlZCIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAg bV9iYWNrZW5kID0gYmFja2VuZC5nZXQoKTsKLSAgICBhdXRvIHNldHRpbmdzID0gYWRvcHRHUmVm KHdlYmtpdF9zZXR0aW5nc19uZXdfd2l0aF9zZXR0aW5ncygiZW5hYmxlLWRldmVsb3Blci1leHRy YXMiLCBUUlVFLAotICAgICAgICAiZW5hYmxlLXdlYmdsIiwgVFJVRSwgImVuYWJsZS1tZWRpYXNv dXJjZSIsIFRSVUUsIG51bGxwdHIpKTsKKyAgICBhdXRvKiBzZXR0aW5ncyA9IHdlYmtpdF9zZXR0 aW5nc19uZXdfd2l0aF9zZXR0aW5ncygiZW5hYmxlLWRldmVsb3Blci1leHRyYXMiLCBUUlVFLAor ICAgICAgICAiZW5hYmxlLXdlYmdsIiwgVFJVRSwgImVuYWJsZS1tZWRpYXNvdXJjZSIsIFRSVUUs IG51bGxwdHIpOwogICAgIG1fd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyhnX29iamVjdF9uZXco V0VCS0lUX1RZUEVfV0VCX1ZJRVcsCiAgICAgICAgICJiYWNrZW5kIiwgd2Via2l0X3dlYl92aWV3 X2JhY2tlbmRfbmV3KG1fYmFja2VuZC0+YmFja2VuZCgpLCBbXShncG9pbnRlciBkYXRhKSB7CiAg ICAgICAgICAgICBkZWxldGUgc3RhdGljX2Nhc3Q8V1BFUXRWaWV3QmFja2VuZCo+KGRhdGEpOwog ICAgICAgICB9LCBiYWNrZW5kLnJlbGVhc2UoKSksCi0gICAgICAgICJzZXR0aW5ncyIsIHNldHRp bmdzLmdldCgpLCBudWxscHRyKSk7CisgICAgICAgICJzZXR0aW5ncyIsIHNldHRpbmdzLCBudWxs cHRyKSk7CisgICAgZ19jbGVhcl9vYmplY3QoJnNldHRpbmdzKTsKIAogICAgIGdfc2lnbmFsX2Nv bm5lY3Rfc3dhcHBlZChtX3dlYlZpZXcsICJub3RpZnk6OnVyaSIsIEdfQ0FMTEJBQ0sobm90aWZ5 VXJsQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVk KG1fd2ViVmlldywgIm5vdGlmeTo6dGl0bGUiLCBHX0NBTExCQUNLKG5vdGlmeVRpdGxlQ2hhbmdl ZENhbGxiYWNrKSwgdGhpcyk7CkBAIC00MDQsMTEgKzQwNCwxMiBAQCBzdHJ1Y3QgSmF2YXNjcmlw dENhbGxiYWNrRGF0YSB7CiAKIHN0YXRpYyB2b2lkIGpzQXN5bmNSZWFkeUNhbGxiYWNrKEdPYmpl Y3QqIG9iamVjdCwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGdwb2ludGVyIHVzZXJEYXRhKQogewot ICAgIEdVbmlxdWVPdXRQdHI8R0Vycm9yPiBlcnJvcjsKKyAgICBHRXJyb3IqIGVycm9yIHsgbnVs bHB0ciB9OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxKYXZhc2NyaXB0Q2FsbGJhY2tEYXRhPiBkYXRh KHJlaW50ZXJwcmV0X2Nhc3Q8SmF2YXNjcmlwdENhbGxiYWNrRGF0YSo+KHVzZXJEYXRhKSk7Ci0g ICAgV2ViS2l0SmF2YXNjcmlwdFJlc3VsdCoganNSZXN1bHQgPSB3ZWJraXRfd2ViX3ZpZXdfcnVu X2phdmFzY3JpcHRfZmluaXNoKFdFQktJVF9XRUJfVklFVyhvYmplY3QpLCByZXN1bHQsICZlcnJv ci5vdXRQdHIoKSk7CisgICAgV2ViS2l0SmF2YXNjcmlwdFJlc3VsdCoganNSZXN1bHQgPSB3ZWJr aXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHRfZmluaXNoKFdFQktJVF9XRUJfVklFVyhvYmplY3Qp LCByZXN1bHQsICZlcnJvcik7CiAgICAgaWYgKCFqc1Jlc3VsdCkgewogICAgICAgICBxV2Fybmlu ZygiRXJyb3IgcnVubmluZyBqYXZhc2NyaXB0OiAlcyIsIGVycm9yLT5tZXNzYWdlKTsKKyAgICAg ICAgZ19lcnJvcl9mcmVlKGVycm9yKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDI1 LDE0ICs0MjYsMTUgQEAgc3RhdGljIHZvaWQganNBc3luY1JlYWR5Q2FsbGJhY2soR09iamVjdCog b2JqZWN0LCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgZ3BvaW50ZXIKICAgICAgICAgUVZhcmlhbnQg dmFyaWFudDsKICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBtb3JlIHZhbHVlIHR5cGVzPwogICAg ICAgICBpZiAoanNjX3ZhbHVlX2lzX3N0cmluZyh2YWx1ZSkpIHsKLSAgICAgICAgICAgIEdVbmlx dWVQdHI8Z2NoYXI+IHN0clZhbHVlKGpzY192YWx1ZV90b19zdHJpbmcodmFsdWUpKTsKKyAgICAg ICAgICAgIGF1dG8qIHN0clZhbHVlID0ganNjX3ZhbHVlX3RvX3N0cmluZyh2YWx1ZSk7CiAgICAg ICAgICAgICBKU0NDb250ZXh0KiBjb250ZXh0ID0ganNjX3ZhbHVlX2dldF9jb250ZXh0KHZhbHVl KTsKICAgICAgICAgICAgIEpTQ0V4Y2VwdGlvbiogZXhjZXB0aW9uID0ganNjX2NvbnRleHRfZ2V0 X2V4Y2VwdGlvbihjb250ZXh0KTsKICAgICAgICAgICAgIGlmIChleGNlcHRpb24pIHsKICAgICAg ICAgICAgICAgICBxV2FybmluZygiRXJyb3IgcnVubmluZyBqYXZhc2NyaXB0OiAlcyIsIGpzY19l eGNlcHRpb25fZ2V0X21lc3NhZ2UoZXhjZXB0aW9uKSk7CiAgICAgICAgICAgICAgICAganNjX2Nv bnRleHRfY2xlYXJfZXhjZXB0aW9uKGNvbnRleHQpOwogICAgICAgICAgICAgfSBlbHNlCi0gICAg ICAgICAgICAgICAgdmFyaWFudC5zZXRWYWx1ZShRU3RyaW5nKGdfc3RyZHVwKHN0clZhbHVlLmdl dCgpKSkpOworICAgICAgICAgICAgICAgIHZhcmlhbnQuc2V0VmFsdWUoUVN0cmluZyhnX3N0cmR1 cChzdHJWYWx1ZSkpKTsKKyAgICAgICAgICAgIGdfZnJlZShzdHJWYWx1ZSk7CiAgICAgICAgIH0K ICAgICAgICAgYXJncy5hcHBlbmQoZW5naW5lLT50b1NjcmlwdFZhbHVlKHZhcmlhbnQpKTsKICAg ICAgICAgZGF0YS0+Y2FsbGJhY2suY2FsbChhcmdzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlldy5oCmluZGV4IGY3OTUzNTU1MDgzOWM4ZDI3MDNjZDYw MWM2N2ZlNjVjOTkwYzgxYTYuLjNmZDVhNGMyZTNiZDdlNmViYzUwYTg0YzcxYjAyN2ExY2VlOWZi M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRW aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcu aApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTgsIDIwMTkgSWdhbGlh IFMuTAorICogQ29weXJpZ2h0IChDKSAyMDE4LCAyMDE5LCAyMDIxIElnYWxpYSBTLkwKICAqIENv cHlyaWdodCAoQykgMjAxOCwgMjAxOSBab2RpYWMgSW5mbGlnaHQgSW5ub3ZhdGlvbnMKICAqCiAg KiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg YW5kL29yCkBAIC0yMCwxNCArMjAsMTEgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpbmNsdWRlICJj b25maWcuaCIKLQogI2luY2x1ZGUgPFFRbWxFbmdpbmU+CiAjaW5jbHVkZSA8UVF1aWNrSXRlbT4K ICNpbmNsdWRlIDxRVXJsPgogI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3cGUvd2Via2l0 Lmg+Ci0jaW5jbHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgogCiBjbGFzcyBXUEVRdFZpZXdCYWNr ZW5kOwogY2xhc3MgV1BFUXRWaWV3TG9hZFJlcXVlc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlld0JhY2tlbmQuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXdCYWNrZW5kLmNwcAppbmRleCBjMzEy MDY2YjRmZTU2YTJiNjViYzBkYmJjMDRlYjg4OGZiNTdmODkwLi5hYjk1OTgwZTAzZThmZDQ3YTUx ZDk1YTJlNWU2YzE4Mjk2OWU0Zjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvd3BlL3F0L1dQRVF0Vmlld0JhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3QmFja2VuZC5jcHAKQEAgLTEsNSArMSw1IEBACiAv KgotICogQ29weXJpZ2h0IChDKSAyMDE4LCAyMDE5IElnYWxpYSBTLkwKKyAqIENvcHlyaWdodCAo QykgMjAxOCwgMjAxOSwgMjAyMSBJZ2FsaWEgUy5MCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTgsIDIw MTkgWm9kaWFjIEluZmxpZ2h0IElubm92YXRpb25zCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtMTgsNyArMTgs NiBAQAogICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCiAgKi8KIAotI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIldQRVF0Vmlld0JhY2tlbmQuaCIKIAogI2luY2x1ZGUgIldQRVF0 Vmlldy5oIgpAQCAtMjEwLDcgKzIwOSw3IEBAIEdMdWludCBXUEVRdFZpZXdCYWNrZW5kOjp0ZXh0 dXJlKFFPcGVuR0xDb250ZXh0KiBjb250ZXh0KQogCiB2b2lkIFdQRVF0Vmlld0JhY2tlbmQ6OmRp c3BsYXlJbWFnZShzdHJ1Y3Qgd3BlX2Zkb19lZ2xfZXhwb3J0ZWRfaW1hZ2UqIGltYWdlKQogewot ICAgIFJFTEVBU0VfQVNTRVJUKCFtX2xvY2tlZEltYWdlKTsKKyAgICBRX0FTU1VNRSghbV9sb2Nr ZWRJbWFnZSk7CiAgICAgbV9sb2NrZWRJbWFnZSA9IGltYWdlOwogICAgIGlmIChtX3ZpZXcpCiAg ICAgICAgIG1fdmlldy0+dHJpZ2dlclVwZGF0ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXdMb2FkUmVxdWVzdC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlld0xvYWRSZXF1ZXN0LmNwcAppbmRl eCA4Zjc3MTNkOTUwZmZmMzFjOThmMWRlNDNmNzlhMjJiNmY2NWQwOGJiLi43YjIyYTI0YjAyNGE3 Yjc2NWU5ZmJmM2I4MzA0YzA4NjhjMjk1MmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlld0xvYWRSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlld0xvYWRSZXF1ZXN0LmNwcApAQCAt MSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTgsIDIwMTkgSWdhbGlhIFMuTAor ICogQ29weXJpZ2h0IChDKSAyMDE4LCAyMDE5LCAyMDIxIElnYWxpYSBTLkwKICAqIENvcHlyaWdo dCAoQykgMjAxOCwgMjAxOSBab2RpYWMgSW5mbGlnaHQgSW5ub3ZhdGlvbnMKICAqCiAgKiBUaGlz IGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y CkBAIC0xOCw3ICsxOCw2IEBACiAgKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KICAqLwog Ci0jaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV1BFUXRWaWV3TG9hZFJlcXVlc3QuaCIK IAogI2luY2x1ZGUgIldQRVF0Vmlldy5oIgo= 442729 2021-10-28 12:20:22 -0700 2021-10-28 13:58:09 -0700 Patch bug-232228-20211028222021.patch text/plain 10714 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ1ZDRhODQzYmE3OTA3Zjg2 YzM4NjZkZDczNmExODU2YWY2MTI0ODYuLjI5OWViMmM2MzU5N2FjMDkzM2MyZGQxZWIxMjMxNzc4 ZDA4MzEwNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMTAtMjggIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbV1BFXVtRdF0g RG8gbm90IHVzZSBXZWJLaXQgaW50ZXJuYWxzIGluIHRoZSBpbXBsZW1lbnRhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMjI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHVzYWdlIG9m IEdSZWZQdHIsIEdVbmlxdWVQdHIsIFdURiBtYWNyb3MsIGFuZCB1c2FnZSBvZiB0aGUgY29uZmln LmggaGVhZGVyIGZyb20KKyAgICAgICAgdGhlIFdQRSBRdCBBUEkgaW1wbGVtZW50YXRpb24sIGFz IGFsbCB0aGUgZnVuY2lvbmFsaXR5IGNhbiBiZSBhY2hpZXZlZCBvbiB0b3Agb2YgdGhlCisgICAg ICAgIHB1YmxpYyBBUEkuIFRoaXMgYWxsb3dzIGJ1aWxkaW5nIHRoZSBRdCBwbHVnLWluIGluIGEg c3RhbmRhbG9uZSBmYXNoaW9uLCB3aXRob3V0IGludm9sdmluZworICAgICAgICBhbnkgb2YgdGhl IFdlYktpdCBtYWNoaW5lcnksIGFuZCBhIHNhbXBsZSBDTWFrZUxpc3RzLnR4dCB3aGljaCBkb2Vz IHRoYXQgaXMgcHJvdmlkZWQgYXMKKyAgICAgICAgd2VsbC4gRGlzdHJpYnV0b3JzIG1heSBwcmVm ZXIgdG8gYnVpbGQgdXNpbmcgdGhpcyBhcHByb2FjaCBpbnN0ZWFkIG9mIGFzIHBhcnQgb2YgdGhl IHdob2xlCisgICAgICAgIFdlYktpdCBjb21waWxhdGlvbiBwcm9jZXNzLCBzcGVjaWFsbHkgaWYg d2hlbiBwcm92aWRpbmcgc3BsaXQgcGFja2FnZXMgb24gdG9wIG9mIHRoZWlyCisgICAgICAgIGJh c2UgV1BFIFdlYktpdCBvbmVzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9xdC9DTWFrZUxpc3RzLnR4dDogQWRkZWQuCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUW1sRXh0ZW5zaW9uUGx1Z2luLmNwcDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuY3BwOgorICAgICAgICAoV1BF UXRWaWV3OjpjcmVhdGVXZWJWaWV3KToKKyAgICAgICAgKGpzQXN5bmNSZWFkeUNhbGxiYWNrKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXdCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdQRVF0 Vmlld0JhY2tlbmQ6OmRpc3BsYXlJbWFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS93cGUv cXQvV1BFUXRWaWV3TG9hZFJlcXVlc3QuY3BwOgorCiAyMDIxLTEwLTI4ICBUaW0gSG9ydG9uICA8 dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9DTWFrZUxp c3RzLnR4dCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvQ01ha2VMaXN0cy50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZGE0MTdmOWU3MTNmMWNiYjgwNzA4ZDBjMDlkOTFkZGIzYTYzMmEyMwot LS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvQ01h a2VMaXN0cy50eHQKQEAgLTAsMCArMSw1OSBAQAorY21ha2VfbWluaW11bV9yZXF1aXJlZChWRVJT SU9OIDMuMTgpCitwcm9qZWN0KHF0d3BlIExBTkdVQUdFUyBDWFgpCisKK2ZpbmRfcGFja2FnZShR dDUgUkVRVUlSRUQgQ09NUE9ORU5UUyBDb3JlIFF1aWNrIEd1aSkKK2ZpbmRfcGFja2FnZShRdDVU ZXN0IFJFUVVJUkVEKQorZmluZF9wYWNrYWdlKFBrZ0NvbmZpZyBSRVFVSVJFRCkKK3BrZ19jaGVj a19tb2R1bGVzKEVwb3h5IFJFUVVJUkVEIElNUE9SVEVEX1RBUkdFVCBlcG94eSkKK3BrZ19jaGVj a19tb2R1bGVzKFdQRVdlYktpdCBSRVFVSVJFRCBJTVBPUlRFRF9UQVJHRVQgd3BlLXdlYmtpdC0x LjApCitwa2dfY2hlY2tfbW9kdWxlcyhXUEVCYWNrZW5kRkRPIFJFUVVJUkVEIElNUE9SVEVEX1RB UkdFVCB3cGViYWNrZW5kLWZkby0xLjA+PTEuNS4wKQorCithZGRfbGlicmFyeShxdHdwZSBNT0RV TEUKKyAgICBXUEVRdFZpZXdCYWNrZW5kLmNwcAorICAgIFdQRVFtbEV4dGVuc2lvblBsdWdpbi5j cHAKKyAgICBXUEVRdFZpZXcuY3BwCisgICAgV1BFUXRWaWV3TG9hZFJlcXVlc3QuY3BwCispCitz ZXRfdGFyZ2V0X3Byb3BlcnRpZXMocXR3cGUgUFJPUEVSVElFUworICAgIE9VVFBVVF9OQU1FIHF0 d3BlCisgICAgQVVUT01PQyBPTgorKQordGFyZ2V0X2NvbXBpbGVfZGVmaW5pdGlvbnMocXR3cGUg UFVCTElDCisgICAgUVRfTk9fS0VZV09SRFM9MQorKQordGFyZ2V0X2xpbmtfbGlicmFyaWVzKHF0 d3BlIFBSSVZBVEUKKyAgICBQa2dDb25maWc6OkVwb3h5CisgICAgUGtnQ29uZmlnOjpXUEVXZWJL aXQKKyAgICBQa2dDb25maWc6OldQRUJhY2tlbmRGRE8KKyAgICBRdDU6OkNvcmUKKyAgICBRdDU6 OlF1aWNrCispCit0YXJnZXRfaW5jbHVkZV9kaXJlY3RvcmllcyhxdHdwZSBQUklWQVRFCisgICAg JHtRdDVHdWlfUFJJVkFURV9JTkNMVURFX0RJUlN9CispCisKK2luc3RhbGwoCisgICAgVEFSR0VU UworICAgICAgICBxdHdwZQorICAgIERFU1RJTkFUSU9OCisgICAgICAgICIke0NNQUtFX0lOU1RB TExfTElCRElSfS9xdDUvcW1sL29yZy93cGV3ZWJraXQvcXR3cGUvIgorICAgIENPTVBPTkVOVAor ICAgICAgICBydW50aW1lCispCitpbnN0YWxsKAorICAgIEZJTEVTCisgICAgICAgIHFtbGRpcgor ICAgIERFU1RJTkFUSU9OCisgICAgICAgICIke0NNQUtFX0lOU1RBTExfTElCRElSfS9xdDUvcW1s L29yZy93cGV3ZWJraXQvcXR3cGUvIgorICAgIENPTVBPTkVOVAorICAgICAgICBydW50aW1lCisp CitpbnN0YWxsKAorICAgIEZJTEVTCisgICAgICAgIFdQRVF0Vmlldy5oCisgICAgICAgIFdQRVF0 Vmlld0xvYWRSZXF1ZXN0LmgKKyAgICBERVNUSU5BVElPTgorICAgICAgICBpbmNsdWRlL3dwZS13 ZWJraXQtMS4wL3dwZS9xdAorICAgIENPTVBPTkVOVAorICAgICAgICBkZXZlbG9wbWVudAorKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRbWxFeHRl bnNpb25QbHVnaW4uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVR bWxFeHRlbnNpb25QbHVnaW4uY3BwCmluZGV4IDc5ZGJmYTU2OTc5MDM3YTFmZTcwMzgyMjNmMGU2 Njk0ZDEwOWE4Y2QuLmVhMmNjYWY4OGViNTk3MmIxNGFhMTU4NDk5MDZiMWI1YTI2ZTRhZDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUW1sRXh0ZW5z aW9uUGx1Z2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQ RVFtbEV4dGVuc2lvblBsdWdpbi5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0 IChDKSAyMDE4LCAyMDE5IElnYWxpYSBTLkwKKyAqIENvcHlyaWdodCAoQykgMjAxOCwgMjAxOSwg MjAyMSBJZ2FsaWEgUy5MCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTgsIDIwMTkgWm9kaWFjIEluZmxp Z2h0IElubm92YXRpb25zCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlv dSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtMTgsNyArMTgsNiBAQAogICogQm9zdG9u LCBNQSAwMjExMC0xMzAxLCBVU0EuCiAgKi8KIAotI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgIldQRVFtbEV4dGVuc2lvblBsdWdpbi5oIgogCiAjaW5jbHVkZSAiV1BFUXRWaWV3LmgiCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlldy5jcHAKaW5k ZXggNDZmZmFlOTExNjAzNjFkNDg5ODgwOWVlYzcyMTllN2ZiMjcwNDU0MS4uMWYxZGUxNzY4ZTQz Yjc0NWQxOGE2OWIzYThlM2M1MjQ3NTI2ZmUxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3LmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBD b3B5cmlnaHQgKEMpIDIwMTgsIDIwMTkgSWdhbGlhIFMuTAorICogQ29weXJpZ2h0IChDKSAyMDE4 LCAyMDE5LCAyMDIxIElnYWxpYSBTLkwKICAqIENvcHlyaWdodCAoQykgMjAxOCwgMjAxOSBab2Rp YWMgSW5mbGlnaHQgSW5ub3ZhdGlvbnMKICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0 d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCkBAIC0xOCw3ICsxOCw2IEBACiAg KiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KICAqLwogCi0jaW5jbHVkZSAiY29uZmlnLmgi CiAjaW5jbHVkZSAiV1BFUXRWaWV3LmgiCiAKICNpbmNsdWRlICJXUEVRdFZpZXdCYWNrZW5kLmgi CkBAIC0zMSw3ICszMCw2IEBACiAjaW5jbHVkZSA8UXRHbG9iYWw+CiAjaW5jbHVkZSA8UXRQbGF0 Zm9ybUhlYWRlcnMvUUVHTE5hdGl2ZUNvbnRleHQ+CiAjaW5jbHVkZSA8cXBhL3FwbGF0Zm9ybW5h dGl2ZWludGVyZmFjZS5oPgotI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4KIAogLyoh CiAgIFxxbWx0eXBlIFdQRVZpZXcKQEAgLTk3LDE4ICs5NSwyMCBAQCB2b2lkIFdQRVF0Vmlldzo6 Y3JlYXRlV2ViVmlldygpCiAgICAgYXV0byBkaXNwbGF5ID0gc3RhdGljX2Nhc3Q8RUdMRGlzcGxh eT4oUUd1aUFwcGxpY2F0aW9uOjpwbGF0Zm9ybU5hdGl2ZUludGVyZmFjZSgpLT5uYXRpdmVSZXNv dXJjZUZvckludGVncmF0aW9uKCJlZ2xkaXNwbGF5IikpOwogICAgIGF1dG8qIGNvbnRleHQgPSB3 aW5kb3coKS0+b3BlbmdsQ29udGV4dCgpOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxXUEVRdFZpZXdC YWNrZW5kPiBiYWNrZW5kID0gV1BFUXRWaWV3QmFja2VuZDo6Y3JlYXRlKG1fc2l6ZSwgY29udGV4 dCwgZGlzcGxheSwgUVBvaW50ZXI8V1BFUXRWaWV3Pih0aGlzKSk7Ci0gICAgUkVMRUFTRV9BU1NF UlRfV0lUSF9NRVNTQUdFKGJhY2tlbmQsICJFR0wgaW5pdGlhbGl6YXRpb24gZmFpbGVkIik7Ci0g ICAgaWYgKCFiYWNrZW5kKQorICAgIGlmICghYmFja2VuZCkgeworICAgICAgICBxRmF0YWwoIldQ RVF0Vmlldzo6Y3JlYXRlV2ViVmlldygpOiBFR0wgaW5pdGlhbGl6YXRpb24gZmFpbGVkIik7CiAg ICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBtX2JhY2tlbmQgPSBiYWNrZW5kLmdldCgpOwot ICAgIGF1dG8gc2V0dGluZ3MgPSBhZG9wdEdSZWYod2Via2l0X3NldHRpbmdzX25ld193aXRoX3Nl dHRpbmdzKCJlbmFibGUtZGV2ZWxvcGVyLWV4dHJhcyIsIFRSVUUsCi0gICAgICAgICJlbmFibGUt d2ViZ2wiLCBUUlVFLCAiZW5hYmxlLW1lZGlhc291cmNlIiwgVFJVRSwgbnVsbHB0cikpOworICAg IGF1dG8qIHNldHRpbmdzID0gd2Via2l0X3NldHRpbmdzX25ld193aXRoX3NldHRpbmdzKCJlbmFi bGUtZGV2ZWxvcGVyLWV4dHJhcyIsIFRSVUUsCisgICAgICAgICJlbmFibGUtd2ViZ2wiLCBUUlVF LCAiZW5hYmxlLW1lZGlhc291cmNlIiwgVFJVRSwgbnVsbHB0cik7CiAgICAgbV93ZWJWaWV3ID0g V0VCS0lUX1dFQl9WSUVXKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklFVywKICAgICAg ICAgImJhY2tlbmQiLCB3ZWJraXRfd2ViX3ZpZXdfYmFja2VuZF9uZXcobV9iYWNrZW5kLT5iYWNr ZW5kKCksIFtdKGdwb2ludGVyIGRhdGEpIHsKICAgICAgICAgICAgIGRlbGV0ZSBzdGF0aWNfY2Fz dDxXUEVRdFZpZXdCYWNrZW5kKj4oZGF0YSk7CiAgICAgICAgIH0sIGJhY2tlbmQucmVsZWFzZSgp KSwKLSAgICAgICAgInNldHRpbmdzIiwgc2V0dGluZ3MuZ2V0KCksIG51bGxwdHIpKTsKKyAgICAg ICAgInNldHRpbmdzIiwgc2V0dGluZ3MsIG51bGxwdHIpKTsKKyAgICBnX2NsZWFyX29iamVjdCgm c2V0dGluZ3MpOwogCiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fd2ViVmlldywgIm5v dGlmeTo6dXJpIiwgR19DQUxMQkFDSyhub3RpZnlVcmxDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsK ICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV93ZWJWaWV3LCAibm90aWZ5Ojp0aXRsZSIs IEdfQ0FMTEJBQ0sobm90aWZ5VGl0bGVDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKQEAgLTQwNCwx MSArNDA0LDEyIEBAIHN0cnVjdCBKYXZhc2NyaXB0Q2FsbGJhY2tEYXRhIHsKIAogc3RhdGljIHZv aWQganNBc3luY1JlYWR5Q2FsbGJhY2soR09iamVjdCogb2JqZWN0LCBHQXN5bmNSZXN1bHQqIHJl c3VsdCwgZ3BvaW50ZXIgdXNlckRhdGEpCiB7Ci0gICAgR1VuaXF1ZU91dFB0cjxHRXJyb3I+IGVy cm9yOworICAgIEdFcnJvciogZXJyb3IgeyBudWxscHRyIH07CiAgICAgc3RkOjp1bmlxdWVfcHRy PEphdmFzY3JpcHRDYWxsYmFja0RhdGE+IGRhdGEocmVpbnRlcnByZXRfY2FzdDxKYXZhc2NyaXB0 Q2FsbGJhY2tEYXRhKj4odXNlckRhdGEpKTsKLSAgICBXZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiBq c1Jlc3VsdCA9IHdlYmtpdF93ZWJfdmlld19ydW5famF2YXNjcmlwdF9maW5pc2goV0VCS0lUX1dF Ql9WSUVXKG9iamVjdCksIHJlc3VsdCwgJmVycm9yLm91dFB0cigpKTsKKyAgICBXZWJLaXRKYXZh c2NyaXB0UmVzdWx0KiBqc1Jlc3VsdCA9IHdlYmtpdF93ZWJfdmlld19ydW5famF2YXNjcmlwdF9m aW5pc2goV0VCS0lUX1dFQl9WSUVXKG9iamVjdCksIHJlc3VsdCwgJmVycm9yKTsKICAgICBpZiAo IWpzUmVzdWx0KSB7CiAgICAgICAgIHFXYXJuaW5nKCJFcnJvciBydW5uaW5nIGphdmFzY3JpcHQ6 ICVzIiwgZXJyb3ItPm1lc3NhZ2UpOworICAgICAgICBnX2Vycm9yX2ZyZWUoZXJyb3IpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCkBAIC00MjUsMTQgKzQyNiwxNSBAQCBzdGF0aWMgdm9pZCBq c0FzeW5jUmVhZHlDYWxsYmFjayhHT2JqZWN0KiBvYmplY3QsIEdBc3luY1Jlc3VsdCogcmVzdWx0 LCBncG9pbnRlcgogICAgICAgICBRVmFyaWFudCB2YXJpYW50OwogICAgICAgICAvLyBGSVhNRTog SGFuZGxlIG1vcmUgdmFsdWUgdHlwZXM/CiAgICAgICAgIGlmIChqc2NfdmFsdWVfaXNfc3RyaW5n KHZhbHVlKSkgewotICAgICAgICAgICAgR1VuaXF1ZVB0cjxnY2hhcj4gc3RyVmFsdWUoanNjX3Zh bHVlX3RvX3N0cmluZyh2YWx1ZSkpOworICAgICAgICAgICAgYXV0byogc3RyVmFsdWUgPSBqc2Nf dmFsdWVfdG9fc3RyaW5nKHZhbHVlKTsKICAgICAgICAgICAgIEpTQ0NvbnRleHQqIGNvbnRleHQg PSBqc2NfdmFsdWVfZ2V0X2NvbnRleHQodmFsdWUpOwogICAgICAgICAgICAgSlNDRXhjZXB0aW9u KiBleGNlcHRpb24gPSBqc2NfY29udGV4dF9nZXRfZXhjZXB0aW9uKGNvbnRleHQpOwogICAgICAg ICAgICAgaWYgKGV4Y2VwdGlvbikgewogICAgICAgICAgICAgICAgIHFXYXJuaW5nKCJFcnJvciBy dW5uaW5nIGphdmFzY3JpcHQ6ICVzIiwganNjX2V4Y2VwdGlvbl9nZXRfbWVzc2FnZShleGNlcHRp b24pKTsKICAgICAgICAgICAgICAgICBqc2NfY29udGV4dF9jbGVhcl9leGNlcHRpb24oY29udGV4 dCk7CiAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICB2YXJpYW50LnNldFZhbHVl KFFTdHJpbmc6OmZyb21VdGY4KHN0clZhbHVlLmdldCgpKSk7CisgICAgICAgICAgICAgICAgdmFy aWFudC5zZXRWYWx1ZShRU3RyaW5nOjpmcm9tVXRmOChzdHJWYWx1ZSkpOworICAgICAgICAgICAg Z19mcmVlKHN0clZhbHVlKTsKICAgICAgICAgfQogICAgICAgICBhcmdzLmFwcGVuZChlbmdpbmUt PnRvU2NyaXB0VmFsdWUodmFyaWFudCkpOwogICAgICAgICBkYXRhLT5jYWxsYmFjay5jYWxsKGFy Z3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVR dFZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3LmgK aW5kZXggZjc5NTM1NTUwODM5YzhkMjcwM2NkNjAxYzY3ZmU2NWM5OTBjODFhNi4uM2ZkNWE0YzJl M2JkN2U2ZWJjNTBhODRjNzFiMDI3YTFjZWU5ZmIzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0Vmlldy5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv cHlyaWdodCAoQykgMjAxOCwgMjAxOSBJZ2FsaWEgUy5MCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgs IDIwMTksIDIwMjEgSWdhbGlhIFMuTAogICogQ29weXJpZ2h0IChDKSAyMDE4LCAyMDE5IFpvZGlh YyBJbmZsaWdodCBJbm5vdmF0aW9ucwogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3 YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTIwLDE0ICsyMCwxMSBAQAog CiAjcHJhZ21hIG9uY2UKIAotI2luY2x1ZGUgImNvbmZpZy5oIgotCiAjaW5jbHVkZSA8UVFtbEVu Z2luZT4KICNpbmNsdWRlIDxRUXVpY2tJdGVtPgogI2luY2x1ZGUgPFFVcmw+CiAjaW5jbHVkZSA8 bWVtb3J5PgogI2luY2x1ZGUgPHdwZS93ZWJraXQuaD4KLSNpbmNsdWRlIDx3dGYvZ2xpYi9HUmVm UHRyLmg+CiAKIGNsYXNzIFdQRVF0Vmlld0JhY2tlbmQ7CiBjbGFzcyBXUEVRdFZpZXdMb2FkUmVx dWVzdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BF UXRWaWV3QmFja2VuZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQ RVF0Vmlld0JhY2tlbmQuY3BwCmluZGV4IGMzMTIwNjZiNGZlNTZhMmI2NWJjMGRiYmMwNGViODg4 ZmI1N2Y4OTAuLmFiOTU5ODBlMDNlOGZkNDdhNTFkOTVhMmU1ZTZjMTgyOTY5ZTRmOTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3QmFja2Vu ZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9xdC9XUEVRdFZpZXdC YWNrZW5kLmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTgsIDIw MTkgSWdhbGlhIFMuTAorICogQ29weXJpZ2h0IChDKSAyMDE4LCAyMDE5LCAyMDIxIElnYWxpYSBT LkwKICAqIENvcHlyaWdodCAoQykgMjAxOCwgMjAxOSBab2RpYWMgSW5mbGlnaHQgSW5ub3ZhdGlv bnMKICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3Ry aWJ1dGUgaXQgYW5kL29yCkBAIC0xOCw3ICsxOCw2IEBACiAgKiBCb3N0b24sIE1BIDAyMTEwLTEz MDEsIFVTQS4KICAqLwogCi0jaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV1BFUXRWaWV3 QmFja2VuZC5oIgogCiAjaW5jbHVkZSAiV1BFUXRWaWV3LmgiCkBAIC0yMTAsNyArMjA5LDcgQEAg R0x1aW50IFdQRVF0Vmlld0JhY2tlbmQ6OnRleHR1cmUoUU9wZW5HTENvbnRleHQqIGNvbnRleHQp CiAKIHZvaWQgV1BFUXRWaWV3QmFja2VuZDo6ZGlzcGxheUltYWdlKHN0cnVjdCB3cGVfZmRvX2Vn bF9leHBvcnRlZF9pbWFnZSogaW1hZ2UpCiB7Ci0gICAgUkVMRUFTRV9BU1NFUlQoIW1fbG9ja2Vk SW1hZ2UpOworICAgIFFfQVNTVU1FKCFtX2xvY2tlZEltYWdlKTsKICAgICBtX2xvY2tlZEltYWdl ID0gaW1hZ2U7CiAgICAgaWYgKG1fdmlldykKICAgICAgICAgbV92aWV3LT50cmlnZ2VyVXBkYXRl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL3F0L1dQRVF0 Vmlld0xvYWRSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQv V1BFUXRWaWV3TG9hZFJlcXVlc3QuY3BwCmluZGV4IDhmNzcxM2Q5NTBmZmYzMWM5OGYxZGU0M2Y3 OWEyMmI2ZjY1ZDA4YmIuLjdiMjJhMjRiMDI0YTdiNzY1ZTlmYmYzYjgzMDRjMDg2OGMyOTUyY2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQvV1BFUXRWaWV3 TG9hZFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvcXQv V1BFUXRWaWV3TG9hZFJlcXVlc3QuY3BwCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdo dCAoQykgMjAxOCwgMjAxOSBJZ2FsaWEgUy5MCisgKiBDb3B5cmlnaHQgKEMpIDIwMTgsIDIwMTks IDIwMjEgSWdhbGlhIFMuTAogICogQ29weXJpZ2h0IChDKSAyMDE4LCAyMDE5IFpvZGlhYyBJbmZs aWdodCBJbm5vdmF0aW9ucwogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTE4LDcgKzE4LDYgQEAKICAqIEJvc3Rv biwgTUEgMDIxMTAtMTMwMSwgVVNBLgogICovCiAKLSNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJXUEVRdFZpZXdMb2FkUmVxdWVzdC5oIgogCiAjaW5jbHVkZSAiV1BFUXRWaWV3LmgiCg==