237063 2022-02-22 15:30:02 -0800 With DOM Rendering in GPU process, every display results in new IOSurface allocation 2022-02-22 20:31:17 -0800 1 1 1 Unclassified WebKit WebKit Process Model WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton webkit-bug-importer oldest_to_newest 1844904 0 simon.fraser 2022-02-22 15:30:02 -0800 With DOM Rendering in GPU process, every display results in new IOSurface allocation 1844909 1 452909 simon.fraser 2022-02-22 15:35:05 -0800 Created attachment 452909 Patch 1844998 2 ews-feeder 2022-02-22 20:30:04 -0800 Committed r290346 (247665@main): <https://commits.webkit.org/247665@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452909. 1844999 3 webkit-bug-importer 2022-02-22 20:31:17 -0800 <rdar://problem/89333820> 452909 2022-02-22 15:35:05 -0800 2022-02-22 20:30:06 -0800 Patch bug-237063-20220222153505.patch text/plain 9245 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc0YTMyOThmNmRiOWIxZjc2 MjYxYzFlNGYwMDMzYjlkZTI1NjcwZDYuLjZlNWY1MTU5NTAyNDNmZDRlYjE4YWQyNjE1MGU4YWEw ZDZlZTdiNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjItMDItMjIgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgV2l0aCBET00gUmVuZGVy aW5nIGluIEdQVSBwcm9jZXNzLCBldmVyeSBkaXNwbGF5IHJlc3VsdHMgaW4gbmV3IElPU3VyZmFj ZSBhbGxvY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzcwNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXZSBoYXZlIHRvIGF2b2lkIEltYWdlQnVmZmVyUmVtb3RlSU9TdXJmYWNlQmFja2VuZHMg aW4gdGhlIHdlYiBwcm9jZXNzIGZyb20gaGFuZ2luZyBvbiB0bworICAgICAgICBhbiBJT1N1cmZh Y2UgTWFjaFNlbmRSaWdodCAodmlhIEltYWdlQnVmZmVyQmFja2VuZEhhbmRsZSkgYWxsIHRoZSB0 aW1lLCBiZWNhdXNlIGRvaW5nIHNvCisgICAgICAgIG1ha2VzIHRoZSBJT1N1cmZhY2UgYXBwZWFy IHRvIGJlIGluLXVzZSwgYW5kIHRoZXJlZm9yZSBub3QgZWxpZ2libGUgZm9yIHN3YXBwaW5nIHRv LAorICAgICAgICBvciBtYWtpbmcgdm9sYXRpbGUuIEluIHBhcnRpY3VsYXIsIHN3YXBUb1ZhbGlk RnJvbnRCdWZmZXIoKSB3b3VsZCBhbHdheXMgdGhpbmsKKyAgICAgICAgdGhhdCB0aGUgc3VyZmFj ZXMgd2VyZSBpbi11c2UsIHJlc3VsdGluZyBpbiBwZXJtYW5lbnQgdHJpcGxlLWJ1ZmZlcmluZywg YW5kCisgICAgICAgIGFsbG9jYXRpb24gb2YgYSBuZXcgYnVmZmVyIG9uIGV2ZXJ5IHN3YXAuCisK KyAgICAgICAgRml4IGJ5IGNsZWFyaW5nIHRoZSBJbWFnZUJ1ZmZlckJhY2tlbmRIYW5kbGVzIG9m IGFsbCB0aGUgYnVmZmVycyBpbiB0aGUgV1AgaW4KKyAgICAgICAgUmVtb3RlUmVuZGVyaW5nQmFj a2VuZFByb3h5Ojpzd2FwVG9WYWxpZEZyb250QnVmZmVyKCksIHNvIHRoYXQgdGhlIEdQVVAgY2Fu IGFjY3VyYXRlbHkKKyAgICAgICAgZ2F1Z2UgaW4tdXNlLW5lc3M7IHdlIGdldCBiYWNrIGEgaGFu ZGxlIHRvIHRoZSBuZXcgZnJvbnQgYnVmZmVyIGluIHRoZSByZXBseSwKKyAgICAgICAgYW5kIHRo aXMgaXMgdGhlIG9ubHkgb25lIHdlIG5lZWQgdG8ga2VlcCBob2xkIG9mLCBzaW5jZSBpdCBnZXRz IHRyYW5zZmVycmVkIHRvCisgICAgICAgIHRoZSBVSSBwcm9jZXNzLgorCisgICAgICAgICogR1BV UHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdl YktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6bWFya1N1cmZhY2VOb25Wb2xhdGlsZSk6Cisg ICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OnN3YXBUb1ZhbGlkRnJvbnRC dWZmZXIpOgorICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNr aW5nU3RvcmUubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpk aXNwbGF5KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJp bmdCYWNrZW5kUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHk6OnN3YXBUb1ZhbGlkRnJvbnRCdWZmZXIpOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6Om1hcmtTdXJmYWNlTm9uVm9sYXRpbGUpOgorCiAyMDIy LTAyLTIyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFVzZSBub24taW5saW5lIG1lc3NhZ2VzIGZvciBsYXllciB2b2xhdGlsaXR5LXJlbGF0ZWQgSVBD IGluIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BV UHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJL aXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcAppbmRleCBm Yzg4MDVlMmM1MzRhODcyNmJjZWNlMDk1ZDdiMDMzMDA5NTg2NzgyLi40YmU3NzYwMDUwZTU0NDFm ZWVlOTE5YjZkNTY5ZTQ3YjM5M2QyZjFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVBy b2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwCkBAIC00 MDAsNiArNDAwLDggQEAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8SW1hZ2VCdWZmZXJCYWNrZW5kSGFu ZGxlPiBoYW5kbGVGcm9tQnVmZmVyKFdlYkNvcmU6OkltYWdlQnUKIAogdm9pZCBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kOjptYXJrU3VyZmFjZU5vblZvbGF0aWxlKFdlYkNvcmU6OlJlbmRlcmluZ1Jl c291cmNlSWRlbnRpZmllciBpZGVudGlmaWVyLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKHN0ZDo6 b3B0aW9uYWw8SW1hZ2VCdWZmZXJCYWNrZW5kSGFuZGxlPiBiYWNrZW5kSGFuZGxlLCBib29sIGJ1 ZmZlcldhc0VtcHR5KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBMT0dfV0lUSF9TVFJF QU0oUmVtb3RlUmVuZGVyaW5nQnVmZmVyVm9sYXRpbGl0eSwgc3RyZWFtIDw8ICJHUFUgUHJvY2Vz czogbWFya1N1cmZhY2VOb25Wb2xhdGlsZSAtICAiIDw8IGlkZW50aWZpZXIpOworCiAgICAgYXV0 byBpbWFnZUJ1ZmZlciA9IG1fcmVtb3RlUmVzb3VyY2VDYWNoZS5jYWNoZWRJbWFnZUJ1ZmZlcih7 IGlkZW50aWZpZXIsIG1fZ3B1Q29ubmVjdGlvblRvV2ViUHJvY2Vzcy0+d2ViUHJvY2Vzc0lkZW50 aWZpZXIoKSB9KTsKICAgICBpZiAoIWltYWdlQnVmZmVyKSB7CiAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKHsgfSwgZmFsc2UpOwpAQCAtNDIyLDYgKzQyNCwxMSBAQCB2b2lkIFJlbW90ZVJlbmRl cmluZ0JhY2tlbmQ6OnN3YXBUb1ZhbGlkRnJvbnRCdWZmZXIoY29uc3QgQnVmZmVySWRlbnRpZmll clNldCYgYgogICAgIGF1dG8gYmFja0J1ZmZlciA9IGZldGNoQnVmZmVyKGJ1ZmZlclNldC5iYWNr KTsKICAgICBhdXRvIHNlY29uZGFyeUJhY2tCdWZmZXIgPSBmZXRjaEJ1ZmZlcihidWZmZXJTZXQu c2Vjb25kYXJ5QmFjayk7CiAKKyAgICBMT0dfV0lUSF9TVFJFQU0oUmVtb3RlUmVuZGVyaW5nQnVm ZmVyVm9sYXRpbGl0eSwgc3RyZWFtIDw8ICJHUFUgUHJvY2VzczogUmVtb3RlUmVuZGVyaW5nQmFj a2VuZDo6c3dhcFRvVmFsaWRGcm9udEJ1ZmZlciAtIGZyb250ICIKKyAgICAgICAgPDwgYnVmZmVy U2V0LmZyb250IDw8ICIgKGluLXVzZSAiIDw8IChmcm9udEJ1ZmZlciAmJiBmcm9udEJ1ZmZlci0+ aXNJblVzZSgpKSA8PCAiKSAiCisgICAgICAgIDw8IGJ1ZmZlclNldC5iYWNrIDw8ICIgKGluLXVz ZSAiIDw8IChiYWNrQnVmZmVyICYmIGJhY2tCdWZmZXItPmlzSW5Vc2UoKSkgPDwgIikgIgorICAg ICAgICA8PCBidWZmZXJTZXQuc2Vjb25kYXJ5QmFjayA8PCAiIChpbi11c2UgIiA8PCAoc2Vjb25k YXJ5QmFja0J1ZmZlciAmJiBzZWNvbmRhcnlCYWNrQnVmZmVyLT5pc0luVXNlKCkpIDw8ICIpICIp OworCiAgICAgaWYgKCFiYWNrQnVmZmVyIHx8IGJhY2tCdWZmZXItPmlzSW5Vc2UoKSkgewogICAg ICAgICBzdGQ6OnN3YXAoYmFja0J1ZmZlciwgc2Vjb25kYXJ5QmFja0J1ZmZlcik7CiAKQEAgLTQ0 Nyw4ICs0NTQsMTQgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpzd2FwVG9WYWxpZEZy b250QnVmZmVyKGNvbnN0IEJ1ZmZlcklkZW50aWZpZXJTZXQmIGIKICAgICAgICAgICAgIHJldHVy biBzdGQ6Om51bGxvcHQ7CiAgICAgICAgIHJldHVybiBidWZmZXItPnJlbmRlcmluZ1Jlc291cmNl SWRlbnRpZmllcigpOwogICAgIH07CisgICAgCisgICAgYXV0byByZXN1bHRCdWZmZXJTZXQgPSBC dWZmZXJJZGVudGlmaWVyU2V0IHsgYnVmZmVySWRlbnRpZmVyKGZyb250QnVmZmVyKSwgYnVmZmVy SWRlbnRpZmVyKGJhY2tCdWZmZXIpLCBidWZmZXJJZGVudGlmZXIoc2Vjb25kYXJ5QmFja0J1ZmZl cikgfTsKKworICAgIExPR19XSVRIX1NUUkVBTShSZW1vdGVSZW5kZXJpbmdCdWZmZXJWb2xhdGls aXR5LCBzdHJlYW0gPDwgIkdQVSBQcm9jZXNzOiBzd2FwVG9WYWxpZEZyb250QnVmZmVyIC0gc3dh cHBlZCBmcm9tIFsiCisgICAgICAgIDw8IGJ1ZmZlclNldC5mcm9udCA8PCAiLCAiIDw8IGJ1ZmZl clNldC5iYWNrIDw8ICIsICIgPDwgYnVmZmVyU2V0LnNlY29uZGFyeUJhY2sgPDwgIl0gdG8gWyIK KyAgICAgICAgPDwgcmVzdWx0QnVmZmVyU2V0LmZyb250IDw8ICIsICIgPDwgcmVzdWx0QnVmZmVy U2V0LmJhY2sgPDwgIiwgIiA8PCByZXN1bHRCdWZmZXJTZXQuc2Vjb25kYXJ5QmFjayA8PCAiXSIp OwogCi0gICAgY29tcGxldGlvbkhhbmRsZXIoeyBidWZmZXJJZGVudGlmZXIoZnJvbnRCdWZmZXIp LCBidWZmZXJJZGVudGlmZXIoYmFja0J1ZmZlciksIGJ1ZmZlcklkZW50aWZlcihzZWNvbmRhcnlC YWNrQnVmZmVyKSB9LCBXVEZNb3ZlKGZyb250QnVmZmVySGFuZGxlKSwgZnJvbnRCdWZmZXJXYXNF bXB0eSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIocmVzdWx0QnVmZmVyU2V0LCBXVEZNb3ZlKGZy b250QnVmZmVySGFuZGxlKSwgZnJvbnRCdWZmZXJXYXNFbXB0eSk7CiB9CiAKIHZvaWQgUmVtb3Rl UmVuZGVyaW5nQmFja2VuZDo6bWFya1N1cmZhY2VzVm9sYXRpbGUoY29uc3QgVmVjdG9yPFdlYkNv cmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcj4mIGlkZW50aWZpZXJzLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50 aWZpZXI+JiBpblVzZUJ1ZmZlcklkZW50aWZpZXJzKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXll ckJhY2tpbmdTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9S ZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbQppbmRleCA2MDNjNmM4ZmEyYmIyNzI0OTlhMDYyMDUx OGFlNjg5NTlmYmI5OTUzLi4wOWM4YzhmMjQ2NzAzZDc1ZWJiZmZjNDRhOGMzYjRmNTMxNWMyZDFk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3Rl TGF5ZXJCYWNraW5nU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5 ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCkBAIC0yOCw2ICsyOCw3IEBACiAKICNp bXBvcnQgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW1wb3J0ICJDR0Rpc3BsYXlMaXN0SW1hZ2VCdWZm ZXJCYWNrZW5kLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJQbGF0Zm9ybUNBTGF5 ZXJSZW1vdGUuaCIKICNpbXBvcnQgIlBsYXRmb3JtUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oIgog I2ltcG9ydCAiUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmVDb2xsZWN0aW9uLmgiCkBAIC00NSw2ICs0 Niw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL1dlYkxheWVyLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2Nv Y29hL1F1YXJ0ekNvcmVTUEkuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9UeXBlQ2FzdHNDb2NvYS5o PgorI2ltcG9ydCA8d3RmL3RleHQvVGV4dFN0cmVhbS5oPgogCiAjaWYgRU5BQkxFKENHX0RJU1BM QVlfTElTVF9CQUNLRURfSU1BR0VfQlVGRkVSKQogI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL0NH RGlzcGxheUxpc3RJbWFnZUJ1ZmZlckFkZGl0aW9ucy5oPgpAQCAtMzA0LDExICszMDYsMTUgQEAg Ym9vbCBSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6ZGlzcGxheSgpCiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIAorICAgIExPR19XSVRIX1NUUkVBTShSZW1vdGVSZW5kZXJpbmdCdWZmZXJW b2xhdGlsaXR5LCBzdHJlYW0gPDwgIlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KCki KTsKKwogICAgIC8vIE1ha2UgdGhlIHByZXZpb3VzIGZyb250IGJ1ZmZlciBub24tdm9sYXRpbGUg ZWFybHksIHNvIHRoYXQgd2UgY2FuIGRpcnR5IHRoZSB3aG9sZSBsYXllciBpZiBpdCBjb21lcyBi YWNrIGVtcHR5LgogICAgIGNvbGxlY3Rpb24tPm1ha2VGcm9udEJ1ZmZlck5vblZvbGF0aWxlKCp0 aGlzKTsKIAotICAgIGlmIChtX2RpcnR5UmVnaW9uLmlzRW1wdHkoKSB8fCBtX3NpemUuaXNFbXB0 eSgpKQorICAgIGlmIChtX2RpcnR5UmVnaW9uLmlzRW1wdHkoKSB8fCBtX3NpemUuaXNFbXB0eSgp KSB7CisgICAgICAgIExPR19XSVRIX1NUUkVBTShSZW1vdGVSZW5kZXJpbmdCdWZmZXJWb2xhdGls aXR5LCBzdHJlYW0gPDwgIiBubyBkaXJ0eSByZWdpb24iKTsKICAgICAgICAgcmV0dXJuIG5lZWRU b0VuY29kZUJhY2tpbmdTdG9yZTsKKyAgICB9CiAKICAgICBXZWJDb3JlOjpJbnRSZWN0IGxheWVy Qm91bmRzKFdlYkNvcmU6OkludFBvaW50KCksIFdlYkNvcmU6OmV4cGFuZGVkSW50U2l6ZShtX3Np emUpKTsKICAgICBpZiAoIWhhc0Zyb250QnVmZmVyKCkgfHwgIXN1cHBvcnRzUGFydGlhbFJlcGFp bnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcAppbmRleCBjZmEx NmRlNDg0OGIwZDA5ZTRlZDQ2ZDBmYjY1NjhlYWJkYWQ0NmE1Li4zMWNhOGZlZmJlYjAyNDVlYjYz NGFiMjlkNzYyNGE5NjdmYjRiMDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkuY3BwCkBAIC0yNzQsMTYgKzI3NCwzMyBAQCBhdXRvIFJlbW90ZVJlbmRlcmluZ0JhY2tl bmRQcm94eTo6c3dhcFRvVmFsaWRGcm9udEJ1ZmZlcihjb25zdCBCdWZmZXJTZXQmIGJ1ZmZlcgog ICAgICAgICByZXR1cm4gYnVmZmVyLT5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKTsKICAg ICB9OwogCisgICAgYXV0byBjbGVhckJhY2tlbmRIYW5kbGUgPSBbXShJbWFnZUJ1ZmZlciogYnVm ZmVyKSB7CisgICAgICAgIGlmICghYnVmZmVyKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAg ICAgIGlmIChhdXRvKiBiYWNrZW5kID0gYnVmZmVyLT5lbnN1cmVCYWNrZW5kQ3JlYXRlZCgpKSB7 CisgICAgICAgICAgICBhdXRvKiBzaGFyaW5nID0gYmFja2VuZC0+dG9CYWNrZW5kU2hhcmluZygp OworICAgICAgICAgICAgaWYgKGlzPEltYWdlQnVmZmVyQmFja2VuZEhhbmRsZVNoYXJpbmc+KHNo YXJpbmcpKQorICAgICAgICAgICAgICAgIGRvd25jYXN0PEltYWdlQnVmZmVyQmFja2VuZEhhbmRs ZVNoYXJpbmc+KCpzaGFyaW5nKS5jbGVhckJhY2tlbmRIYW5kbGUoKTsKKyAgICAgICAgfQorICAg IH07CisKKyAgICAvLyBDbGVhciBhbGwgdGhlIGJ1ZmZlcidzIE1hY2hTZW5kUmlnaHRzIHRvIGF2 b2lkIGFsbCB0aGUgc3VyZmFjZXMgYXBwZWFyaW5nIHRvIGJlIGluLXVzZS4KKyAgICAvLyBXZSBn ZXQgYmFjayB0aGUgbmV3IGZyb250IGJ1ZmZlcidzIE1hY2hTZW5kUmlnaHQgaW4gdGhlIHJlcGx5 LgorICAgIGNsZWFyQmFja2VuZEhhbmRsZShidWZmZXJzLmZyb250LmdldCgpKTsKKyAgICBjbGVh ckJhY2tlbmRIYW5kbGUoYnVmZmVycy5iYWNrLmdldCgpKTsKKyAgICBjbGVhckJhY2tlbmRIYW5k bGUoYnVmZmVycy5zZWNvbmRhcnlCYWNrLmdldCgpKTsKKwogICAgIGF1dG8gYnVmZmVyU2V0ID0g QnVmZmVySWRlbnRpZmllclNldCB7CiAgICAgICAgIGJ1ZmZlcklkZW50aWZpZXIoYnVmZmVycy5m cm9udC5nZXQoKSksCiAgICAgICAgIGJ1ZmZlcklkZW50aWZpZXIoYnVmZmVycy5iYWNrLmdldCgp KSwKICAgICAgICAgYnVmZmVySWRlbnRpZmllcihidWZmZXJzLnNlY29uZGFyeUJhY2suZ2V0KCkp CiAgICAgfTsKLSAgICAKKwogICAgIEJ1ZmZlcklkZW50aWZpZXJTZXQgc3dhcHBlZEJ1ZmZlclNl dDsKICAgICBzdGQ6Om9wdGlvbmFsPEltYWdlQnVmZmVyQmFja2VuZEhhbmRsZT4gZnJvbnRCdWZm ZXJIYW5kbGU7CiAgICAgYm9vbCBmcm9udEJ1ZmZlcldhc0VtcHR5ID0gZmFsc2U7Ci0gICAgCisK ICAgICBzZW5kU3luY1RvU3RyZWFtKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpT d2FwVG9WYWxpZEZyb250QnVmZmVyKGJ1ZmZlclNldCksCiAgICAgICAgIE1lc3NhZ2VzOjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kOjpTd2FwVG9WYWxpZEZyb250QnVmZmVyOjpSZXBseShzd2FwcGVk QnVmZmVyU2V0LCBmcm9udEJ1ZmZlckhhbmRsZSwgZnJvbnRCdWZmZXJXYXNFbXB0eSkpOwogCkBA IC0zMTgsNiArMzM1LDggQEAgYXV0byBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnN3YXBU b1ZhbGlkRnJvbnRCdWZmZXIoY29uc3QgQnVmZmVyU2V0JiBidWZmZXIKIAogVm9sYXRpbGl0eVN0 YXRlIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6bWFya1N1cmZhY2VOb25Wb2xhdGlsZShS ZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgaWRlbnRpZmllcikKIHsKKyAgICBMT0dfV0lUSF9T VFJFQU0oUmVtb3RlUmVuZGVyaW5nQnVmZmVyVm9sYXRpbGl0eSwgc3RyZWFtIDw8ICJXZWIgUHJv Y2VzczogUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjptYXJrU3VyZmFjZU5vblZvbGF0aWxl ICIgPDwgaWRlbnRpZmllcik7CisKICAgICBib29sIGJ1ZmZlcldhc0VtcHR5OwogICAgIHN0ZDo6 b3B0aW9uYWw8SW1hZ2VCdWZmZXJCYWNrZW5kSGFuZGxlPiBiYWNrZW5kSGFuZGxlOwogICAgIHNl bmRTeW5jVG9TdHJlYW0oTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6Ok1hcmtTdXJm YWNlTm9uVm9sYXRpbGUoaWRlbnRpZmllciksIE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNr ZW5kOjpNYXJrU3VyZmFjZU5vblZvbGF0aWxlOjpSZXBseShiYWNrZW5kSGFuZGxlLCBidWZmZXJX YXNFbXB0eSkpOwo=