289711 2025-03-13 09:13:52 -0700 [Cleanup] View transition root is always a RenderBlockFlow while groups are RenderBoxes 2025-03-13 20:51:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2102955 0 zalan 2025-03-13 09:13:52 -0700 ssia 2102960 1 474553 zalan 2025-03-13 09:19:07 -0700 Created attachment 474553 [fast-cq]Patch 2103189 2 ews-feeder 2025-03-13 20:50:34 -0700 Committed 292137@main (2d50d53a1664): <https://commits.webkit.org/292137@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 474553. 2103190 3 webkit-bug-importer 2025-03-13 20:51:15 -0700 <rdar://problem/147014077> 474553 2025-03-13 09:19:07 -0700 2025-03-13 20:50:35 -0700 [fast-cq]Patch bug-289711-20250313091906.patch text/plain 11359 zalan RnJvbSBkZmQ0MWQ4ZWU3ZTA4MWM0YWY3OTE1ODk3M2U3YjM4ZTJmYTJiZDRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMTMgTWFyIDIwMjUgMDk6MTQ6MDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbQ2xlYW51 cF0gVmlldyB0cmFuc2l0aW9uIHJvb3QgaXMgYWx3YXlzIGEgUmVuZGVyQmxvY2tGbG93CiB3aGls ZSBncm91cHMgYXJlIFJlbmRlckJveGVzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yODk3MTEKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKR2VuZXJhbCBjbGVh bnVwIGFuZCB0eXBlIHRpZ2h0ZW5pbmcuCgoqIFNvdXJjZS9XZWJDb3JlL3BhZ2UvdGV4dC1leHRy YWN0aW9uL1RleHRFeHRyYWN0aW9uLmNwcDogZHJpdmUtYnkgZml4LgooV2ViQ29yZTo6VGV4dEV4 dHJhY3Rpb246OmV4dHJhY3RSZW5kZXJlZFRva2Vucyk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclZpZXcuY3BwOgooV2ViQ29yZTo6UmVuZGVyVmlldzo6dmlld1RyYW5zaXRpb25S b290IGNvbnN0KToKKFdlYkNvcmU6OlJlbmRlclZpZXc6OnNldFZpZXdUcmFuc2l0aW9uUm9vdCk6 CihXZWJDb3JlOjpSZW5kZXJWaWV3OjphZGRWaWV3VHJhbnNpdGlvbkdyb3VwKToKKFdlYkNvcmU6 OlJlbmRlclZpZXc6OnZpZXdUcmFuc2l0aW9uR3JvdXBGb3JOYW1lKToKKiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRh dGluZy9SZW5kZXJUcmVlVXBkYXRlclZpZXdUcmFuc2l0aW9uLmNwcDoKKFdlYkNvcmU6OlJlbmRl clRyZWVVcGRhdGVyOjpWaWV3VHJhbnNpdGlvbjo6dXBkYXRlUHNldWRvRWxlbWVudFRyZWUpOiB2 aWV3IHRyYW5zaXRpb24gY29udGVudCBpcyBlaXRoZXIgcmVwbGFjZWQgb3IgYW5kIGFjdHVhbCBi bG9jayBmbG93IChidXQgbmV2ZXIgUmVuZGVyVGV4dCkuCihXZWJDb3JlOjpSZW5kZXJUcmVlVXBk YXRlcjo6Vmlld1RyYW5zaXRpb246OnVwZGF0ZVBzZXVkb0VsZW1lbnRHcm91cCk6CiogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyVmlld1RyYW5zaXRp b24uaDoKLS0tCiAuLi4vcGFnZS90ZXh0LWV4dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwICAg fCAgMiArLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwICAgICAgIHwg IDggKysrLS0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCAgICAgICAg IHwgMTIgKysrKystLS0tLQogLi4uL1JlbmRlclRyZWVVcGRhdGVyVmlld1RyYW5zaXRpb24uY3Bw ICAgICAgIHwgMjIgKysrKysrKysrLS0tLS0tLS0tLQogLi4uL1JlbmRlclRyZWVVcGRhdGVyVmll d1RyYW5zaXRpb24uaCAgICAgICAgIHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0 aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS90ZXh0LWV4dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS90ZXh0LWV4dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwCmluZGV4IDA5NDQxY2IxNzQ3MC4u NWZhYjhmYWNiZTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3RleHQtZXh0cmFj dGlvbi9UZXh0RXh0cmFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS90ZXh0LWV4 dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwCkBAIC01MzcsNyArNTM3LDcgQEAgc3RhdGljIHZv aWQgZXh0cmFjdFJlbmRlcmVkVG9rZW5zKFZlY3RvcjxUb2tlbkFuZEJsb2NrT2Zmc2V0PiYgdG9r ZW5zQW5kT2Zmc2V0cywKICAgICB9CiAKICAgICBhdXRvIGZyYW1lVmlldyA9IHJlbmRlcmVyLT52 aWV3KCkucHJvdGVjdGVkRnJhbWVWaWV3KCk7Ci0gICAgYXV0byBhcHBlbmRSZXBsYWNlZENvbnRl bnRPckJhY2tncm91bmRJbWFnZSA9IFsmXShjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKSB7 CisgICAgYXV0byBhcHBlbmRSZXBsYWNlZENvbnRlbnRPckJhY2tncm91bmRJbWFnZSA9IFsmXShh dXRvJiByZW5kZXJlcikgewogICAgICAgICBpZiAoIXJlbmRlcmVyLnN0eWxlKCkuaGFzQmFja2dy b3VuZEltYWdlKCkgJiYgIWlzPFJlbmRlclJlcGxhY2VkPihyZW5kZXJlcikpCiAgICAgICAgICAg ICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJW aWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAppbmRleCA0 MTRjNmVlMDE0YzUuLjA1ZTc2ZTAzODljNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJWaWV3LmNwcApAQCAtMTEyMiwxNyArMTEyMiwxNyBAQCBTaW5nbGVUaHJlYWRXZWFrSGFzaFNl dDxSZW5kZXJDb3VudGVyPiBSZW5kZXJWaWV3Ojp0YWtlQ291bnRlcnNOZWVkaW5nVXBkYXRlKCkK ICAgICByZXR1cm4gc3RkOjpleGNoYW5nZShtX2NvdW50ZXJzTmVlZGluZ1VwZGF0ZSwgeyB9KTsK IH0KIAotU2luZ2xlVGhyZWFkV2Vha1B0cjxSZW5kZXJFbGVtZW50PiBSZW5kZXJWaWV3Ojp2aWV3 VHJhbnNpdGlvblJvb3QoKSBjb25zdAorU2luZ2xlVGhyZWFkV2Vha1B0cjxSZW5kZXJCbG9ja0Zs b3c+IFJlbmRlclZpZXc6OnZpZXdUcmFuc2l0aW9uUm9vdCgpIGNvbnN0CiB7CiAgICAgcmV0dXJu IG1fdmlld1RyYW5zaXRpb25Sb290OwogfQogCi12b2lkIFJlbmRlclZpZXc6OnNldFZpZXdUcmFu c2l0aW9uUm9vdChSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKK3ZvaWQgUmVuZGVyVmlldzo6c2V0 Vmlld1RyYW5zaXRpb25Sb290KFJlbmRlckJsb2NrRmxvdyYgcmVuZGVyZXIpCiB7CiAgICAgbV92 aWV3VHJhbnNpdGlvblJvb3QgPSByZW5kZXJlcjsKIH0KIAotdm9pZCBSZW5kZXJWaWV3OjphZGRW aWV3VHJhbnNpdGlvbkdyb3VwKGNvbnN0IEF0b21TdHJpbmcmIG5hbWUsIFJlbmRlckVsZW1lbnQm IGdyb3VwKQordm9pZCBSZW5kZXJWaWV3OjphZGRWaWV3VHJhbnNpdGlvbkdyb3VwKGNvbnN0IEF0 b21TdHJpbmcmIG5hbWUsIFJlbmRlckJveCYgZ3JvdXApCiB7CiAgICAgbV92aWV3VHJhbnNpdGlv bkdyb3Vwcy5zZXQobmFtZSwgJmdyb3VwKTsKIH0KQEAgLTExNDIsNyArMTE0Miw3IEBAIHZvaWQg UmVuZGVyVmlldzo6cmVtb3ZlVmlld1RyYW5zaXRpb25Hcm91cChjb25zdCBBdG9tU3RyaW5nJiBu YW1lKQogICAgIG1fdmlld1RyYW5zaXRpb25Hcm91cHMucmVtb3ZlKG5hbWUpOwogfQogCi1SZW5k ZXJFbGVtZW50KiBSZW5kZXJWaWV3Ojp2aWV3VHJhbnNpdGlvbkdyb3VwRm9yTmFtZShjb25zdCBB dG9tU3RyaW5nJiBuYW1lKQorUmVuZGVyQm94KiBSZW5kZXJWaWV3Ojp2aWV3VHJhbnNpdGlvbkdy b3VwRm9yTmFtZShjb25zdCBBdG9tU3RyaW5nJiBuYW1lKQogewogICAgIHJldHVybiBtX3ZpZXdU cmFuc2l0aW9uR3JvdXBzLmdldChuYW1lKS5nZXQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVmlldy5oCmluZGV4IGMzZjZlZGIyM2YwYy4uZGZkMWYzNjI4OWQ5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKQEAgLTIxNiwxMiArMjE2LDEyIEBAIHB1YmxpYzoK ICAgICB2b2lkIHVucmVnaXN0ZXJQb3NpdGlvblRyeUJveChjb25zdCBSZW5kZXJCb3gmKTsKICAg ICBjb25zdCBTaW5nbGVUaHJlYWRXZWFrSGFzaFNldDxjb25zdCBSZW5kZXJCb3g+JiBwb3NpdGlv blRyeUJveGVzKCkgY29uc3QgeyByZXR1cm4gbV9wb3NpdGlvblRyeUJveGVzOyB9CiAKLSAgICBT aW5nbGVUaHJlYWRXZWFrUHRyPFJlbmRlckVsZW1lbnQ+IHZpZXdUcmFuc2l0aW9uUm9vdCgpIGNv bnN0OwotICAgIHZvaWQgc2V0Vmlld1RyYW5zaXRpb25Sb290KFJlbmRlckVsZW1lbnQmIHJlbmRl cmVyKTsKKyAgICBTaW5nbGVUaHJlYWRXZWFrUHRyPFJlbmRlckJsb2NrRmxvdz4gdmlld1RyYW5z aXRpb25Sb290KCkgY29uc3Q7CisgICAgdm9pZCBzZXRWaWV3VHJhbnNpdGlvblJvb3QoUmVuZGVy QmxvY2tGbG93JiByZW5kZXJlcik7CiAKLSAgICB2b2lkIGFkZFZpZXdUcmFuc2l0aW9uR3JvdXAo Y29uc3QgQXRvbVN0cmluZyYsIFJlbmRlckVsZW1lbnQmKTsKKyAgICB2b2lkIGFkZFZpZXdUcmFu c2l0aW9uR3JvdXAoY29uc3QgQXRvbVN0cmluZyYsIFJlbmRlckJveCYpOwogICAgIHZvaWQgcmVt b3ZlVmlld1RyYW5zaXRpb25Hcm91cChjb25zdCBBdG9tU3RyaW5nJik7Ci0gICAgUmVuZGVyRWxl bWVudCogdmlld1RyYW5zaXRpb25Hcm91cEZvck5hbWUoY29uc3QgQXRvbVN0cmluZyYpOworICAg IFJlbmRlckJveCogdmlld1RyYW5zaXRpb25Hcm91cEZvck5hbWUoY29uc3QgQXRvbVN0cmluZyYp OwogCiBwcml2YXRlOgogICAgIHZvaWQgc3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlLCBj b25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUpIG92ZXJyaWRlOwpAQCAtMjkzLDggKzI5Myw4IEBA IHByaXZhdGU6CiAgICAgU2luZ2xlVGhyZWFkV2Vha0hhc2hTZXQ8Y29uc3QgUmVuZGVyQm94TW9k ZWxPYmplY3Q+IG1fYW5jaG9yczsKICAgICBTaW5nbGVUaHJlYWRXZWFrSGFzaFNldDxjb25zdCBS ZW5kZXJCb3g+IG1fcG9zaXRpb25UcnlCb3hlczsKIAotICAgIFNpbmdsZVRocmVhZFdlYWtQdHI8 UmVuZGVyRWxlbWVudD4gbV92aWV3VHJhbnNpdGlvblJvb3Q7Ci0gICAgSGFzaE1hcDxBdG9tU3Ry aW5nLCBTaW5nbGVUaHJlYWRXZWFrUHRyPFJlbmRlckVsZW1lbnQ+PiBtX3ZpZXdUcmFuc2l0aW9u R3JvdXBzOworICAgIFNpbmdsZVRocmVhZFdlYWtQdHI8UmVuZGVyQmxvY2tGbG93PiBtX3ZpZXdU cmFuc2l0aW9uUm9vdDsKKyAgICBIYXNoTWFwPEF0b21TdHJpbmcsIFNpbmdsZVRocmVhZFdlYWtQ dHI8UmVuZGVyQm94Pj4gbV92aWV3VHJhbnNpdGlvbkdyb3VwczsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlVXBkYXRlclZpZXdUcmFuc2l0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBkYXRlclZpZXdUcmFuc2l0aW9uLmNwcAppbmRl eCA3OTQ3NzY1MDNiYTIuLmVlNTdiMWM2NzRjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyVmlld1RyYW5zaXRpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBkYXRlclZp ZXdUcmFuc2l0aW9uLmNwcApAQCAtOTMsNyArOTMsNyBAQCB2b2lkIFJlbmRlclRyZWVVcGRhdGVy OjpWaWV3VHJhbnNpdGlvbjo6dXBkYXRlUHNldWRvRWxlbWVudFRyZWUoUmVuZGVyRWxlbWVudCYg ZAogCiAgICAgLy8gVHJhdmVyc2UgbmFtZWQgZWxlbWVudHMgbWFwIHRvIHVwZGF0ZS9idWlsZCBh bGwgOjp2aWV3LXRyYW5zaXRpb24tZ3JvdXAoKS4KICAgICBWZWN0b3I8U2luZ2xlVGhyZWFkV2Vh a1B0cjxSZW5kZXJPYmplY3Q+PiBkZXNjZW5kYW50c1RvRGVsZXRlOwotICAgIGF1dG8qIGN1cnJl bnRHcm91cCA9IGRvY3VtZW50RWxlbWVudFJlbmRlcmVyLnZpZXcoKS52aWV3VHJhbnNpdGlvblJv b3QoKS0+Zmlyc3RDaGlsZCgpOworICAgIGF1dG8qIGN1cnJlbnRHcm91cCA9IGRvY3VtZW50RWxl bWVudFJlbmRlcmVyLnZpZXcoKS52aWV3VHJhbnNpdGlvblJvb3QoKS0+Zmlyc3RDaGlsZEJveCgp OwogICAgIGZvciAoYXV0byYgbmFtZSA6IGFjdGl2ZVZpZXdUcmFuc2l0aW9uLT5uYW1lZEVsZW1l bnRzKCkua2V5cygpKSB7CiAgICAgICAgIEFTU0VSVCghY3VycmVudEdyb3VwIHx8IGN1cnJlbnRH cm91cC0+c3R5bGUoKS5wc2V1ZG9FbGVtZW50VHlwZSgpID09IFBzZXVkb0lkOjpWaWV3VHJhbnNp dGlvbkdyb3VwKTsKICAgICAgICAgaWYgKGN1cnJlbnRHcm91cCAmJiBuYW1lID09IGN1cnJlbnRH cm91cC0+c3R5bGUoKS5wc2V1ZG9FbGVtZW50TmFtZUFyZ3VtZW50KCkpIHsKQEAgLTEwMiw4ICsx MDIsOCBAQCB2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjpWaWV3VHJhbnNpdGlvbjo6dXBkYXRlUHNl dWRvRWxlbWVudFRyZWUoUmVuZGVyRWxlbWVudCYgZAogICAgICAgICAgICAgICAgIGRvY3VtZW50 RWxlbWVudFJlbmRlcmVyLnZpZXcoKS5yZW1vdmVWaWV3VHJhbnNpdGlvbkdyb3VwKG5hbWUpOwog ICAgICAgICAgICAgICAgIGRlc2NlbmRhbnRzVG9EZWxldGUuYXBwZW5kKGN1cnJlbnRHcm91cCk7 CiAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICB1cGRhdGVQc2V1ZG9FbGVtZW50 R3JvdXAoKnN0eWxlLCBkb3duY2FzdDxSZW5kZXJFbGVtZW50PigqY3VycmVudEdyb3VwKSwgZG9j dW1lbnRFbGVtZW50UmVuZGVyZXIsIG1pbmltYWxTdHlsZURpZmZlcmVuY2UpOwotICAgICAgICAg ICAgY3VycmVudEdyb3VwID0gY3VycmVudEdyb3VwLT5uZXh0U2libGluZygpOworICAgICAgICAg ICAgICAgIHVwZGF0ZVBzZXVkb0VsZW1lbnRHcm91cCgqc3R5bGUsICpjdXJyZW50R3JvdXAsIGRv Y3VtZW50RWxlbWVudFJlbmRlcmVyLCBtaW5pbWFsU3R5bGVEaWZmZXJlbmNlKTsKKyAgICAgICAg ICAgIGN1cnJlbnRHcm91cCA9IGN1cnJlbnRHcm91cC0+bmV4dFNpYmxpbmdCb3goKTsKICAgICAg ICAgfSBlbHNlCiAgICAgICAgICAgICBidWlsZFBzZXVkb0VsZW1lbnRHcm91cChuYW1lLCBkb2N1 bWVudEVsZW1lbnRSZW5kZXJlciwgY3VycmVudEdyb3VwKTsKICAgICB9CkBAIC0xNjYsNyArMTY2 LDcgQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6Vmlld1RyYW5zaXRpb246OmJ1aWxkUHNldWRv RWxlbWVudEdyb3VwKGNvbnN0IEF0b21TdHJpbmcKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyVHJl ZVVwZGF0ZXI6OlZpZXdUcmFuc2l0aW9uOjp1cGRhdGVQc2V1ZG9FbGVtZW50R3JvdXAoY29uc3Qg UmVuZGVyU3R5bGUmIGdyb3VwU3R5bGUsIFJlbmRlckVsZW1lbnQmIGdyb3VwLCBSZW5kZXJFbGVt ZW50JiBkb2N1bWVudEVsZW1lbnRSZW5kZXJlciwgU3R5bGVEaWZmZXJlbmNlIG1pbmltYWxTdHls ZURpZmZlcmVuY2UpCit2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjpWaWV3VHJhbnNpdGlvbjo6dXBk YXRlUHNldWRvRWxlbWVudEdyb3VwKGNvbnN0IFJlbmRlclN0eWxlJiBncm91cFN0eWxlLCBSZW5k ZXJCb3gmIGdyb3VwLCBSZW5kZXJFbGVtZW50JiBkb2N1bWVudEVsZW1lbnRSZW5kZXJlciwgU3R5 bGVEaWZmZXJlbmNlIG1pbmltYWxTdHlsZURpZmZlcmVuY2UpCiB7CiAgICAgYXV0byYgZG9jdW1l bnRFbGVtZW50U3R5bGUgPSBkb2N1bWVudEVsZW1lbnRSZW5kZXJlci5zdHlsZSgpOwogICAgIGF1 dG8gbmFtZSA9IGdyb3VwU3R5bGUucHNldWRvRWxlbWVudE5hbWVBcmd1bWVudCgpOwpAQCAtMTc1 LDE4ICsxNzUsMTggQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6Vmlld1RyYW5zaXRpb246OnVw ZGF0ZVBzZXVkb0VsZW1lbnRHcm91cChjb25zdCBSZW5kZXJTdHkKICAgICBncm91cC5zZXRTdHls ZShXVEZNb3ZlKG5ld0dyb3VwU3R5bGUpLCBtaW5pbWFsU3R5bGVEaWZmZXJlbmNlKTsKIAogICAg IGVudW0gY2xhc3MgU2hvdWxkRGVsZXRlUmVuZGVyZXIgOiBib29sIHsgTm8sIFllcyB9OwotICAg IGF1dG8gdXBkYXRlUmVuZGVyZXIgPSBbJl0oUmVuZGVyT2JqZWN0JiByZW5kZXJlcikgLT4gU2hv dWxkRGVsZXRlUmVuZGVyZXIgeworICAgIGF1dG8gdXBkYXRlUmVuZGVyZXIgPSBbJl0oYXV0byYg cmVuZGVyZXIpIC0+IFNob3VsZERlbGV0ZVJlbmRlcmVyIHsKICAgICAgICAgYXV0byBzdHlsZSA9 IGRvY3VtZW50RWxlbWVudFJlbmRlcmVyLmdldENhY2hlZFBzZXVkb1N0eWxlKHsgcmVuZGVyZXIu c3R5bGUoKS5wc2V1ZG9FbGVtZW50VHlwZSgpLCBuYW1lIH0sICZkb2N1bWVudEVsZW1lbnRTdHls ZSk7CiAgICAgICAgIGlmICghc3R5bGUgfHwgc3R5bGUtPmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlw ZTo6Tm9uZSkKICAgICAgICAgICAgIHJldHVybiBTaG91bGREZWxldGVSZW5kZXJlcjo6WWVzOwog CiAgICAgICAgIGF1dG8gbmV3U3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmUoKnN0eWxlKTsKLSAg ICAgICAgZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4ocmVuZGVyZXIpLnNldFN0eWxlKFdURk1vdmUo bmV3U3R5bGUpLCBtaW5pbWFsU3R5bGVEaWZmZXJlbmNlKTsKKyAgICAgICAgcmVuZGVyZXIuc2V0 U3R5bGUoV1RGTW92ZShuZXdTdHlsZSksIG1pbmltYWxTdHlsZURpZmZlcmVuY2UpOwogICAgICAg ICByZXR1cm4gU2hvdWxkRGVsZXRlUmVuZGVyZXI6Ok5vOwogICAgIH07CiAKICAgICAvLyBDcmVh dGUgLyByZW1vdmUgOjp2aWV3LXRyYW5zdGlvbi1pbWFnZS1wYWlyIGl0c2VsZi4KLSAgICBTaW5n bGVUaHJlYWRXZWFrUHRyPFJlbmRlckVsZW1lbnQ+IGltYWdlUGFpciA9IGRvd25jYXN0PFJlbmRl ckVsZW1lbnQ+KGdyb3VwLmZpcnN0Q2hpbGQoKSk7CisgICAgU2luZ2xlVGhyZWFkV2Vha1B0cjxS ZW5kZXJCb3g+IGltYWdlUGFpciA9IGdyb3VwLmZpcnN0Q2hpbGRCb3goKTsKICAgICBpZiAoaW1h Z2VQYWlyKSB7CiAgICAgICAgIEFTU0VSVChpbWFnZVBhaXItPnN0eWxlKCkucHNldWRvRWxlbWVu dFR5cGUoKSA9PSBQc2V1ZG9JZDo6Vmlld1RyYW5zaXRpb25JbWFnZVBhaXIpOwogICAgICAgICBh dXRvIHNob3VsZERlbGV0ZVJlbmRlcmVyID0gdXBkYXRlUmVuZGVyZXIoKmltYWdlUGFpcik7CkBA IC0yMDAsNyArMjAwLDcgQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6Vmlld1RyYW5zaXRpb246 OnVwZGF0ZVBzZXVkb0VsZW1lbnRHcm91cChjb25zdCBSZW5kZXJTdHkKICAgICB9IGVsc2UKICAg ICAgICAgcmV0dXJuOwogCi0gICAgYXV0byogaW1hZ2VQYWlyRmlyc3RDaGlsZCA9IGltYWdlUGFp ci0+Zmlyc3RDaGlsZCgpOworICAgIGF1dG8qIGltYWdlUGFpckZpcnN0Q2hpbGQgPSBpbWFnZVBh aXItPmZpcnN0Q2hpbGRCb3goKTsKICAgICAvLyBCdWlsZCB0aGUgOjp2aWV3LXRyYW5zaXRpb24t aW1hZ2UtcGFpciBjaGlsZHJlbiBpZiBuZWVkZWQuCiAgICAgaWYgKCFpbWFnZVBhaXJGaXJzdENo aWxkKSB7CiAgICAgICAgIGlmIChhdXRvIHZpZXdUcmFuc2l0aW9uT2xkID0gY3JlYXRlUmVuZGVy ZXJJZk5lZWRlZChkb2N1bWVudEVsZW1lbnRSZW5kZXJlciwgbmFtZSwgUHNldWRvSWQ6OlZpZXdU cmFuc2l0aW9uT2xkKSkKQEAgLTIxMywxNSArMjEzLDE1IEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0 ZXI6OlZpZXdUcmFuc2l0aW9uOjp1cGRhdGVQc2V1ZG9FbGVtZW50R3JvdXAoY29uc3QgUmVuZGVy U3R5CiAgICAgLy8gVXBkYXRlIHByZS1leGlzdGluZyA6OnZpZXctdHJhbnNpdGlvbi1pbWFnZS1w YWlyIGNoaWxkcmVuLgogICAgIGF1dG8gc2hvdWxkRGVsZXRlVmlld1RyYW5zaXRpb25PbGQgPSBT aG91bGREZWxldGVSZW5kZXJlcjo6Tm87CiAKLSAgICBTaW5nbGVUaHJlYWRXZWFrUHRyPFJlbmRl ck9iamVjdD4gdmlld1RyYW5zaXRpb25PbGQ7Ci0gICAgU2luZ2xlVGhyZWFkV2Vha1B0cjxSZW5k ZXJPYmplY3Q+IHZpZXdUcmFuc2l0aW9uTmV3OworICAgIFNpbmdsZVRocmVhZFdlYWtQdHI8UmVu ZGVyQm94PiB2aWV3VHJhbnNpdGlvbk9sZDsKKyAgICBTaW5nbGVUaHJlYWRXZWFrUHRyPFJlbmRl ckJveD4gdmlld1RyYW5zaXRpb25OZXc7CiAKICAgICBSZW5kZXJQdHI8UmVuZGVyQm94PiBuZXdW aWV3VHJhbnNpdGlvbk9sZDsKICAgICBSZW5kZXJQdHI8UmVuZGVyQm94PiBuZXdWaWV3VHJhbnNp dGlvbk5ldzsKICAgICBpZiAoaW1hZ2VQYWlyRmlyc3RDaGlsZC0+c3R5bGUoKS5wc2V1ZG9FbGVt ZW50VHlwZSgpID09IFBzZXVkb0lkOjpWaWV3VHJhbnNpdGlvbk9sZCkgewogICAgICAgICB2aWV3 VHJhbnNpdGlvbk9sZCA9IGltYWdlUGFpckZpcnN0Q2hpbGQ7CiAgICAgICAgIHNob3VsZERlbGV0 ZVZpZXdUcmFuc2l0aW9uT2xkID0gdXBkYXRlUmVuZGVyZXIoKnZpZXdUcmFuc2l0aW9uT2xkKTsK LSAgICAgICAgdmlld1RyYW5zaXRpb25OZXcgPSB2aWV3VHJhbnNpdGlvbk9sZC0+bmV4dFNpYmxp bmcoKTsKKyAgICAgICAgdmlld1RyYW5zaXRpb25OZXcgPSB2aWV3VHJhbnNpdGlvbk9sZC0+bmV4 dFNpYmxpbmdCb3goKTsKICAgICAgICAgQVNTRVJUKCF2aWV3VHJhbnNpdGlvbk5ldyB8fCB2aWV3 VHJhbnNpdGlvbk5ldy0+c3R5bGUoKS5wc2V1ZG9FbGVtZW50VHlwZSgpID09IFBzZXVkb0lkOjpW aWV3VHJhbnNpdGlvbk5ldyk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKGltYWdlUGFp ckZpcnN0Q2hpbGQtPnN0eWxlKCkucHNldWRvRWxlbWVudFR5cGUoKSA9PSBQc2V1ZG9JZDo6Vmll d1RyYW5zaXRpb25OZXcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyVmlld1RyYW5zaXRpb24uaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBkYXRlclZpZXdUcmFuc2l0aW9uLmgKaW5k ZXggZjRkMzliMzk2YzYxLi5kZmVjYWIyODU3MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBkYXRlclZpZXdUcmFuc2l0aW9uLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyVmll d1RyYW5zaXRpb24uaApAQCAtNDIsNyArNDIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVQ c2V1ZG9FbGVtZW50VHJlZShSZW5kZXJFbGVtZW50JiwgU3R5bGVEaWZmZXJlbmNlIG1pbmltYWxT dHlsZURpZmZlcmVuY2UpOwogcHJpdmF0ZToKICAgICB2b2lkIGJ1aWxkUHNldWRvRWxlbWVudEdy b3VwKGNvbnN0IEF0b21TdHJpbmcmLCBSZW5kZXJFbGVtZW50JiwgUmVuZGVyT2JqZWN0KiA9IG51 bGxwdHIpOwotICAgIHZvaWQgdXBkYXRlUHNldWRvRWxlbWVudEdyb3VwKGNvbnN0IFJlbmRlclN0 eWxlJiwgUmVuZGVyRWxlbWVudCYsIFJlbmRlckVsZW1lbnQmLCBTdHlsZURpZmZlcmVuY2UgbWlu aW1hbFN0eWxlRGlmZmVyZW5jZSk7CisgICAgdm9pZCB1cGRhdGVQc2V1ZG9FbGVtZW50R3JvdXAo Y29uc3QgUmVuZGVyU3R5bGUmLCBSZW5kZXJCb3gmLCBSZW5kZXJFbGVtZW50JiwgU3R5bGVEaWZm ZXJlbmNlIG1pbmltYWxTdHlsZURpZmZlcmVuY2UpOwogICAgIFJlbmRlclRyZWVVcGRhdGVyJiBt X3VwZGF0ZXI7CiB9OwogCg==