231548 2021-10-11 19:43:28 -0700 [GPU Process] Unique RenderingResourceIdentifiers Part 5: Uniquify RemoteDisplayListRecorder at entry points 2021-10-11 20:05:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 217638 1 mmaxfield mmaxfield webkit-bug-importer wenson_hsieh oldest_to_newest 1802929 0 mmaxfield 2021-10-11 19:43:28 -0700 [GPU Process] Unique RenderingResourceIdentifiers Part 5: Uniquify RemoteDisplayListRecorder at entry points 1802930 1 webkit-bug-importer 2021-10-11 19:45:49 -0700 <rdar://problem/84128595> 1802931 2 440872 mmaxfield 2021-10-11 19:46:14 -0700 Created attachment 440872 Patch 1802932 3 mmaxfield 2021-10-11 19:46:17 -0700 <rdar://problem/84128595> 1802942 4 mmaxfield 2021-10-11 20:05:11 -0700 Committed r283965 (242812@main): <https://commits.webkit.org/242812@main> 440872 2021-10-11 19:46:14 -0700 2021-10-11 19:48:31 -0700 Patch bug-231548-20211011194613.patch text/plain 11670 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzOTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM4MzBhYzZiMjc3YjcxNjJh MmMwNThjMWY3MmFiYjhkZDFjNGI1YzAuLjA4NDExNTllZjRiNTU1YjI5YzcwMGEwOWRmYzVhZDgz ZTg2ZGZmMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMTAtMTEgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVIFByb2Nlc3Nd IFVuaXF1ZSBSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXJzIFBhcnQgNTogVW5pcXVpZnkgUmVt b3RlRGlzcGxheUxpc3RSZWNvcmRlciBhdCBlbnRyeSBwb2ludHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTU0OAorICAgICAgICA8cmRhcjovL3By b2JsZW0vODQxMjg1OTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBzaW1wbHkgYXBwbGllcyB0aGUgc2FtZSB0cmVhdG1lbnQgaW4gaHR0cHM6 Ly9jb21taXRzLndlYmtpdC5vcmcvMjQyNjc2QG1haW4gdG8KKyAgICAgICAgUmVtb3RlRGlzcGxh eUxpc3RSZWNvcmRlci4gVGhpcyBpcyBiZWluZyBkb25lIGluIGEgZm9sbG93LXVwIHBhdGNoIGJl Y2F1c2UgaXQKKyAgICAgICAgcmVsaWVzIG9uIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzE0ODQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUg aXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogR1BVUHJvY2Vzcy9ncmFwaGljcy9S ZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlRGlz cGxheUxpc3RSZWNvcmRlcjo6UmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcik6CisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI6OmNsaXBUb0ltYWdlQnVmZmVyKToKKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcjo6Y2xpcFRvSW1hZ2VCdWZm ZXJXaXRoUXVhbGlmaWVkSWRlbnRpZmllcik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZURpc3Bs YXlMaXN0UmVjb3JkZXI6OmRyYXdJbWFnZUJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZURpc3BsYXlMaXN0UmVjb3JkZXI6OmRyYXdJbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlm aWVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcjo6ZHJhd05h dGl2ZUltYWdlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcjo6 ZHJhd05hdGl2ZUltYWdlV2l0aFF1YWxpZmllZElkZW50aWZpZXIpOgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyOjpkcmF3UGF0dGVybik6CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI6OmRyYXdQYXR0ZXJuV2l0aFF1YWxpZmllZElk ZW50aWZpZXIpOgorICAgICAgICAqIEdQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlRGlzcGxheUxp c3RSZWNvcmRlci5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVy OjpjcmVhdGUpOgorCiAyMDIxLTEwLTExICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2ZXJ0IDI0MjgwNkBtYWluIGJlY2F1c2UgaXQgYnJva2Ug dGhlIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3Mv UmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv Z3JhcGhpY3MvUmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlci5jcHAKaW5kZXggZWE1NGY3ZGIxYzg1 OTNiODNkYWRkYjBkZTk0MmNjNTg2ZDU3ZmIzNC4uM2E1YjEzYTVjYmU3ZmQyMDgxNzUxMDllZmUz ZGUxYzU5YzU0OTRjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBo aWNzL1JlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BV UHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyLmNwcApAQCAtMzMsOSAr MzMsMTAgQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAK LVJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI6OlJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXIoSW1h Z2VCdWZmZXImIGltYWdlQnVmZmVyLCBRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIgaW1hZ2VCdWZmZXJJZGVudGlmaWVyLCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kJiByZW5kZXJp bmdCYWNrZW5kKQorUmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcjo6UmVtb3RlRGlzcGxheUxpc3RS ZWNvcmRlcihJbWFnZUJ1ZmZlciYgaW1hZ2VCdWZmZXIsIFF1YWxpZmllZFJlbmRlcmluZ1Jlc291 cmNlSWRlbnRpZmllciBpbWFnZUJ1ZmZlcklkZW50aWZpZXIsIFByb2Nlc3NJZGVudGlmaWVyIHdl YlByb2Nlc3NJZGVudGlmaWVyLCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kJiByZW5kZXJpbmdCYWNr ZW5kKQogICAgIDogbV9pbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlcikKICAgICAsIG1faW1hZ2VCdWZm ZXJJZGVudGlmaWVyKGltYWdlQnVmZmVySWRlbnRpZmllcikKKyAgICAsIG1fd2ViUHJvY2Vzc0lk ZW50aWZpZXIod2ViUHJvY2Vzc0lkZW50aWZpZXIpCiAgICAgLCBtX3JlbmRlcmluZ0JhY2tlbmQo cmVuZGVyaW5nQmFja2VuZCkKIHsKIH0KQEAgLTE3MiwxNiArMTczLDIxIEBAIHZvaWQgUmVtb3Rl RGlzcGxheUxpc3RSZWNvcmRlcjo6Y2xpcE91dChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiAgICAg aGFuZGxlSXRlbShEaXNwbGF5TGlzdDo6Q2xpcE91dChyZWN0KSk7CiB9CiAKLXZvaWQgUmVtb3Rl RGlzcGxheUxpc3RSZWNvcmRlcjo6Y2xpcFRvSW1hZ2VCdWZmZXIoV2ViQ29yZTo6UmVuZGVyaW5n UmVzb3VyY2VJZGVudGlmaWVyIGltYWdlQnVmZmVySWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0JiBkZXN0aW5hdGlvblJlY3QpCit2b2lkIFJlbW90ZURpc3BsYXlMaXN0UmVjb3Jk ZXI6OmNsaXBUb0ltYWdlQnVmZmVyKFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBpbWFnZUJ1 ZmZlcklkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgZGVzdGluYXRpb25SZWN0 KQogewotICAgIFJlZlB0ciBpbWFnZUJ1ZmZlciA9IHJlc291cmNlQ2FjaGUoKS5jYWNoZWRJbWFn ZUJ1ZmZlcihpbWFnZUJ1ZmZlcklkZW50aWZpZXIpOworICAgIGNsaXBUb0ltYWdlQnVmZmVyV2l0 aFF1YWxpZmllZElkZW50aWZpZXIoeyBpbWFnZUJ1ZmZlcklkZW50aWZpZXIsIG1fd2ViUHJvY2Vz c0lkZW50aWZpZXIgfSwgZGVzdGluYXRpb25SZWN0KTsKK30KKwordm9pZCBSZW1vdGVEaXNwbGF5 TGlzdFJlY29yZGVyOjpjbGlwVG9JbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlmaWVyKFF1 YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBpbWFnZUJ1ZmZlcklkZW50aWZpZXIs IGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgZGVzdGluYXRpb25SZWN0KQoreworICAgIFJlZlB0 ciBpbWFnZUJ1ZmZlciA9IHJlc291cmNlQ2FjaGUoKS5jYWNoZWRJbWFnZUJ1ZmZlcihpbWFnZUJ1 ZmZlcklkZW50aWZpZXIub2JqZWN0KCkpOwogICAgIGlmICghaW1hZ2VCdWZmZXIpIHsKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBo YW5kbGVJdGVtKERpc3BsYXlMaXN0OjpDbGlwVG9JbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlcklkZW50 aWZpZXIsIGRlc3RpbmF0aW9uUmVjdCksICppbWFnZUJ1ZmZlcik7Ci0gICAgcmVzb3VyY2VDYWNo ZSgpLnJlY29yZFJlc291cmNlVXNlKGltYWdlQnVmZmVySWRlbnRpZmllcik7CisgICAgaGFuZGxl SXRlbShEaXNwbGF5TGlzdDo6Q2xpcFRvSW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXJJZGVudGlmaWVy Lm9iamVjdCgpLCBkZXN0aW5hdGlvblJlY3QpLCAqaW1hZ2VCdWZmZXIpOworICAgIHJlc291cmNl Q2FjaGUoKS5yZWNvcmRSZXNvdXJjZVVzZShpbWFnZUJ1ZmZlcklkZW50aWZpZXIub2JqZWN0KCkp OwogfQogCiB2b2lkIFJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI6OmNsaXBPdXRUb1BhdGgoY29u c3QgUGF0aCYgcGF0aCkKQEAgLTIyMyw0MCArMjI5LDU2IEBAIHZvaWQgUmVtb3RlRGlzcGxheUxp c3RSZWNvcmRlcjo6ZHJhd0dseXBocyhEaXNwbGF5TGlzdDo6RHJhd0dseXBocyYmIGl0ZW0pCiAg ICAgcmVzb3VyY2VDYWNoZSgpLnJlY29yZFJlc291cmNlVXNlKGZvbnRJZGVudGlmaWVyKTsKIH0K IAorCiB2b2lkIFJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI6OmRyYXdJbWFnZUJ1ZmZlcihSZW5k ZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgaW1hZ2VCdWZmZXJJZGVudGlmaWVyLCBjb25zdCBGbG9h dFJlY3QmIGRlc3RpbmF0aW9uUmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBJ bWFnZVBhaW50aW5nT3B0aW9ucyYgb3B0aW9ucykKIHsKLSAgICBSZWZQdHIgaW1hZ2VCdWZmZXIg PSByZXNvdXJjZUNhY2hlKCkuY2FjaGVkSW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXJJZGVudGlmaWVy KTsKKyAgICBkcmF3SW1hZ2VCdWZmZXJXaXRoUXVhbGlmaWVkSWRlbnRpZmllcih7IGltYWdlQnVm ZmVySWRlbnRpZmllciwgbV93ZWJQcm9jZXNzSWRlbnRpZmllciB9LCBkZXN0aW5hdGlvblJlY3Qs IHNyY1JlY3QsIG9wdGlvbnMpOworfQorCit2b2lkIFJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI6 OmRyYXdJbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlmaWVyKFF1YWxpZmllZFJlbmRlcmlu Z1Jlc291cmNlSWRlbnRpZmllciBpbWFnZUJ1ZmZlcklkZW50aWZpZXIsIGNvbnN0IEZsb2F0UmVj dCYgZGVzdGluYXRpb25SZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEltYWdl UGFpbnRpbmdPcHRpb25zJiBvcHRpb25zKQoreworICAgIFJlZlB0ciBpbWFnZUJ1ZmZlciA9IHJl c291cmNlQ2FjaGUoKS5jYWNoZWRJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlcklkZW50aWZpZXIub2Jq ZWN0KCkpOwogICAgIGlmICghaW1hZ2VCdWZmZXIpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBoYW5kbGVJdGVtKERpc3BsYXlM aXN0OjpEcmF3SW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXJJZGVudGlmaWVyLCBkZXN0aW5hdGlvblJl Y3QsIHNyY1JlY3QsIG9wdGlvbnMpLCAqaW1hZ2VCdWZmZXIpOwotICAgIHJlc291cmNlQ2FjaGUo KS5yZWNvcmRSZXNvdXJjZVVzZShpbWFnZUJ1ZmZlcklkZW50aWZpZXIpOworICAgIGhhbmRsZUl0 ZW0oRGlzcGxheUxpc3Q6OkRyYXdJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlcklkZW50aWZpZXIub2Jq ZWN0KCksIGRlc3RpbmF0aW9uUmVjdCwgc3JjUmVjdCwgb3B0aW9ucyksICppbWFnZUJ1ZmZlcik7 CisgICAgcmVzb3VyY2VDYWNoZSgpLnJlY29yZFJlc291cmNlVXNlKGltYWdlQnVmZmVySWRlbnRp Zmllci5vYmplY3QoKSk7CiB9CiAKIHZvaWQgUmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcjo6ZHJh d05hdGl2ZUltYWdlKFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBpbWFnZUlkZW50aWZpZXIs IGNvbnN0IEZsb2F0U2l6ZSYgaW1hZ2VTaXplLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBj b25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEltYWdlUGFpbnRpbmdPcHRpb25zJiBvcHRp b25zKQogewotICAgIFJlZlB0ciBpbWFnZSA9IHJlc291cmNlQ2FjaGUoKS5jYWNoZWROYXRpdmVJ bWFnZShpbWFnZUlkZW50aWZpZXIpOworICAgIGRyYXdOYXRpdmVJbWFnZVdpdGhRdWFsaWZpZWRJ ZGVudGlmaWVyKHsgaW1hZ2VJZGVudGlmaWVyLCBtX3dlYlByb2Nlc3NJZGVudGlmaWVyIH0sIGlt YWdlU2l6ZSwgZGVzdFJlY3QsIHNyY1JlY3QsIG9wdGlvbnMpOworfQorCit2b2lkIFJlbW90ZURp c3BsYXlMaXN0UmVjb3JkZXI6OmRyYXdOYXRpdmVJbWFnZVdpdGhRdWFsaWZpZWRJZGVudGlmaWVy KFF1YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBpbWFnZUlkZW50aWZpZXIsIGNv bnN0IEZsb2F0U2l6ZSYgaW1hZ2VTaXplLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBjb25z dCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEltYWdlUGFpbnRpbmdPcHRpb25zJiBvcHRpb25z KQoreworICAgIFJlZlB0ciBpbWFnZSA9IHJlc291cmNlQ2FjaGUoKS5jYWNoZWROYXRpdmVJbWFn ZShpbWFnZUlkZW50aWZpZXIub2JqZWN0KCkpOwogICAgIGlmICghaW1hZ2UpIHsKICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBoYW5k bGVJdGVtKERpc3BsYXlMaXN0OjpEcmF3TmF0aXZlSW1hZ2UoaW1hZ2VJZGVudGlmaWVyLCBpbWFn ZVNpemUsIGRlc3RSZWN0LCBzcmNSZWN0LCBvcHRpb25zKSwgKmltYWdlKTsKLSAgICByZXNvdXJj ZUNhY2hlKCkucmVjb3JkUmVzb3VyY2VVc2UoaW1hZ2VJZGVudGlmaWVyKTsKKyAgICBoYW5kbGVJ dGVtKERpc3BsYXlMaXN0OjpEcmF3TmF0aXZlSW1hZ2UoaW1hZ2VJZGVudGlmaWVyLm9iamVjdCgp LCBpbWFnZVNpemUsIGRlc3RSZWN0LCBzcmNSZWN0LCBvcHRpb25zKSwgKmltYWdlKTsKKyAgICBy ZXNvdXJjZUNhY2hlKCkucmVjb3JkUmVzb3VyY2VVc2UoaW1hZ2VJZGVudGlmaWVyLm9iamVjdCgp KTsKIH0KIAogdm9pZCBSZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyOjpkcmF3UGF0dGVybihSZW5k ZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgaW1hZ2VJZGVudGlmaWVyLCBjb25zdCBGbG9hdFNpemUm IGltYWdlU2l6ZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiB0 aWxlUmVjdCwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiB0cmFuc2Zvcm0sIGNvbnN0IEZsb2F0UG9p bnQmIHBoYXNlLCBjb25zdCBGbG9hdFNpemUmIHNwYWNpbmcsIGNvbnN0IEltYWdlUGFpbnRpbmdP cHRpb25zJiBvcHRpb25zKQogewotICAgIFJlZlB0ciBpbWFnZSA9IHJlc291cmNlQ2FjaGUoKS5j YWNoZWROYXRpdmVJbWFnZShpbWFnZUlkZW50aWZpZXIpOworICAgIGRyYXdQYXR0ZXJuV2l0aFF1 YWxpZmllZElkZW50aWZpZXIoeyBpbWFnZUlkZW50aWZpZXIsIG1fd2ViUHJvY2Vzc0lkZW50aWZp ZXIgfSwgaW1hZ2VTaXplLCBkZXN0UmVjdCwgdGlsZVJlY3QsIHRyYW5zZm9ybSwgcGhhc2UsIHNw YWNpbmcsIG9wdGlvbnMpOworfQorCit2b2lkIFJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI6OmRy YXdQYXR0ZXJuV2l0aFF1YWxpZmllZElkZW50aWZpZXIoUXVhbGlmaWVkUmVuZGVyaW5nUmVzb3Vy Y2VJZGVudGlmaWVyIGltYWdlSWRlbnRpZmllciwgY29uc3QgRmxvYXRTaXplJiBpbWFnZVNpemUs IGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgdGlsZVJlY3QsIGNv bnN0IEFmZmluZVRyYW5zZm9ybSYgdHJhbnNmb3JtLCBjb25zdCBGbG9hdFBvaW50JiBwaGFzZSwg Y29uc3QgRmxvYXRTaXplJiBzcGFjaW5nLCBjb25zdCBJbWFnZVBhaW50aW5nT3B0aW9ucyYgb3B0 aW9ucykKK3sKKyAgICBSZWZQdHIgaW1hZ2UgPSByZXNvdXJjZUNhY2hlKCkuY2FjaGVkTmF0aXZl SW1hZ2UoaW1hZ2VJZGVudGlmaWVyLm9iamVjdCgpKTsKICAgICBpZiAoIWltYWdlKSB7CiAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg aGFuZGxlSXRlbShEaXNwbGF5TGlzdDo6RHJhd1BhdHRlcm4oaW1hZ2VJZGVudGlmaWVyLCBpbWFn ZVNpemUsIGRlc3RSZWN0LCB0aWxlUmVjdCwgdHJhbnNmb3JtLCBwaGFzZSwgc3BhY2luZywgb3B0 aW9ucyksICppbWFnZSk7Ci0gICAgcmVzb3VyY2VDYWNoZSgpLnJlY29yZFJlc291cmNlVXNlKGlt YWdlSWRlbnRpZmllcik7CisgICAgaGFuZGxlSXRlbShEaXNwbGF5TGlzdDo6RHJhd1BhdHRlcm4o aW1hZ2VJZGVudGlmaWVyLm9iamVjdCgpLCBpbWFnZVNpemUsIGRlc3RSZWN0LCB0aWxlUmVjdCwg dHJhbnNmb3JtLCBwaGFzZSwgc3BhY2luZywgb3B0aW9ucyksICppbWFnZSk7CisgICAgcmVzb3Vy Y2VDYWNoZSgpLnJlY29yZFJlc291cmNlVXNlKGltYWdlSWRlbnRpZmllci5vYmplY3QoKSk7CiB9 CiAKIHZvaWQgUmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcjo6YmVnaW5UcmFuc3BhcmVuY3lMYXll cihmbG9hdCBvcGFjaXR5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dy YXBoaWNzL1JlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXIuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9ncmFwaGljcy9SZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyLmgKaW5kZXggMjQwYWU4ZDI5 N2VmMzZkNGExYzUyNDRkYTg2ZTFlNDM3MjEyZjQ0YS4uMTMzNGNkN2MzOTEyZWJkNTVjOGJmZTE4 MzZhYjQ4OTlhY2I1MWQwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dy YXBoaWNzL1JlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQ VVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlci5oCkBAIC0zMyw2ICsz Myw3IEBACiAjaW5jbHVkZSAiU3RyZWFtTWVzc2FnZVJlY2VpdmVyLmgiCiAjaW5jbHVkZSAiU3Ry ZWFtU2VydmVyQ29ubmVjdGlvbi5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRGlzcGxheUxpc3RJdGVt cy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUHJvY2Vzc0lkZW50aWZpZXIuaD4KICNpbmNsdWRlIDx3 dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKQEAgLTQzLDkgKzQ0 LDkgQEAgY2xhc3MgUmVtb3RlUmVzb3VyY2VDYWNoZTsKIAogY2xhc3MgUmVtb3RlRGlzcGxheUxp c3RSZWNvcmRlciA6IHB1YmxpYyBJUEM6OlN0cmVhbU1lc3NhZ2VSZWNlaXZlciwgcHVibGljIENh bk1ha2VXZWFrUHRyPFJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI+IHsKIHB1YmxpYzoKLSAgICBz dGF0aWMgUmVmPFJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXI+IGNyZWF0ZShXZWJDb3JlOjpJbWFn ZUJ1ZmZlciYgaW1hZ2VCdWZmZXIsIFF1YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmll ciBpbWFnZUJ1ZmZlcklkZW50aWZpZXIsIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQmIHJlbmRlcmlu Z0JhY2tlbmQpCisgICAgc3RhdGljIFJlZjxSZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyPiBjcmVh dGUoV2ViQ29yZTo6SW1hZ2VCdWZmZXImIGltYWdlQnVmZmVyLCBRdWFsaWZpZWRSZW5kZXJpbmdS ZXNvdXJjZUlkZW50aWZpZXIgaW1hZ2VCdWZmZXJJZGVudGlmaWVyLCBXZWJDb3JlOjpQcm9jZXNz SWRlbnRpZmllciB3ZWJQcm9jZXNzSWRlbnRpZmllciwgUmVtb3RlUmVuZGVyaW5nQmFja2VuZCYg cmVuZGVyaW5nQmFja2VuZCkKICAgICB7Ci0gICAgICAgIGF1dG8gaW5zdGFuY2UgPSBhZG9wdFJl ZigqbmV3IFJlbW90ZURpc3BsYXlMaXN0UmVjb3JkZXIoaW1hZ2VCdWZmZXIsIGltYWdlQnVmZmVy SWRlbnRpZmllciwgcmVuZGVyaW5nQmFja2VuZCkpOworICAgICAgICBhdXRvIGluc3RhbmNlID0g YWRvcHRSZWYoKm5ldyBSZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyKGltYWdlQnVmZmVyLCBpbWFn ZUJ1ZmZlcklkZW50aWZpZXIsIHdlYlByb2Nlc3NJZGVudGlmaWVyLCByZW5kZXJpbmdCYWNrZW5k KSk7CiAgICAgICAgIGluc3RhbmNlLT5zdGFydExpc3RlbmluZ0ZvcklQQygpOwogICAgICAgICBy ZXR1cm4gaW5zdGFuY2U7CiAgICAgfQpAQCAtMTI0LDcgKzEyNSwxMiBAQCBwdWJsaWM6CiAgICAg dm9pZCBmbHVzaENvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Rmx1c2hJZGVudGlmaWVy KTsKIAogcHJpdmF0ZToKLSAgICBSZW1vdGVEaXNwbGF5TGlzdFJlY29yZGVyKFdlYkNvcmU6Oklt YWdlQnVmZmVyJiwgUXVhbGlmaWVkUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBSZW1vdGVS ZW5kZXJpbmdCYWNrZW5kJik7CisgICAgUmVtb3RlRGlzcGxheUxpc3RSZWNvcmRlcihXZWJDb3Jl OjpJbWFnZUJ1ZmZlciYsIFF1YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciwgV2Vi Q29yZTo6UHJvY2Vzc0lkZW50aWZpZXIgd2ViUHJvY2Vzc0lkZW50aWZpZXIsIFJlbW90ZVJlbmRl cmluZ0JhY2tlbmQmKTsKKworICAgIHZvaWQgY2xpcFRvSW1hZ2VCdWZmZXJXaXRoUXVhbGlmaWVk SWRlbnRpZmllcihRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIGNvbnN0IFdl YkNvcmU6OkZsb2F0UmVjdCYgZGVzdGluYXRpb25SZWN0KTsKKyAgICB2b2lkIGRyYXdJbWFnZUJ1 ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlmaWVyKFF1YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRl bnRpZmllciBpbWFnZUJ1ZmZlcklkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYg ZGVzdGluYXRpb25SZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0 IFdlYkNvcmU6OkltYWdlUGFpbnRpbmdPcHRpb25zJik7CisgICAgdm9pZCBkcmF3TmF0aXZlSW1h Z2VXaXRoUXVhbGlmaWVkSWRlbnRpZmllcihRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50 aWZpZXIgaW1hZ2VJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmIGltYWdlU2l6 ZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgV2ViQ29yZTo6Rmxv YXRSZWN0JiBzcmNSZWN0LCBjb25zdCBXZWJDb3JlOjpJbWFnZVBhaW50aW5nT3B0aW9ucyYpOwor ICAgIHZvaWQgZHJhd1BhdHRlcm5XaXRoUXVhbGlmaWVkSWRlbnRpZmllcihRdWFsaWZpZWRSZW5k ZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgaW1hZ2VJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpG bG9hdFNpemUmIGltYWdlU2l6ZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBkZXN0UmVjdCwg Y29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB0aWxlUmVjdCwgY29uc3QgV2ViQ29yZTo6QWZmaW5l VHJhbnNmb3JtJiwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYsIGNvbnN0IFdlYkNvcmU6OkZs b2F0U2l6ZSYgc3BhY2luZywgY29uc3QgV2ViQ29yZTo6SW1hZ2VQYWludGluZ09wdGlvbnMmKTsK IAogICAgIFJlbW90ZVJlc291cmNlQ2FjaGUmIHJlc291cmNlQ2FjaGUoKTsKICAgICBXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQmIGRyYXdpbmdDb250ZXh0KCk7CkBAIC0xNDMsNiArMTQ5LDcgQEAg cHJpdmF0ZToKIAogICAgIFJlZjxXZWJDb3JlOjpJbWFnZUJ1ZmZlcj4gbV9pbWFnZUJ1ZmZlcjsK ICAgICBRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgbV9pbWFnZUJ1ZmZlcklk ZW50aWZpZXI7CisgICAgV2ViQ29yZTo6UHJvY2Vzc0lkZW50aWZpZXIgbV93ZWJQcm9jZXNzSWRl bnRpZmllcjsKICAgICBSZWY8UmVtb3RlUmVuZGVyaW5nQmFja2VuZD4gbV9yZW5kZXJpbmdCYWNr ZW5kOwogICAgIFJlZlB0cjxXZWJDb3JlOjpJbWFnZUJ1ZmZlcj4gbV9tYXNrSW1hZ2VCdWZmZXI7 CiAgICAgYm9vbCBtX2lzTGlzdGVuaW5nRm9ySVBDIHsgZmFsc2UgfTsK