225384 2021-05-05 00:28:04 -0700 Add and adopt RemoteLayerBackingStore::Type (instead of "accelerates drawing" bit) 2021-05-05 11:48:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca dino sam simon.fraser webkit-bug-importer oldest_to_newest 1756829 0 thorton 2021-05-05 00:28:04 -0700 Add and adopt RemoteLayerBackingStore::Type (instead of "accelerates drawing" bit) 1756831 1 427734 thorton 2021-05-05 00:28:50 -0700 Created attachment 427734 Patch 1757017 2 ews-feeder 2021-05-05 11:47:13 -0700 Committed r277033 (237346@main): <https://commits.webkit.org/237346@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427734. 1757018 3 webkit-bug-importer 2021-05-05 11:48:16 -0700 <rdar://problem/77567947> 427734 2021-05-05 00:28:50 -0700 2021-05-05 11:47:14 -0700 Patch bug-225384-20210505002849.patch text/plain 14690 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2OTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDljZGUzZDBkZjFlZWQwNjVj N2M0NTk0ZWQ2ZGQ3YmQ2NTllODc1MmMuLjA3OWI1MzA3MTMwZjk0NWVhYjczYzJmNzAzNWUzYzRk YTgzN2MzNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDUtMDUgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGFuZCBhZG9wdCBS ZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6VHlwZSAoaW5zdGVhZCBvZiAiYWNjZWxlcmF0ZXMgZHJh d2luZyIgYml0KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI1Mzg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UsIGp1c3QgcmVmYWN0b3JpbmcuCisK KyAgICAgICAgKiBTaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3Jl Lmg6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjp0eXBlIGNvbnN0 KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmFjY2VsZXJhdGVz RHJhd2luZyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogU2hhcmVkL1JlbW90ZUxheWVyVHJl ZS9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5 ZXJCYWNraW5nU3RvcmU6OmVuc3VyZUJhY2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZUxheWVyQmFja2luZ1N0b3JlOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6ZGVjb2RlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3Rl TGF5ZXJCYWNraW5nU3RvcmU6OnBpeGVsRm9ybWF0IGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OnN3YXBUb1ZhbGlkRnJvbnRCdWZmZXIpOgorICAgICAg ICAoV2ViS2l0OjpSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6YXBwbHlCYWNraW5nU3RvcmVUb0xh eWVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OnNldEJ1ZmZl clZvbGF0aWxpdHkpOgorICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb24ubW06CisgICAgICAgIChXZWJLaXQ6Om5hbWVGb3JCYWNraW5nU3Rv cmVUeXBlKToKKyAgICAgICAgKFdlYktpdDo6b3BlcmF0b3I8PCk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3BwOgor ICAgICAgICAoV2ViS2l0OjpQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6OnVwZGF0ZUJhY2tpbmdTdG9y ZSk6CisgICAgICAgIEluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgYW5vdGhlciBiYWNraW5nIHN0 b3JlIHR5cGUsIHJlZmFjdG9yIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlCisgICAgICAgIHRvIGhh dmUgYSB0eXBlIGVudW0gaW5zdGVhZCBvZiBhbiAiYWNjZWxlcmF0ZXMgZHJhd2luZyIgYml0Lgor CiAyMDIxLTA1LTA0ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAg IFtNZWRpYSBpbiBHUFUgUHJvY2Vzc10gTW92ZSBBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRyYXRv clByb3h5IHRvIHRoZSBHUFUgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFy ZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUuaAppbmRl eCA2NTg1MThiYmE1ZjVhYTg2N2NlOTJiY2I3MjdmNGE2ZTkxM2UwYTFkLi44NjZiNjQ1YjliMGE3 YmY1MWEzMTk3YjM1MzlhYmIxZDdhMGVlYjFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUu aApAQCAtNTIsNyArNTIsMTIgQEAgcHVibGljOgogICAgIFJlbW90ZUxheWVyQmFja2luZ1N0b3Jl KFBsYXRmb3JtQ0FMYXllclJlbW90ZSopOwogICAgIH5SZW1vdGVMYXllckJhY2tpbmdTdG9yZSgp OwogCi0gICAgdm9pZCBlbnN1cmVCYWNraW5nU3RvcmUoV2ViQ29yZTo6RmxvYXRTaXplLCBmbG9h dCBzY2FsZSwgYm9vbCBhY2NlbGVyYXRlc0RyYXdpbmcsIGJvb2wgZGVlcENvbG9yLCBib29sIGlz T3BhcXVlKTsKKyAgICBlbnVtIGNsYXNzIFR5cGUgOiB1aW50OF90IHsKKyAgICAgICAgSU9TdXJm YWNlLAorICAgICAgICBCaXRtYXAsCisgICAgfTsKKworICAgIHZvaWQgZW5zdXJlQmFja2luZ1N0 b3JlKFR5cGUsIFdlYkNvcmU6OkZsb2F0U2l6ZSwgZmxvYXQgc2NhbGUsIGJvb2wgZGVlcENvbG9y LCBib29sIGlzT3BhcXVlKTsKIAogICAgIHZvaWQgc2V0TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNv cmU6OkludFJlY3QpOwogICAgIHZvaWQgc2V0TmVlZHNEaXNwbGF5KCk7CkBAIC02MSw3ICs2Niw3 IEBAIHB1YmxpYzoKIAogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBzaXplKCkgY29uc3QgeyByZXR1 cm4gbV9zaXplOyB9CiAgICAgZmxvYXQgc2NhbGUoKSBjb25zdCB7IHJldHVybiBtX3NjYWxlOyB9 Ci0gICAgYm9vbCBhY2NlbGVyYXRlc0RyYXdpbmcoKSBjb25zdCB7IHJldHVybiBtX2FjY2VsZXJh dGVzRHJhd2luZzsgfQorICAgIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQog ICAgIGJvb2wgaXNPcGFxdWUoKSBjb25zdCB7IHJldHVybiBtX2lzT3BhcXVlOyB9CiAgICAgdW5z aWduZWQgYnl0ZXNQZXJQaXhlbCgpIGNvbnN0OwogCkBAIC0xMjcsNyArMTMyLDcgQEAgcHJpdmF0 ZToKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpUaHJlYWRTYWZlSW1hZ2VCdWZmZXJG bHVzaGVyPiBtX2Zyb250QnVmZmVyRmx1c2hlcjsKIAotICAgIGJvb2wgbV9hY2NlbGVyYXRlc0Ry YXdpbmcgeyBmYWxzZSB9OworICAgIFR5cGUgbV90eXBlOwogICAgIGJvb2wgbV9kZWVwQ29sb3Ig eyBmYWxzZSB9OwogCiAgICAgV2ViQ29yZTo6UmVwYWludFJlY3RMaXN0IG1fcGFpbnRpbmdSZWN0 czsKQEAgLTEzNiwzICsxNDEsMTUgQEAgcHJpdmF0ZToKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdAorCituYW1lc3BhY2UgV1RGIHsKKwordGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxX ZWJLaXQ6OlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpUeXBlPiB7CisgICAgdXNpbmcgdmFsdWVz ID0gRW51bVZhbHVlczwKKyAgICAgICAgV2ViS2l0OjpSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6 VHlwZSwKKyAgICAgICAgV2ViS2l0OjpSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6VHlwZTo6SU9T dXJmYWNlLAorICAgICAgICBXZWJLaXQ6OlJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpUeXBlOjpC aXRtYXAKKyAgICA+OworfTsKKworfSAvLyBuYW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUu bW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJCYWNr aW5nU3RvcmUubW0KaW5kZXggOGExMGYxNWExZGZiZTA3MDIzMGQyMGM2MzAzOWQxYjA1MjIyOWY3 Mi4uOTAzZDNlMDk1M2JiZTkwZWZiMjhhZmQ5YzAyYTA1NDU4MjQwODViMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyQmFja2luZ1N0 b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVM YXllckJhY2tpbmdTdG9yZS5tbQpAQCAtNjksMTQgKzY5LDE0IEBAIFJlbW90ZUxheWVyQmFja2lu Z1N0b3JlOjp+UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUoKQogICAgICAgICBjb250ZXh0LT5iYWNr aW5nU3RvcmVXaWxsQmVEZXN0cm95ZWQoKnRoaXMpOwogfQogCi12b2lkIFJlbW90ZUxheWVyQmFj a2luZ1N0b3JlOjplbnN1cmVCYWNraW5nU3RvcmUoV2ViQ29yZTo6RmxvYXRTaXplIHNpemUsIGZs b2F0IHNjYWxlLCBib29sIGFjY2VsZXJhdGVzRHJhd2luZywgYm9vbCBkZWVwQ29sb3IsIGJvb2wg aXNPcGFxdWUpCit2b2lkIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjplbnN1cmVCYWNraW5nU3Rv cmUoVHlwZSB0eXBlLCBXZWJDb3JlOjpGbG9hdFNpemUgc2l6ZSwgZmxvYXQgc2NhbGUsIGJvb2wg ZGVlcENvbG9yLCBib29sIGlzT3BhcXVlKQogewotICAgIGlmIChtX3NpemUgPT0gc2l6ZSAmJiBt X3NjYWxlID09IHNjYWxlICYmIG1fZGVlcENvbG9yID09IGRlZXBDb2xvciAmJiBtX2FjY2VsZXJh dGVzRHJhd2luZyA9PSBhY2NlbGVyYXRlc0RyYXdpbmcgJiYgbV9pc09wYXF1ZSA9PSBpc09wYXF1 ZSkKKyAgICBpZiAobV90eXBlID09IHR5cGUgJiYgbV9zaXplID09IHNpemUgJiYgbV9zY2FsZSA9 PSBzY2FsZSAmJiBtX2RlZXBDb2xvciA9PSBkZWVwQ29sb3IgJiYgbV9pc09wYXF1ZSA9PSBpc09w YXF1ZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgbV90eXBlID0gdHlwZTsKICAgICBtX3NpemUg PSBzaXplOwogICAgIG1fc2NhbGUgPSBzY2FsZTsKLSAgICBtX2FjY2VsZXJhdGVzRHJhd2luZyA9 IGFjY2VsZXJhdGVzRHJhd2luZzsKICAgICBtX2RlZXBDb2xvciA9IGRlZXBDb2xvcjsKICAgICBt X2lzT3BhcXVlID0gaXNPcGFxdWU7CiAKQEAgLTk4LDE5ICs5OCwyNCBAQCB2b2lkIFJlbW90ZUxh eWVyQmFja2luZ1N0b3JlOjpjbGVhckJhY2tpbmdTdG9yZSgpCiAKIHZvaWQgUmVtb3RlTGF5ZXJC YWNraW5nU3RvcmU6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CisgICAg ZW5jb2RlciA8PCBtX3R5cGU7CiAgICAgZW5jb2RlciA8PCBtX3NpemU7CiAgICAgZW5jb2RlciA8 PCBtX3NjYWxlOwotICAgIGVuY29kZXIgPDwgbV9hY2NlbGVyYXRlc0RyYXdpbmc7CiAgICAgZW5j b2RlciA8PCBtX2lzT3BhcXVlOwogCiAgICAgT3B0aW9uYWw8SW1hZ2VCdWZmZXJCYWNrZW5kSGFu ZGxlPiBoYW5kbGU7CiAgICAgaWYgKG1fZnJvbnRCdWZmZXIuaW1hZ2VCdWZmZXIpIHsKLSAgICAg ICAgaWYgKG1fZnJvbnRCdWZmZXIuaW1hZ2VCdWZmZXItPnJlbmRlcmluZ01vZGUoKSA9PSBXZWJD b3JlOjpSZW5kZXJpbmdNb2RlOjpVbmFjY2VsZXJhdGVkKQorICAgICAgICBzd2l0Y2ggKG1fdHlw ZSkgeworICAgICAgICBjYXNlIFR5cGU6OklPU3VyZmFjZToKKyAgICAgICAgICAgIGlmIChtX2Zy b250QnVmZmVyLmltYWdlQnVmZmVyLT5jYW5NYXBCYWNraW5nU3RvcmUoKSkKKyAgICAgICAgICAg ICAgICBoYW5kbGUgPSBzdGF0aWNfY2FzdDxBY2NlbGVyYXRlZEltYWdlQnVmZmVyU2hhcmVhYmxl TWFwcGVkQmFja2VuZCY+KCptX2Zyb250QnVmZmVyLmltYWdlQnVmZmVyLT5lbnN1cmVCYWNrZW5k Q3JlYXRlZCgpKS5jcmVhdGVJbWFnZUJ1ZmZlckJhY2tlbmRIYW5kbGUoKTsKKyAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICBoYW5kbGUgPSBzdGF0aWNfY2FzdDxBY2NlbGVyYXRlZElt YWdlQnVmZmVyU2hhcmVhYmxlQmFja2VuZCY+KCptX2Zyb250QnVmZmVyLmltYWdlQnVmZmVyLT5l bnN1cmVCYWNrZW5kQ3JlYXRlZCgpKS5jcmVhdGVJbWFnZUJ1ZmZlckJhY2tlbmRIYW5kbGUoKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFR5cGU6OkJpdG1hcDoKICAgICAgICAg ICAgIGhhbmRsZSA9IHN0YXRpY19jYXN0PFVuYWNjZWxlcmF0ZWRJbWFnZUJ1ZmZlclNoYXJlYWJs ZUJhY2tlbmQmPigqbV9mcm9udEJ1ZmZlci5pbWFnZUJ1ZmZlci0+ZW5zdXJlQmFja2VuZENyZWF0 ZWQoKSkuY3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5kSGFuZGxlKCk7Ci0gICAgICAgIGVsc2UgaWYg KG1fZnJvbnRCdWZmZXIuaW1hZ2VCdWZmZXItPmNhbk1hcEJhY2tpbmdTdG9yZSgpKQotICAgICAg ICAgICAgaGFuZGxlID0gc3RhdGljX2Nhc3Q8QWNjZWxlcmF0ZWRJbWFnZUJ1ZmZlclNoYXJlYWJs ZU1hcHBlZEJhY2tlbmQmPigqbV9mcm9udEJ1ZmZlci5pbWFnZUJ1ZmZlci0+ZW5zdXJlQmFja2Vu ZENyZWF0ZWQoKSkuY3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5kSGFuZGxlKCk7Ci0gICAgICAgIGVs c2UKLSAgICAgICAgICAgIGhhbmRsZSA9IHN0YXRpY19jYXN0PEFjY2VsZXJhdGVkSW1hZ2VCdWZm ZXJTaGFyZWFibGVCYWNrZW5kJj4oKm1fZnJvbnRCdWZmZXIuaW1hZ2VCdWZmZXItPmVuc3VyZUJh Y2tlbmRDcmVhdGVkKCkpLmNyZWF0ZUltYWdlQnVmZmVyQmFja2VuZEhhbmRsZSgpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICB9CiAKICAgICBlbmNvZGVyIDw8IGhhbmRsZTsK QEAgLTExOCwxMyArMTIzLDEzIEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmVuY29k ZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAKIGJvb2wgUmVtb3RlTGF5ZXJCYWNraW5n U3RvcmU6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIFJlbW90ZUxheWVyQmFja2luZ1N0 b3JlJiByZXN1bHQpCiB7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9zaXplKSkK KyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3R5cGUpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3NjYWxlKSkKKyAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3NpemUpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX2FjY2VsZXJhdGVzRHJhd2luZykp CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9zY2FsZSkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1faXNPcGFxdWUpKQpA QCAtMTQ5LDcgKzE1NCw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OnNldE5lZWRz RGlzcGxheSgpCiBXZWJDb3JlOjpQaXhlbEZvcm1hdCBSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6 cGl4ZWxGb3JtYXQoKSBjb25zdAogewogI2lmIEhBVkUoSU9TVVJGQUNFX1JHQjEwKQotICAgIGlm IChtX2FjY2VsZXJhdGVzRHJhd2luZyAmJiBtX2RlZXBDb2xvcikKKyAgICBpZiAobV90eXBlID09 IFR5cGU6OklPU3VyZmFjZSAmJiBtX2RlZXBDb2xvcikKICAgICAgICAgcmV0dXJuIG1faXNPcGFx dWUgPyBXZWJDb3JlOjpQaXhlbEZvcm1hdDo6UkdCMTAgOiBXZWJDb3JlOjpQaXhlbEZvcm1hdDo6 UkdCMTBBODsKICNlbmRpZgogCkBAIC0xNzIsNyArMTc3LDcgQEAgdm9pZCBSZW1vdGVMYXllckJh Y2tpbmdTdG9yZTo6c3dhcFRvVmFsaWRGcm9udEJ1ZmZlcigpCiAgICAgLy8gU29tZXRpbWVzLCB3 ZSBjYW4gZ2V0IHR3byBzd2FwcyBhaGVhZCBvZiB0aGUgcmVuZGVyIHNlcnZlci4KICAgICAvLyBJ ZiB3ZSdyZSB1c2luZyBzaGFyZWQgSU9TdXJmYWNlcywgd2UgbXVzdCB3YWl0IHRvIG1vZGlmeQog ICAgIC8vIGEgc3VyZmFjZSB1bnRpbCBpdCBubyBsb25nZXIgaGFzIG91dHN0YW5kaW5nIGNsaWVu dHMuCi0gICAgaWYgKG1fYWNjZWxlcmF0ZXNEcmF3aW5nKSB7CisgICAgaWYgKG1fdHlwZSA9PSBU eXBlOjpJT1N1cmZhY2UpIHsKICAgICAgICAgaWYgKCFtX2JhY2tCdWZmZXIuaW1hZ2VCdWZmZXIg fHwgbV9iYWNrQnVmZmVyLmltYWdlQnVmZmVyLT5pc0luVXNlKCkpIHsKICAgICAgICAgICAgIHN0 ZDo6c3dhcChtX2JhY2tCdWZmZXIsIG1fc2Vjb25kYXJ5QmFja0J1ZmZlcik7CiAKQEAgLTE4OSwx NCArMTk0LDIyIEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OnN3YXBUb1ZhbGlkRnJv bnRCdWZmZXIoKQogICAgIGlmIChtX2Zyb250QnVmZmVyLmltYWdlQnVmZmVyKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBhdXRvIHJlbmRlcmluZ01vZGUgPSBtX2FjY2VsZXJhdGVzRHJhd2luZyA/ IFdlYkNvcmU6OlJlbmRlcmluZ01vZGU6OkFjY2VsZXJhdGVkIDogV2ViQ29yZTo6UmVuZGVyaW5n TW9kZTo6VW5hY2NlbGVyYXRlZDsKKyAgICBib29sIHNob3VsZFVzZVJlbW90ZVJlbmRlcmluZyA9 IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnNob3VsZFVzZVJlbW90ZVJlbmRlcmluZ0ZvcihXZWJD b3JlOjpSZW5kZXJpbmdQdXJwb3NlOjpET00pOwogCi0gICAgaWYgKFdlYlByb2Nlc3M6OnNpbmds ZXRvbigpLnNob3VsZFVzZVJlbW90ZVJlbmRlcmluZ0ZvcihXZWJDb3JlOjpSZW5kZXJpbmdQdXJw b3NlOjpET00pKQotICAgICAgICBtX2Zyb250QnVmZmVyLmltYWdlQnVmZmVyID0gbV9sYXllci0+ Y29udGV4dCgpLT5lbnN1cmVSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkoKS5jcmVhdGVJbWFn ZUJ1ZmZlcihtX3NpemUsIHJlbmRlcmluZ01vZGUsIG1fc2NhbGUsIFdlYkNvcmU6OkRlc3RpbmF0 aW9uQ29sb3JTcGFjZTo6U1JHQiwgcGl4ZWxGb3JtYXQoKSk7Ci0gICAgZWxzZSBpZiAocmVuZGVy aW5nTW9kZSA9PSBXZWJDb3JlOjpSZW5kZXJpbmdNb2RlOjpBY2NlbGVyYXRlZCkKLSAgICAgICAg bV9mcm9udEJ1ZmZlci5pbWFnZUJ1ZmZlciA9IFdlYkNvcmU6OkNvbmNyZXRlSW1hZ2VCdWZmZXI8 QWNjZWxlcmF0ZWRJbWFnZUJ1ZmZlclNoYXJlYWJsZU1hcHBlZEJhY2tlbmQ+OjpjcmVhdGUobV9z aXplLCBtX3NjYWxlLCBXZWJDb3JlOjpEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IsIHBpeGVs Rm9ybWF0KCksIG51bGxwdHIpOwotICAgIGVsc2UKLSAgICAgICAgbV9mcm9udEJ1ZmZlci5pbWFn ZUJ1ZmZlciA9IFdlYkNvcmU6OkNvbmNyZXRlSW1hZ2VCdWZmZXI8VW5hY2NlbGVyYXRlZEltYWdl QnVmZmVyU2hhcmVhYmxlQmFja2VuZD46OmNyZWF0ZShtX3NpemUsIG1fc2NhbGUsIFdlYkNvcmU6 OkRlc3RpbmF0aW9uQ29sb3JTcGFjZTo6U1JHQiwgcGl4ZWxGb3JtYXQoKSwgbnVsbHB0cik7Cisg ICAgc3dpdGNoIChtX3R5cGUpIHsKKyAgICBjYXNlIFR5cGU6OklPU3VyZmFjZToKKyAgICAgICAg aWYgKHNob3VsZFVzZVJlbW90ZVJlbmRlcmluZykKKyAgICAgICAgICAgIG1fZnJvbnRCdWZmZXIu aW1hZ2VCdWZmZXIgPSBtX2xheWVyLT5jb250ZXh0KCktPmVuc3VyZVJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eSgpLmNyZWF0ZUltYWdlQnVmZmVyKG1fc2l6ZSwgV2ViQ29yZTo6UmVuZGVyaW5n TW9kZTo6QWNjZWxlcmF0ZWQsIG1fc2NhbGUsIFdlYkNvcmU6OkRlc3RpbmF0aW9uQ29sb3JTcGFj ZTo6U1JHQiwgcGl4ZWxGb3JtYXQoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fZnJv bnRCdWZmZXIuaW1hZ2VCdWZmZXIgPSBXZWJDb3JlOjpDb25jcmV0ZUltYWdlQnVmZmVyPEFjY2Vs ZXJhdGVkSW1hZ2VCdWZmZXJTaGFyZWFibGVNYXBwZWRCYWNrZW5kPjo6Y3JlYXRlKG1fc2l6ZSwg bV9zY2FsZSwgV2ViQ29yZTo6RGVzdGluYXRpb25Db2xvclNwYWNlOjpTUkdCLCBwaXhlbEZvcm1h dCgpLCBudWxscHRyKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBUeXBlOjpCaXRtYXA6Cisg ICAgICAgIGlmIChzaG91bGRVc2VSZW1vdGVSZW5kZXJpbmcpCisgICAgICAgICAgICBtX2Zyb250 QnVmZmVyLmltYWdlQnVmZmVyID0gbV9sYXllci0+Y29udGV4dCgpLT5lbnN1cmVSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kUHJveHkoKS5jcmVhdGVJbWFnZUJ1ZmZlcihtX3NpemUsIFdlYkNvcmU6OlJl bmRlcmluZ01vZGU6OlVuYWNjZWxlcmF0ZWQsIG1fc2NhbGUsIFdlYkNvcmU6OkRlc3RpbmF0aW9u Q29sb3JTcGFjZTo6U1JHQiwgcGl4ZWxGb3JtYXQoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAg ICAgIG1fZnJvbnRCdWZmZXIuaW1hZ2VCdWZmZXIgPSBXZWJDb3JlOjpDb25jcmV0ZUltYWdlQnVm ZmVyPFVuYWNjZWxlcmF0ZWRJbWFnZUJ1ZmZlclNoYXJlYWJsZUJhY2tlbmQ+OjpjcmVhdGUobV9z aXplLCBtX3NjYWxlLCBXZWJDb3JlOjpEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IsIHBpeGVs Rm9ybWF0KCksIG51bGxwdHIpOworICAgICAgICBicmVhazsKKyAgICB9CiB9CiAKIGJvb2wgUmVt b3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRpc3BsYXkoKQpAQCAtMzQxLDcgKzM1NCw4IEBAIHZvaWQg UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmFwcGx5QmFja2luZ1N0b3JlVG9MYXllcihDQUxheWVy ICpsYXllciwgTGF5ZXJDb250CiAgICAgQVNTRVJUKG1fYnVmZmVySGFuZGxlKTsKICAgICBsYXll ci5jb250ZW50c09wYXF1ZSA9IG1faXNPcGFxdWU7CiAKLSAgICBpZiAoYWNjZWxlcmF0ZXNEcmF3 aW5nKCkpIHsKKyAgICBzd2l0Y2ggKG1fdHlwZSkgeworICAgIGNhc2UgVHlwZTo6SU9TdXJmYWNl OgogICAgICAgICBzd2l0Y2ggKGNvbnRlbnRzVHlwZSkgewogICAgICAgICBjYXNlIExheWVyQ29u dGVudHNUeXBlOjpJT1N1cmZhY2U6IHsKICAgICAgICAgICAgIGF1dG8gc3VyZmFjZSA9IFdlYkNv cmU6OklPU3VyZmFjZTo6Y3JlYXRlRnJvbVNlbmRSaWdodChXVEZNb3ZlKFdURjo6Z2V0PE1hY2hT ZW5kUmlnaHQ+KCptX2J1ZmZlckhhbmRsZSkpLCBXZWJDb3JlOjpzUkdCQ29sb3JTcGFjZVJlZigp KTsKQEAgLTM1MiwxMiArMzY2LDEyIEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmFw cGx5QmFja2luZ1N0b3JlVG9MYXllcihDQUxheWVyICpsYXllciwgTGF5ZXJDb250CiAgICAgICAg ICAgICBsYXllci5jb250ZW50cyA9IChfX2JyaWRnZSBpZClhZG9wdENGKENBTWFjaFBvcnRDcmVh dGUoV1RGOjpnZXQ8TWFjaFNlbmRSaWdodD4oKm1fYnVmZmVySGFuZGxlKS5sZWFrU2VuZFJpZ2h0 KCkpKS5nZXQoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIHJldHVy bjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBUeXBlOjpCaXRtYXA6CisgICAgICAgIGF1dG8g Yml0bWFwID0gU2hhcmVhYmxlQml0bWFwOjpjcmVhdGUoV1RGOjpnZXQ8U2hhcmVhYmxlQml0bWFw OjpIYW5kbGU+KCptX2J1ZmZlckhhbmRsZSkpOworICAgICAgICBsYXllci5jb250ZW50cyA9IChf X2JyaWRnZSBpZCliaXRtYXAtPm1ha2VDR0ltYWdlQ29weSgpLmdldCgpOworICAgICAgICBicmVh azsKICAgICB9Ci0KLSAgICBBU1NFUlQoIWFjY2VsZXJhdGVzRHJhd2luZygpKTsKLSAgICBhdXRv IGJpdG1hcCA9IFNoYXJlYWJsZUJpdG1hcDo6Y3JlYXRlKFdURjo6Z2V0PFNoYXJlYWJsZUJpdG1h cDo6SGFuZGxlPigqbV9idWZmZXJIYW5kbGUpKTsKLSAgICBsYXllci5jb250ZW50cyA9IChfX2Jy aWRnZSBpZCliaXRtYXAtPm1ha2VDR0ltYWdlQ29weSgpLmdldCgpOwogfQogCiBzdGQ6OnVuaXF1 ZV9wdHI8V2ViQ29yZTo6VGhyZWFkU2FmZUltYWdlQnVmZmVyRmx1c2hlcj4gUmVtb3RlTGF5ZXJC YWNraW5nU3RvcmU6OnRha2VQZW5kaW5nRmx1c2hlcigpCkBAIC0zNjUsOSArMzc5LDkgQEAgc3Rk Ojp1bmlxdWVfcHRyPFdlYkNvcmU6OlRocmVhZFNhZmVJbWFnZUJ1ZmZlckZsdXNoZXI+IFJlbW90 ZUxheWVyQmFja2luZ1N0b3JlOjoKICAgICByZXR1cm4gc3RkOjpleGNoYW5nZShtX2Zyb250QnVm ZmVyRmx1c2hlciwgbnVsbHB0cik7CiB9CiAKLWJvb2wgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6 OnNldEJ1ZmZlclZvbGF0aWxpdHkoQnVmZmVyVHlwZSB0eXBlLCBib29sIGlzVm9sYXRpbGUpCiti b29sIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpzZXRCdWZmZXJWb2xhdGlsaXR5KEJ1ZmZlclR5 cGUgYnVmZmVyVHlwZSwgYm9vbCBpc1ZvbGF0aWxlKQogewotICAgIGlmICghYWNjZWxlcmF0ZXNE cmF3aW5nKCkpCisgICAgaWYgKG1fdHlwZSAhPSBUeXBlOjpJT1N1cmZhY2UpCiAgICAgICAgIHJl dHVybiB0cnVlOwogCiAgICAgLy8gUmV0dXJuIHZhbHVlIGlzIHRydWUgaWYgd2Ugc3VjY2VlZGVk IGluIG1ha2luZyB2b2xhdGlsZS4KQEAgLTM5Nyw3ICs0MTEsNyBAQCBib29sIFJlbW90ZUxheWVy QmFja2luZ1N0b3JlOjpzZXRCdWZmZXJWb2xhdGlsaXR5KEJ1ZmZlclR5cGUgdHlwZSwgYm9vbCBp c1ZvbGF0aQogICAgICAgICByZXR1cm4gcHJldmlvdXNTdGF0ZSA9PSBXZWJDb3JlOjpWb2xhdGls aXR5U3RhdGU6OkVtcHR5OwogICAgIH07CiAKLSAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBzd2l0 Y2ggKGJ1ZmZlclR5cGUpIHsKICAgICBjYXNlIEJ1ZmZlclR5cGU6OkZyb250OgogICAgICAgICBp ZiAoaXNWb2xhdGlsZSkKICAgICAgICAgICAgIHJldHVybiBtYWtlVm9sYXRpbGUobV9mcm9udEJ1 ZmZlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUv UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1v dGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0KaW5kZXggNjQ5YmQ4YTNi ZDkxNzBmYzc4YzE1NGNhZDU2ZDdkZTQxMjlmOWQyNy4uYWJhZDkyODhmZTBjMzEwYjNjZGZjMTZj ODgxZWFmZmE4YWU3ZWFhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3Rl TGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQpA QCAtNzg3LDE0ICs3ODcsMjQgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6c2V0 TGF5ZXJJRHNXaXRoTmV3bHlVbnJlYWNoYWJsZUJhY2tpbmdTdG9yZShWZWMKIAogI2lmICFkZWZp bmVkKE5ERUJVRykgfHwgIUxPR19ESVNBQkxFRAogCitzdGF0aWMgY29uc3QgY2hhciogbmFtZUZv ckJhY2tpbmdTdG9yZVR5cGUoUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OlR5cGUgdHlwZSkKK3sK KyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNlIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpU eXBlOjpJT1N1cmZhY2U6CisgICAgICAgIHJldHVybiAiSU9TdXJmYWNlIjsKKyAgICBjYXNlIFJl bW90ZUxheWVyQmFja2luZ1N0b3JlOjpUeXBlOjpCaXRtYXA6CisgICAgICAgIHJldHVybiAiQml0 bWFwIjsKKyAgICB9CisgICAgcmV0dXJuIG51bGxwdHI7Cit9CisKIHN0YXRpYyBUZXh0U3RyZWFt JiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW1vdGVMYXllckJhY2tpbmdTdG9y ZSYgYmFja2luZ1N0b3JlKQogewogICAgIHRzIDw8IGJhY2tpbmdTdG9yZS5zaXplKCk7CiAgICAg dHMgPDwgIiBzY2FsZT0iIDw8IGJhY2tpbmdTdG9yZS5zY2FsZSgpOwogICAgIGlmIChiYWNraW5n U3RvcmUuaXNPcGFxdWUoKSkKICAgICAgICAgdHMgPDwgIiBvcGFxdWUiOwotICAgIGlmIChiYWNr aW5nU3RvcmUuYWNjZWxlcmF0ZXNEcmF3aW5nKCkpCi0gICAgICAgIHRzIDw8ICIgYWNjZWxlcmF0 ZWQiOworICAgIHRzIDw8ICIgIiA8PCBuYW1lRm9yQmFja2luZ1N0b3JlVHlwZShiYWNraW5nU3Rv cmUudHlwZSgpKTsKICAgICByZXR1cm4gdHM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9QbGF0Zm9ybUNBTGF5ZXJSZW1v dGUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVl L1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAKaW5kZXggODEwZGMzYzkwNGIyZjdkMGJkZTk1ZTA1 ZjAwNmM2MTk2YWJiZTVjMC4uMWM5NzY1OTlkZjUzNTJiZjhhMDIzZTkyNjQwOTEzOWQ1YmMyNzBk OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5 ZXJUcmVlL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAK QEAgLTIzMyw3ICsyMzMsOCBAQCB2b2lkIFBsYXRmb3JtQ0FMYXllclJlbW90ZTo6dXBkYXRlQmFj a2luZ1N0b3JlKCkKIAogICAgIEFTU0VSVChtX3Byb3BlcnRpZXMuYmFja2luZ1N0b3JlQXR0YWNo ZWQpOwogCi0gICAgbV9wcm9wZXJ0aWVzLmJhY2tpbmdTdG9yZS0+ZW5zdXJlQmFja2luZ1N0b3Jl KG1fcHJvcGVydGllcy5ib3VuZHMuc2l6ZSgpLCBtX3Byb3BlcnRpZXMuY29udGVudHNTY2FsZSwg bV9hY2NlbGVyYXRlc0RyYXdpbmcsIG1fd2FudHNEZWVwQ29sb3JCYWNraW5nU3RvcmUsIG1fcHJv cGVydGllcy5vcGFxdWUpOworICAgIGF1dG8gdHlwZSA9IG1fYWNjZWxlcmF0ZXNEcmF3aW5nID8g UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OlR5cGU6OklPU3VyZmFjZSA6IFJlbW90ZUxheWVyQmFj a2luZ1N0b3JlOjpUeXBlOjpCaXRtYXA7CisgICAgbV9wcm9wZXJ0aWVzLmJhY2tpbmdTdG9yZS0+ ZW5zdXJlQmFja2luZ1N0b3JlKHR5cGUsIG1fcHJvcGVydGllcy5ib3VuZHMuc2l6ZSgpLCBtX3By b3BlcnRpZXMuY29udGVudHNTY2FsZSwgbV93YW50c0RlZXBDb2xvckJhY2tpbmdTdG9yZSwgbV9w cm9wZXJ0aWVzLm9wYXF1ZSk7CiB9CiAKIHZvaWQgUGxhdGZvcm1DQUxheWVyUmVtb3RlOjpzZXRO ZWVkc0Rpc3BsYXlJblJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQo=