227784 2021-07-07 18:02:36 -0700 Merge Cairo::save and Cairo::restore into GraphicsContextCairo's methods 2021-07-08 00:24:17 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227780 1 fujii fujii cgarcia don.olmstead webkit-bug-importer zan zdobersek oldest_to_newest 1775559 0 fujii 2021-07-07 18:02:36 -0700 Merge Cairo::save and Cairo::restore into GraphicsContextCairo's methods This is a sub-task of Bug 227780 – [Cairo] All functions in CairoOperations.cpp should be GraphicsContextCairo's methods 1775561 1 433103 fujii 2021-07-07 18:07:12 -0700 Created attachment 433103 Patch 1775629 2 433103 fujii 2021-07-08 00:23:37 -0700 Comment on attachment 433103 Patch Clearing flags on attachment: 433103 Committed r279713 (239505@main): <https://commits.webkit.org/239505@main> 1775631 3 fujii 2021-07-08 00:23:41 -0700 All reviewed patches have been landed. Closing bug. 1775632 4 webkit-bug-importer 2021-07-08 00:24:17 -0700 <rdar://problem/80309652> 433103 2021-07-07 18:07:12 -0700 2021-07-08 00:23:37 -0700 Patch bug-227784-20210708100711.patch text/plain 10766 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDhmMmQ4Y2M1OTIyNjJh YjZjMjI4YmJkNzIzNDllNjAxZDYxNTY5Ny4uNWQyZmYxY2MzMTg1NjgwZDQ5ZTQ5ZDliYzA5M2Qy Mjk5Zjg5NDBlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA3LTA3ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIE1lcmdlIENh aXJvOjpzYXZlIGFuZCBDYWlybzo6cmVzdG9yZSBpbnRvIEdyYXBoaWNzQ29udGV4dENhaXJvJ3Mg bWV0aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI3Nzg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2Fpcm86OnNhdmUgYW5kIENhaXJvOjpyZXN0b3JlIHNob3VsZCBiZSBHcmFwaGljc0NvbnRleHRD YWlybydzCisgICAgICAgIG1ldGhvZHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9DYWlyb09wZXJhdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmZpbGxT aGFkb3dCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OnNhdmUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OnJlc3RvcmUpOiBEZWxldGVkLgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0dyYWRpZW50Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 R3JhZGllbnQ6OmZpbGwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBo aWNzQ29udGV4dENhaXJvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dENh aXJvOjpzYXZlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dENhaXJvOjpyZXN0 b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dENhaXJvOjpmaWxsUmVjdCk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRDYWlybzo6c2F2ZUludGVybmFsKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dENhaXJvOjpyZXN0b3Jl SW50ZXJuYWwpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dy YXBoaWNzQ29udGV4dENhaXJvLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3Np YS9jYWlyby9OaWNvc2lhQ2Fpcm9PcGVyYXRpb25SZWNvcmRlci5jcHA6CisgICAgICAgIChOaWNv c2lhOjpDYWlyb09wZXJhdGlvblJlY29yZGVyOjpmaWxsUmVjdCk6CisgICAgICAgIChOaWNvc2lh OjpDYWlyb09wZXJhdGlvblJlY29yZGVyOjpzYXZlKToKKyAgICAgICAgKE5pY29zaWE6OkNhaXJv T3BlcmF0aW9uUmVjb3JkZXI6OnJlc3RvcmUpOgorCiAyMDIxLTA3LTA3ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgSURCSW5kZXgua2V5UGF0aCBzaG91bGQga2Vl cCByZXR1cm5pbmcgdGhlIHNhbWUgb2JqZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcAppbmRleCA1NmYw ZDFiZjA2NTJlYTQ0ZTYzMDE5M2RiNDQ5ZDE2NmZmYzgzMzhlLi45NTE0N2Q2ZGY1ZWNmNTVhMGRk YzZiMWU5Njk5NDg5MzU0Nzg4NjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAKQEAgLTE5MCw3ICsx OTAsNyBAQCBzdGF0aWMgdm9pZCBkcmF3U2hhZG93SW1hZ2UoR3JhcGhpY3NDb250ZXh0Q2Fpcm8m IHBsYXRmb3JtQ29udGV4dCwgSW1hZ2VCdWZmZXImCiAKIHN0YXRpYyB2b2lkIGZpbGxTaGFkb3dC dWZmZXIoR3JhcGhpY3NDb250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgSW1hZ2VCdWZmZXIm IGxheWVySW1hZ2UsIGNvbnN0IEZsb2F0UG9pbnQmIGxheWVyT3JpZ2luLCBjb25zdCBGbG9hdFNp emUmIGxheWVyU2l6ZSwgY29uc3QgU2hhZG93U3RhdGUmIHNoYWRvd1N0YXRlKQogewotICAgIHNh dmUocGxhdGZvcm1Db250ZXh0KTsKKyAgICBwbGF0Zm9ybUNvbnRleHQuc2F2ZSgpOwogCiAgICAg aWYgKGF1dG8gbmF0aXZlSW1hZ2UgPSBsYXllckltYWdlLmNvcHlOYXRpdmVJbWFnZShEb250Q29w eUJhY2tpbmdTdG9yZSkpCiAgICAgICAgIGNsaXBUb0ltYWdlQnVmZmVyKHBsYXRmb3JtQ29udGV4 dCwgbmF0aXZlSW1hZ2UtPnBsYXRmb3JtSW1hZ2UoKS5nZXQoKSwgRmxvYXRSZWN0KGxheWVyT3Jp Z2luLCBleHBhbmRlZEludFNpemUobGF5ZXJTaXplKSkpOwpAQCAtMjAwLDcgKzIwMCw3IEBAIHN0 YXRpYyB2b2lkIGZpbGxTaGFkb3dCdWZmZXIoR3JhcGhpY3NDb250ZXh0Q2Fpcm8mIHBsYXRmb3Jt Q29udGV4dCwgSW1hZ2VCdWZmZXImCiAgICAgZmlsbFNvdXJjZS5jb2xvciA9IHNoYWRvd1N0YXRl LmNvbG9yOwogICAgIGZpbGxSZWN0KHBsYXRmb3JtQ29udGV4dCwgRmxvYXRSZWN0KGxheWVyT3Jp Z2luLCBleHBhbmRlZEludFNpemUobGF5ZXJTaXplKSksIGZpbGxTb3VyY2UsIFNoYWRvd1N0YXRl KCkpOwogCi0gICAgcmVzdG9yZShwbGF0Zm9ybUNvbnRleHQpOworICAgIHBsYXRmb3JtQ29udGV4 dC5yZXN0b3JlKCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBkcmF3UGF0aFNoYWRvdyhHcmFw aGljc0NvbnRleHRDYWlybyYgcGxhdGZvcm1Db250ZXh0LCBjb25zdCBGaWxsU291cmNlJiBmaWxs U291cmNlLCBjb25zdCBTdHJva2VTb3VyY2UmIHN0cm9rZVNvdXJjZSwgY29uc3QgU2hhZG93U3Rh dGUmIHNoYWRvd1N0YXRlLCBQYXRoRHJhd2luZ1N0eWxlIGRyYXdpbmdTdHlsZSkKQEAgLTExNzgs MjIgKzExNzgsNiBAQCB2b2lkIGRyYXdGb2N1c1JpbmcoR3JhcGhpY3NDb250ZXh0Q2Fpcm8mIHBs YXRmb3JtQ29udGV4dCwgY29uc3QgVmVjdG9yPEZsb2F0UmVjdAogICAgIGRyYXdGb2N1c1Jpbmco cGxhdGZvcm1Db250ZXh0LCBwYXRoLCB3aWR0aCwgY29sb3IpOwogfQogCi12b2lkIHNhdmUoR3Jh cGhpY3NDb250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCkKLXsKLSAgICBwbGF0Zm9ybUNvbnRl eHQuc2F2ZUludGVybmFsKCk7Ci0KLSAgICBpZiAoYXV0byogZ3JhcGhpY3NDb250ZXh0UHJpdmF0 ZSA9IHBsYXRmb3JtQ29udGV4dC5ncmFwaGljc0NvbnRleHRQcml2YXRlKCkpCi0gICAgICAgIGdy YXBoaWNzQ29udGV4dFByaXZhdGUtPnNhdmUoKTsKLX0KLQotdm9pZCByZXN0b3JlKEdyYXBoaWNz Q29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQpCi17Ci0gICAgcGxhdGZvcm1Db250ZXh0LnJl c3RvcmVJbnRlcm5hbCgpOwotCi0gICAgaWYgKGF1dG8qIGdyYXBoaWNzQ29udGV4dFByaXZhdGUg PSBwbGF0Zm9ybUNvbnRleHQuZ3JhcGhpY3NDb250ZXh0UHJpdmF0ZSgpKQotICAgICAgICBncmFw aGljc0NvbnRleHRQcml2YXRlLT5yZXN0b3JlKCk7Ci19Ci0KIHZvaWQgdHJhbnNsYXRlKEdyYXBo aWNzQ29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQsIGZsb2F0IHgsIGZsb2F0IHkpCiB7CiAg ICAgY2Fpcm9fdHJhbnNsYXRlKHBsYXRmb3JtQ29udGV4dC5jcigpLCB4LCB5KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9u cy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRp b25zLmgKaW5kZXggN2RkOWFlNzJiMzIzNWY1YTEwMzNhOTY2MzE2NTgxOTQ0ZGM1ZDQzMy4uNTQ5 ODU2M2NlNDljMTVlMzVkMDgyNTljMmQyNmRjN2IxN2NlYTg4NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmgK QEAgLTE1NSw5ICsxNTUsNiBAQCB2b2lkIGRyYXdFbGxpcHNlKEdyYXBoaWNzQ29udGV4dENhaXJv JiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgQ29sb3ImLCBTdHJva2VTdAogdm9pZCBkcmF3Rm9j dXNSaW5nKEdyYXBoaWNzQ29udGV4dENhaXJvJiwgY29uc3QgUGF0aCYsIGZsb2F0LCBjb25zdCBD b2xvciYpOwogdm9pZCBkcmF3Rm9jdXNSaW5nKEdyYXBoaWNzQ29udGV4dENhaXJvJiwgY29uc3Qg VmVjdG9yPEZsb2F0UmVjdD4mLCBmbG9hdCwgY29uc3QgQ29sb3ImKTsKIAotdm9pZCBzYXZlKEdy YXBoaWNzQ29udGV4dENhaXJvJik7Ci12b2lkIHJlc3RvcmUoR3JhcGhpY3NDb250ZXh0Q2Fpcm8m KTsKLQogdm9pZCB0cmFuc2xhdGUoR3JhcGhpY3NDb250ZXh0Q2Fpcm8mLCBmbG9hdCwgZmxvYXQp Owogdm9pZCByb3RhdGUoR3JhcGhpY3NDb250ZXh0Q2Fpcm8mLCBmbG9hdCk7CiB2b2lkIHNjYWxl KEdyYXBoaWNzQ29udGV4dENhaXJvJiwgY29uc3QgRmxvYXRTaXplJik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFkaWVudENhaXJvLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYWRpZW50Q2Fpcm8uY3Bw CmluZGV4IGE0MWM2Nzk3NDBmN2Y1MzFhMjBjZWQxOTRkNzg0Y2EwNzFiNDM3ZGUuLmQxNDVkYzBm NTE5MWVjYWYwOGVmMzI5OWZmMGI2MDc3MTkyMjE4N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYWRpZW50Q2Fpcm8uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYWRpZW50Q2Fpcm8uY3BwCkBAIC0y NDYsOSArMjQ2LDkgQEAgdm9pZCBHcmFkaWVudDo6ZmlsbChHcmFwaGljc0NvbnRleHQmIGNvbnRl eHQsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAgICBBU1NFUlQoY29udGV4dC5oYXNQbGF0Zm9y bUNvbnRleHQoKSk7CiAgICAgYXV0byYgcGxhdGZvcm1Db250ZXh0ID0gKmNvbnRleHQucGxhdGZv cm1Db250ZXh0KCk7CiAKLSAgICBDYWlybzo6c2F2ZShwbGF0Zm9ybUNvbnRleHQpOworICAgIHBs YXRmb3JtQ29udGV4dC5zYXZlKCk7CiAgICAgQ2Fpcm86OmZpbGxSZWN0KHBsYXRmb3JtQ29udGV4 dCwgcmVjdCwgcGF0dGVybi5nZXQoKSk7Ci0gICAgQ2Fpcm86OnJlc3RvcmUocGxhdGZvcm1Db250 ZXh0KTsKKyAgICBwbGF0Zm9ybUNvbnRleHQucmVzdG9yZSgpOwogfQogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKaW5kZXggNzQyYTNlNjMwZGUy ZTAzZWMxMGQwYjQzM2I2NWQ1YzFjMjAxNTE1Zi4uOWQwYTA1OTAwZjA5NmQ4YmM5NGY1NzY4OGQ5 MTA5OGNmZWVlZGI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcApAQCAtMTAyLDcg KzEwMiwxMyBAQCBHcmFwaGljc0NvbnRleHRDYWlybyogR3JhcGhpY3NDb250ZXh0Q2Fpcm86OnBs YXRmb3JtQ29udGV4dCgpIGNvbnN0CiB2b2lkIEdyYXBoaWNzQ29udGV4dENhaXJvOjpzYXZlKCkK IHsKICAgICBHcmFwaGljc0NvbnRleHQ6OnNhdmUoKTsKLSAgICBDYWlybzo6c2F2ZSgqdGhpcyk7 CisKKyAgICBtX2NhaXJvU3RhdGVTdGFjay5hcHBlbmQoQ2Fpcm9TdGF0ZSgpKTsKKyAgICBtX2Nh aXJvU3RhdGUgPSAmbV9jYWlyb1N0YXRlU3RhY2subGFzdCgpOworCisgICAgY2Fpcm9fc2F2ZSht X2NyLmdldCgpKTsKKworICAgIG1fcHJpdmF0ZS0+c2F2ZSgpOwogfQogCiB2b2lkIEdyYXBoaWNz Q29udGV4dENhaXJvOjpyZXN0b3JlKCkKQEAgLTExMSw3ICsxMTcsMjcgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHRDYWlybzo6cmVzdG9yZSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIEdyYXBoaWNz Q29udGV4dDo6cmVzdG9yZSgpOwotICAgIENhaXJvOjpyZXN0b3JlKCp0aGlzKTsKKworICAgIGlm IChtX2NhaXJvU3RhdGVTdGFjay5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlm IChtX2NhaXJvU3RhdGUtPm1fbWFzay5wYXR0ZXJuKSB7CisgICAgICAgIGNhaXJvX3BvcF9ncm91 cF90b19zb3VyY2UobV9jci5nZXQoKSk7CisKKyAgICAgICAgY2Fpcm9fbWF0cml4X3QgbWF0cml4 OworICAgICAgICBjYWlyb19nZXRfbWF0cml4KG1fY3IuZ2V0KCksICZtYXRyaXgpOworICAgICAg ICBjYWlyb19zZXRfbWF0cml4KG1fY3IuZ2V0KCksICZtX2NhaXJvU3RhdGUtPm1fbWFzay5tYXRy aXgpOworICAgICAgICBjYWlyb19tYXNrKG1fY3IuZ2V0KCksIG1fY2Fpcm9TdGF0ZS0+bV9tYXNr LnBhdHRlcm4uZ2V0KCkpOworICAgICAgICBjYWlyb19zZXRfbWF0cml4KG1fY3IuZ2V0KCksICZt YXRyaXgpOworICAgIH0KKworICAgIG1fY2Fpcm9TdGF0ZVN0YWNrLnJlbW92ZUxhc3QoKTsKKyAg ICBBU1NFUlQoIW1fY2Fpcm9TdGF0ZVN0YWNrLmlzRW1wdHkoKSk7CisgICAgbV9jYWlyb1N0YXRl ID0gJm1fY2Fpcm9TdGF0ZVN0YWNrLmxhc3QoKTsKKworICAgIGNhaXJvX3Jlc3RvcmUobV9jci5n ZXQoKSk7CisKKyAgICBtX3ByaXZhdGUtPnJlc3RvcmUoKTsKIH0KIAogLy8gRHJhd3MgYSBmaWxs ZWQgcmVjdGFuZ2xlIHdpdGggYSBzdHJva2VkIGJvcmRlci4KQEAgLTE4MSw5ICsyMDcsOSBAQCB2 b2lkIEdyYXBoaWNzQ29udGV4dENhaXJvOjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3Qs IEdyYWRpZW50JiBncmFkaWVudCkKICAgICBpZiAoIXBhdHRlcm4pCiAgICAgICAgIHJldHVybjsK IAotICAgIENhaXJvOjpzYXZlKCp0aGlzKTsKKyAgICBzYXZlKCk7CiAgICAgQ2Fpcm86OmZpbGxS ZWN0KCp0aGlzLCByZWN0LCBwYXR0ZXJuLmdldCgpKTsKLSAgICBDYWlybzo6cmVzdG9yZSgqdGhp cyk7CisgICAgcmVzdG9yZSgpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dENhaXJvOjpmaWxs UmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29tcG9zaXRl T3BlcmF0b3IgY29tcG9zaXRlT3BlcmF0b3IsIEJsZW5kTW9kZSBibGVuZE1vZGUpCkBAIC00Mjgs MzYgKzQ1NCw2IEBAIFZlY3RvcjxmbG9hdD4mIEdyYXBoaWNzQ29udGV4dENhaXJvOjpsYXllcnMo KQogICAgIHJldHVybiBtX2xheWVyczsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHRDYWlybzo6 c2F2ZUludGVybmFsKCkKLXsKLSAgICBtX2NhaXJvU3RhdGVTdGFjay5hcHBlbmQoQ2Fpcm9TdGF0 ZSgpKTsKLSAgICBtX2NhaXJvU3RhdGUgPSAmbV9jYWlyb1N0YXRlU3RhY2subGFzdCgpOwotCi0g ICAgY2Fpcm9fc2F2ZShtX2NyLmdldCgpKTsKLX0KLQotdm9pZCBHcmFwaGljc0NvbnRleHRDYWly bzo6cmVzdG9yZUludGVybmFsKCkKLXsKLSAgICBpZiAobV9jYWlyb1N0YXRlU3RhY2suaXNFbXB0 eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobV9jYWlyb1N0YXRlLT5tX21hc2sucGF0 dGVybikgewotICAgICAgICBjYWlyb19wb3BfZ3JvdXBfdG9fc291cmNlKG1fY3IuZ2V0KCkpOwot Ci0gICAgICAgIGNhaXJvX21hdHJpeF90IG1hdHJpeDsKLSAgICAgICAgY2Fpcm9fZ2V0X21hdHJp eChtX2NyLmdldCgpLCAmbWF0cml4KTsKLSAgICAgICAgY2Fpcm9fc2V0X21hdHJpeChtX2NyLmdl dCgpLCAmbV9jYWlyb1N0YXRlLT5tX21hc2subWF0cml4KTsKLSAgICAgICAgY2Fpcm9fbWFzayht X2NyLmdldCgpLCBtX2NhaXJvU3RhdGUtPm1fbWFzay5wYXR0ZXJuLmdldCgpKTsKLSAgICAgICAg Y2Fpcm9fc2V0X21hdHJpeChtX2NyLmdldCgpLCAmbWF0cml4KTsKLSAgICB9Ci0KLSAgICBtX2Nh aXJvU3RhdGVTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgQVNTRVJUKCFtX2NhaXJvU3RhdGVTdGFj ay5pc0VtcHR5KCkpOwotICAgIG1fY2Fpcm9TdGF0ZSA9ICZtX2NhaXJvU3RhdGVTdGFjay5sYXN0 KCk7Ci0KLSAgICBjYWlyb19yZXN0b3JlKG1fY3IuZ2V0KCkpOwotfQotCiB2b2lkIEdyYXBoaWNz Q29udGV4dENhaXJvOjpwdXNoSW1hZ2VNYXNrKGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSwgY29u c3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIC8vIFdlIG11c3QgY2FsbCBzYXZlUGxhdGZvcm1T dGF0ZSBhdCBsZWFzdCBvbmNlIGJlZm9yZSB3ZSBjYW4gdXNlIGltYWdlIG1hc2tpbmcsCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0Nv bnRleHRDYWlyby5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3Jh cGhpY3NDb250ZXh0Q2Fpcm8uaAppbmRleCBkMmJjNmY5NTYzZGZlNzM2MjcwNWZiMzFkZmYxMDk5 MGJlODMyZTM0Li5hZjVhNDEwZjJjMGVjYzNlNTQ0YTFkZWVkMzc2MjJkOTk0MTkzNTgwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0Nv bnRleHRDYWlyby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0dyYXBoaWNzQ29udGV4dENhaXJvLmgKQEAgLTExNCw4ICsxMTQsNiBAQCBwdWJsaWM6CiAKICAg ICBjYWlyb190KiBjcigpIGNvbnN0OwogICAgIFZlY3RvcjxmbG9hdD4mIGxheWVycygpOwotICAg IHZvaWQgc2F2ZUludGVybmFsKCk7Ci0gICAgdm9pZCByZXN0b3JlSW50ZXJuYWwoKTsKICAgICB2 b2lkIHB1c2hJbWFnZU1hc2soY2Fpcm9fc3VyZmFjZV90KiwgY29uc3QgRmxvYXRSZWN0Jik7CiAg ICAgR3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2YXRlKiBncmFwaGljc0NvbnRleHRQcml2YXRl KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29z aWEvY2Fpcm8vTmljb3NpYUNhaXJvT3BlcmF0aW9uUmVjb3JkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9jYWlyby9OaWNvc2lhQ2Fpcm9PcGVyYXRpb25S ZWNvcmRlci5jcHAKaW5kZXggY2YxZmNkZmUzODQyZWFkYjMzMzlmMjA2MmFjZmYxOWI1MzViZWIz NC4uNzI1YjZmNTI4MjA4YTE0MDNiNjYxMTkzMDNlNTUwMmUzNzM2ZDM2ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9jYWlyby9OaWNvc2lhQ2Fp cm9PcGVyYXRpb25SZWNvcmRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvbmljb3NpYS9jYWlyby9OaWNvc2lhQ2Fpcm9PcGVyYXRpb25SZWNvcmRlci5jcHAKQEAg LTI4MCw5ICsyODAsOSBAQCB2b2lkIENhaXJvT3BlcmF0aW9uUmVjb3JkZXI6OmZpbGxSZWN0KGNv bnN0IEZsb2F0UmVjdCYgcmVjdCwgR3JhZGllbnQmIGdyYWRpZW50KQogICAgICAgICB2b2lkIGV4 ZWN1dGUoUGFpbnRpbmdPcGVyYXRpb25SZXBsYXkmIHJlcGxheWVyKSBvdmVycmlkZQogICAgICAg ICB7CiAgICAgICAgICAgICBhdXRvJiBwbGF0Zm9ybUNvbnRleHQgPSBjb250ZXh0Rm9yUmVwbGF5 KHJlcGxheWVyKTsKLSAgICAgICAgICAgIENhaXJvOjpzYXZlKHBsYXRmb3JtQ29udGV4dCk7Cisg ICAgICAgICAgICBwbGF0Zm9ybUNvbnRleHQuc2F2ZSgpOwogICAgICAgICAgICAgQ2Fpcm86OmZp bGxSZWN0KHBsYXRmb3JtQ29udGV4dCwgYXJnPDA+KCksIGFyZzwxPigpLmdldCgpKTsKLSAgICAg ICAgICAgIENhaXJvOjpyZXN0b3JlKHBsYXRmb3JtQ29udGV4dCk7CisgICAgICAgICAgICBwbGF0 Zm9ybUNvbnRleHQucmVzdG9yZSgpOwogICAgICAgICB9CiAKICAgICAgICAgdm9pZCBkdW1wKFRl eHRTdHJlYW0mIHRzKSBvdmVycmlkZQpAQCAtNzQ0LDcgKzc0NCw3IEBAIHZvaWQgQ2Fpcm9PcGVy YXRpb25SZWNvcmRlcjo6c2F2ZSgpCiAKICAgICAgICAgdm9pZCBleGVjdXRlKFBhaW50aW5nT3Bl cmF0aW9uUmVwbGF5JiByZXBsYXllcikgb3ZlcnJpZGUKICAgICAgICAgewotICAgICAgICAgICAg Q2Fpcm86OnNhdmUoY29udGV4dEZvclJlcGxheShyZXBsYXllcikpOworICAgICAgICAgICAgY29u dGV4dEZvclJlcGxheShyZXBsYXllcikuc2F2ZSgpOwogICAgICAgICB9CiAKICAgICAgICAgdm9p ZCBkdW1wKFRleHRTdHJlYW0mIHRzKSBvdmVycmlkZQpAQCAtNzY3LDcgKzc2Nyw3IEBAIHZvaWQg Q2Fpcm9PcGVyYXRpb25SZWNvcmRlcjo6cmVzdG9yZSgpCiAKICAgICAgICAgdm9pZCBleGVjdXRl KFBhaW50aW5nT3BlcmF0aW9uUmVwbGF5JiByZXBsYXllcikgb3ZlcnJpZGUKICAgICAgICAgewot ICAgICAgICAgICAgQ2Fpcm86OnJlc3RvcmUoY29udGV4dEZvclJlcGxheShyZXBsYXllcikpOwor ICAgICAgICAgICAgY29udGV4dEZvclJlcGxheShyZXBsYXllcikucmVzdG9yZSgpOwogICAgICAg ICB9CiAKICAgICAgICAgdm9pZCBkdW1wKFRleHRTdHJlYW0mIHRzKSBvdmVycmlkZQo=