50300 2010-11-30 17:05:31 -0800 Change DrawingArea and DrawingAreaProxy to not inherit from DrawingAreaBase 2010-11-30 18:15:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit-ews oldest_to_newest 315423 0 andersca 2010-11-30 17:05:31 -0800 Change DrawingArea and DrawingAreaProxy to not inherit from DrawingAreaBase 315426 1 75234 andersca 2010-11-30 17:07:12 -0800 Created attachment 75234 Patch 315451 2 webkit-ews 2010-11-30 17:44:26 -0800 Attachment 75234 did not build on qt: Build output: http://queues.webkit.org/results/6464001 315452 3 andersca 2010-11-30 17:46:09 -0800 (In reply to comment #2) > Attachment 75234 [details] did not build on qt: > Build output: http://queues.webkit.org/results/6464001 I've fixed this. 315468 4 andersca 2010-11-30 18:15:05 -0800 Committed r72996: <http://trac.webkit.org/changeset/72996> 75234 2010-11-30 17:07:12 -0800 2010-11-30 17:47:14 -0800 Patch bug-50300-20101130170711.patch text/plain 17714 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZmQ1MDAxYmNjZjEwYTU5MWFiMzllMGNkZDdiNTNlZjRlZThkMGI1Yy4uNjFkMmUyMWE4ODZlOWU1 MWUwZmZjMzFmMmNjODk5YzdmMmU2MDQ0YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NCBAQAogMjAxMC0xMS0zMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBEcmF3aW5nQXJlYSBhbmQgRHJhd2lu Z0FyZWFQcm94eSB0byBub3QgaW5oZXJpdCBmcm9tIERyYXdpbmdBcmVhQmFzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAzMDAKKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF9zd2l0Y2hU b0RyYXdpbmdBcmVhVHlwZUlmTmVjZXNzYXJ5OkRyYXdpbmdBcmVhQmFzZTo6XSk6CisgICAgICAg ICgtW1dLVmlldyBfcGFnZURpZEVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ10pOgorICAgICAg ICAoLVtXS1ZpZXcgX3BhZ2VEaWRMZWF2ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmddKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Q2h1bmtlZFVwZGF0ZURy YXdpbmdBcmVhUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eTo6RHJhd2luZ0FyZWFQcm94eSk6 CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk6Om5leHREcmF3aW5nQXJlYUlEKToK KyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oOgorICAgICAgICAoV2ViS2l0 OjpEcmF3aW5nQXJlYVByb3h5OjppbmZvKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTGF5ZXJCYWNr ZWREcmF3aW5nQXJlYVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJCYWNrZWREcmF3 aW5nQXJlYVByb3h5OjpMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWEuY3BwOgorICAgICAgICAo V2ViS2l0OjpDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWE6OkNodW5rZWRVcGRhdGVEcmF3aW5nQXJl YSk6CisgICAgICAgIChXZWJLaXQ6OkNodW5rZWRVcGRhdGVEcmF3aW5nQXJlYTo6ZGlkUmVjZWl2 ZU1lc3NhZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9DaHVua2VkVXBkYXRlRHJh d2luZ0FyZWEuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuY3Bw OgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktp dDo6RHJhd2luZ0FyZWE6OkRyYXdpbmdBcmVhKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6OmluZm8pOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9MYXllckJhY2tlZERyYXdpbmdBcmVhLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TGF5ZXJCYWNrZWREcmF3aW5nQXJlYTo6TGF5ZXJCYWNrZWREcmF3 aW5nQXJlYSk6CisgICAgICAgIChXZWJLaXQ6OkxheWVyQmFja2VkRHJhd2luZ0FyZWE6OmRpZFJl Y2VpdmVNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJCYWNrZWRE cmF3aW5nQXJlYS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9UaWxlZERyYXdpbmdB cmVhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGlsZWREcmF3aW5nQXJlYTo6VGlsZWREcmF3aW5n QXJlYSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OmNoYW5nZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKToKKworMjAxMC0x MS0zMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEZp eCBidWlsZC4KIAogICAgICAgICAqIFNjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weToKZGlmZiAt LWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5kZXggZDcwNjg4NDJmZGRmNTZjZmIxYzk0ZjlkNmZm ZmEzNmY0YTRkY2QyNi4uZGIwMGRlNWY2OTQ5ZTk3Yzk0MDhlOTdiNGNhZGM2YmNlZTYxNmUxNyAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTk1NiwyMSArOTU2LDIxIEBAIC0g KHZvaWQpX3N0b3BBY2NlbGVyYXRlZENvbXBvc2l0aW5nCiAgICAgfQogfQogCi0tICh2b2lkKV9z d2l0Y2hUb0RyYXdpbmdBcmVhVHlwZUlmTmVjZXNzYXJ5OihEcmF3aW5nQXJlYVByb3h5OjpUeXBl KXR5cGUKKy0gKHZvaWQpX3N3aXRjaFRvRHJhd2luZ0FyZWFUeXBlSWZOZWNlc3Nhcnk6KERyYXdp bmdBcmVhQmFzZTo6VHlwZSl0eXBlCiB7Ci0gICAgRHJhd2luZ0FyZWFQcm94eTo6VHlwZSBleGlz dGluZ0RyYXdpbmdBcmVhVHlwZSA9IF9kYXRhLT5fcGFnZS0+ZHJhd2luZ0FyZWEoKSA/IF9kYXRh LT5fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+aW5mbygpLnR5cGUgOiBEcmF3aW5nQXJlYVByb3h5OjpO b25lOworICAgIERyYXdpbmdBcmVhQmFzZTo6VHlwZSBleGlzdGluZ0RyYXdpbmdBcmVhVHlwZSA9 IF9kYXRhLT5fcGFnZS0+ZHJhd2luZ0FyZWEoKSA/IF9kYXRhLT5fcGFnZS0+ZHJhd2luZ0FyZWEo KS0+aW5mbygpLnR5cGUgOiBEcmF3aW5nQXJlYUJhc2U6Ok5vbmU7CiAgICAgaWYgKGV4aXN0aW5n RHJhd2luZ0FyZWFUeXBlID09IHR5cGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIE93blB0cjxE cmF3aW5nQXJlYVByb3h5PiBuZXdEcmF3aW5nQXJlYTsKICAgICBzd2l0Y2ggKHR5cGUpIHsKLSAg ICAgICAgY2FzZSBEcmF3aW5nQXJlYVByb3h5OjpOb25lOgorICAgICAgICBjYXNlIERyYXdpbmdB cmVhQmFzZTo6Tm9uZToKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIERyYXdpbmdB cmVhUHJveHk6OkNodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVR5cGU6IHsKKyAgICAgICAgY2FzZSBE cmF3aW5nQXJlYUJhc2U6OkNodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVR5cGU6IHsKICAgICAgICAg ICAgIG5ld0RyYXdpbmdBcmVhID0gQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHk6OmNyZWF0 ZShzZWxmKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIGNhc2UgRHJh d2luZ0FyZWFQcm94eTo6TGF5ZXJCYWNrZWREcmF3aW5nQXJlYVR5cGU6IHsKKyAgICAgICAgY2Fz ZSBEcmF3aW5nQXJlYUJhc2U6OkxheWVyQmFja2VkRHJhd2luZ0FyZWFUeXBlOiB7CiAgICAgICAg ICAgICBuZXdEcmF3aW5nQXJlYSA9IExheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRl KHNlbGYpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KQEAgLTk4NCwxMyArOTg0LDEz IEBAIC0gKHZvaWQpX3N3aXRjaFRvRHJhd2luZ0FyZWFUeXBlSWZOZWNlc3Nhcnk6KERyYXdpbmdB cmVhUHJveHk6OlR5cGUpdHlwZQogCiAtICh2b2lkKV9wYWdlRGlkRW50ZXJBY2NlbGVyYXRlZENv bXBvc2l0aW5nCiB7Ci0gICAgW3NlbGYgX3N3aXRjaFRvRHJhd2luZ0FyZWFUeXBlSWZOZWNlc3Nh cnk6RHJhd2luZ0FyZWFQcm94eTo6TGF5ZXJCYWNrZWREcmF3aW5nQXJlYVR5cGVdOworICAgIFtz ZWxmIF9zd2l0Y2hUb0RyYXdpbmdBcmVhVHlwZUlmTmVjZXNzYXJ5OkRyYXdpbmdBcmVhQmFzZTo6 TGF5ZXJCYWNrZWREcmF3aW5nQXJlYVR5cGVdOwogfQogCiAtICh2b2lkKV9wYWdlRGlkTGVhdmVB Y2NlbGVyYXRlZENvbXBvc2l0aW5nCiB7CiAgICAgLy8gRklYTUU6IHdlIG1heSB3YW50IHRvIGF2 b2lkIGZsaXBwaW5nIGJhY2sgdG8gdGhlIG5vbi1sYXllci1iYWNrZWQgZHJhd2luZyBhcmVhIHVu dGlsIHRoZSBuZXh0IHBhZ2UgbG9hZCwgdG8gYXZvaWQgdGhyYXNoaW5nLgotICAgIFtzZWxmIF9z d2l0Y2hUb0RyYXdpbmdBcmVhVHlwZUlmTmVjZXNzYXJ5OkRyYXdpbmdBcmVhUHJveHk6OkNodW5r ZWRVcGRhdGVEcmF3aW5nQXJlYVR5cGVdOworICAgIFtzZWxmIF9zd2l0Y2hUb0RyYXdpbmdBcmVh VHlwZUlmTmVjZXNzYXJ5OkRyYXdpbmdBcmVhQmFzZTo6Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVh VHlwZV07CiB9CiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogCmRpZmYg LS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eS5j cHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eS5jcHAK aW5kZXggYjM3MGYwNzhlMTBiNmYzYTdjNzMxNmJhMTQ5YWE2NmQ1ZWM2NzUwMi4uYzk1MmU2YWIx ZjZjOGYyYzE1ZTUzYTdkOWVlYzE5MGQyZTgzYzFhMyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVBy b2Nlc3MvQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkuY3BwCisrKyBiL1dlYktpdDIvVUlQ cm9jZXNzL0NodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5LmNwcApAQCAtNDMsNyArNDMsNyBA QCBQYXNzT3duUHRyPENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5PiBDaHVua2VkVXBkYXRl RHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKAogfQogCiBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQ cm94eTo6Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkoUGxhdGZvcm1XZWJWaWV3KiB3ZWJW aWV3KQotICAgIDogRHJhd2luZ0FyZWFQcm94eShDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFUeXBl KQorICAgIDogRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYUJhc2U6OkNodW5rZWRVcGRhdGVE cmF3aW5nQXJlYVR5cGUpCiAgICAgLCBtX2lzV2FpdGluZ0ZvckRpZFNldEZyYW1lTm90aWZpY2F0 aW9uKGZhbHNlKQogICAgICwgbV9pc1Zpc2libGUodHJ1ZSkKICAgICAsIG1fZm9yY2VSZXBhaW50 V2hlblJlc3VtaW5nUGFpbnRpbmcoZmFsc2UpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vz cy9EcmF3aW5nQXJlYVByb3h5LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHkuY3BwCmluZGV4IGU0NjFmOTAwZWJjMGM1YjdjY2ZiZTgzNWI3MGVkZWE1MTQ1NzViZTIuLmVj NGE0ZmJjOWViNmM0YWVkZTRlYmE0NjdlMWVhMjZjMmQ2NGMwZTAgMTAwNjQ0Ci0tLSBhL1dlYktp dDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNz L0RyYXdpbmdBcmVhUHJveHkuY3BwCkBAIC0yNyw4ICsyNyw4IEBACiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi1EcmF3aW5nQXJlYVByb3h5OjpEcmF3aW5nQXJlYVByb3h5KFR5cGUgdHlwZSkKLSAg ICA6IERyYXdpbmdBcmVhQmFzZSh0eXBlLCBuZXh0RHJhd2luZ0FyZWFJRCgpKQorRHJhd2luZ0Fy ZWFQcm94eTo6RHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYUJhc2U6OlR5cGUgdHlwZSkKKyAg ICA6IG1faW5mbyh0eXBlLCBuZXh0RHJhd2luZ0FyZWFJRCgpKQogewogfQogCkBAIC0zNiw5ICsz Niw5IEBAIERyYXdpbmdBcmVhUHJveHk6On5EcmF3aW5nQXJlYVByb3h5KCkKIHsKIH0KIAotRHJh d2luZ0FyZWFQcm94eTo6RHJhd2luZ0FyZWFJRCBEcmF3aW5nQXJlYVByb3h5OjpuZXh0RHJhd2lu Z0FyZWFJRCgpCitEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSUQgRHJhd2luZ0FyZWFQcm94 eTo6bmV4dERyYXdpbmdBcmVhSUQoKQogewotICAgIHN0YXRpYyBEcmF3aW5nQXJlYUlEIG5leHRJ RCA9IDE7CisgICAgc3RhdGljIERyYXdpbmdBcmVhQmFzZTo6RHJhd2luZ0FyZWFJRCBuZXh0SUQg PSAxOwogICAgIHJldHVybiArK25leHRJRDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oIGIvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eS5oCmluZGV4IDY3MDhkY2ZmZDhiNzk1YTFjNGZhNDJiYWIxMWM0Yzg5MDBhZTBmZTQuLmE3 YjU2OWZmYzQyYzExODJhMGZlZmVmMjIwMTUzM2ViY2UyZTRlNGYgMTAwNjQ0Ci0tLSBhL1dlYktp dDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9E cmF3aW5nQXJlYVByb3h5LmgKQEAgLTQzLDkgKzQzLDkgQEAgdHlwZWRlZiBIREMgUGxhdGZvcm1E cmF3aW5nQ29udGV4dDsKIHR5cGVkZWYgUVBhaW50ZXIqIFBsYXRmb3JtRHJhd2luZ0NvbnRleHQ7 CiAjZW5kaWYKIAotY2xhc3MgRHJhd2luZ0FyZWFQcm94eSA6IHB1YmxpYyBEcmF3aW5nQXJlYUJh c2UgeworY2xhc3MgRHJhd2luZ0FyZWFQcm94eSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIERyYXdp bmdBcmVhSUQgbmV4dERyYXdpbmdBcmVhSUQoKTsKKyAgICBzdGF0aWMgRHJhd2luZ0FyZWFCYXNl OjpEcmF3aW5nQXJlYUlEIG5leHREcmF3aW5nQXJlYUlEKCk7CiAKICAgICB2aXJ0dWFsIH5EcmF3 aW5nQXJlYVByb3h5KCk7CiAKQEAgLTYzLDggKzYzLDEyIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgZGV0YWNoQ29tcG9zaXRpbmdDb250ZXh0KCkgPSAwOwogI2VuZGlmCiAKKyAgICBjb25z dCBEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSW5mbyBpbmZvKCkgY29uc3QgeyByZXR1cm4g bV9pbmZvOyB9CisKIHByb3RlY3RlZDoKLSAgICBEcmF3aW5nQXJlYVByb3h5KFR5cGUpOworICAg IGV4cGxpY2l0IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0FyZWFCYXNlOjpUeXBlKTsKKworICAg IERyYXdpbmdBcmVhQmFzZTo6RHJhd2luZ0FyZWFJbmZvIG1faW5mbzsKICAgICBXZWJDb3JlOjpJ bnRTaXplIG1fc2l6ZTsKIH07CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0xheWVy QmFja2VkRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXllckJhY2tl ZERyYXdpbmdBcmVhUHJveHkuY3BwCmluZGV4IDQxMWVmM2ZlOGNmY2ZjNTI3OTE1OTEyMjdmYTZl YWM4ZDJiNmI4NzMuLjEwOWM1YzM4YjU0NzljNTkxNjAyNDI0NjU4YjM0NGU1NzllNTkzNTYgMTAw NjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eS5j cHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5LmNw cApAQCAtNDQsNyArNDQsNyBAQCBQYXNzT3duUHRyPExheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94 eT4gTGF5ZXJCYWNrZWREcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUoUGxhdAogfQogCiBMYXllckJh Y2tlZERyYXdpbmdBcmVhUHJveHk6OkxheWVyQmFja2VkRHJhd2luZ0FyZWFQcm94eShQbGF0Zm9y bVdlYlZpZXcqIHdlYlZpZXcpCi0gICAgOiBEcmF3aW5nQXJlYVByb3h5KExheWVyQmFja2VkRHJh d2luZ0FyZWFUeXBlKQorICAgIDogRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJlYUJhc2U6Okxh eWVyQmFja2VkRHJhd2luZ0FyZWFUeXBlKQogICAgICwgbV9pc1dhaXRpbmdGb3JEaWRTZXRGcmFt ZU5vdGlmaWNhdGlvbihmYWxzZSkKICAgICAsIG1faXNWaXNpYmxlKHRydWUpCiAgICAgLCBtX3dl YlZpZXcod2ViVmlldykKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0No dW5rZWRVcGRhdGVEcmF3aW5nQXJlYS5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9D aHVua2VkVXBkYXRlRHJhd2luZ0FyZWEuY3BwCmluZGV4IGQyODM0YmZkZDRkMzdlYzE1ZTljYjc5 YjcyOTVkYmQ1MmMxYWE1YWUuLmMxMWNiNDhhNzRjNTEwMDdhMzJhMTA1OTIwMTIzMzQ0NzQ1MDEz ZGQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0NodW5rZWRVcGRhdGVE cmF3aW5nQXJlYS5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ2h1bmtlZFVw ZGF0ZURyYXdpbmdBcmVhLmNwcApAQCAtMzcsOCArMzcsOCBAQCB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLUNodW5rZWRVcGRhdGVEcmF3aW5nQXJlYTo6 Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhKERyYXdpbmdBcmVhSUQgaWRlbnRpZmllciwgV2ViUGFn ZSogd2ViUGFnZSkKLSAgICA6IERyYXdpbmdBcmVhKENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVR5 cGUsIGlkZW50aWZpZXIsIHdlYlBhZ2UpCitDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWE6OkNodW5r ZWRVcGRhdGVEcmF3aW5nQXJlYShEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSUQgaWRlbnRp ZmllciwgV2ViUGFnZSogd2ViUGFnZSkKKyAgICA6IERyYXdpbmdBcmVhKERyYXdpbmdBcmVhQmFz ZTo6Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhVHlwZSwgaWRlbnRpZmllciwgd2ViUGFnZSkKICAg ICAsIG1faXNXYWl0aW5nRm9yVXBkYXRlKGZhbHNlKQogICAgICwgbV9wYWludGluZ0lzU3VzcGVu ZGVkKGZhbHNlKQogICAgICwgbV9kaXNwbGF5VGltZXIoV2ViUHJvY2Vzczo6c2hhcmVkKCkucnVu TG9vcCgpLCB0aGlzLCAmQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhOjpkaXNwbGF5KQpAQCAtMTg4 LDcgKzE4OCw3IEBAIHZvaWQgQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhOjpkaWRVcGRhdGUoKQog CiB2b2lkIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQ Qzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6OkFy Z3VtZW50RGVjb2RlciogYXJndW1lbnRzKQogewotICAgIERyYXdpbmdBcmVhSUQgdGFyZ2V0RHJh d2luZ0FyZWFJRDsKKyAgICBEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSUQgdGFyZ2V0RHJh d2luZ0FyZWFJRDsKICAgICBpZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKENvcmVJUEM6Ok91dCh0YXJn ZXREcmF3aW5nQXJlYUlEKSkpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhLmggYi9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWEuaAppbmRleCA3Njcx OThmMjU3M2ZlMDM4ZDVmMmQ2ZTlmZGFjYTlkMzZiMjIyNWFhLi5hZDM5ZDI4NjQxYzgzYTBmZjQx ODgzYjZiMDhiOTI0NjgwMmY1ZDczIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWEuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWEuaApAQCAtMzYsNyArMzYsNyBAQCBjbGFz cyBVcGRhdGVDaHVuazsKIAogY2xhc3MgQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhIDogcHVibGlj IERyYXdpbmdBcmVhIHsKIHB1YmxpYzoKLSAgICBDaHVua2VkVXBkYXRlRHJhd2luZ0FyZWEoRHJh d2luZ0FyZWFJRCBpZGVudGlmaWVyLCBXZWJQYWdlKik7CisgICAgQ2h1bmtlZFVwZGF0ZURyYXdp bmdBcmVhKERyYXdpbmdBcmVhQmFzZTo6RHJhd2luZ0FyZWFJRCBpZGVudGlmaWVyLCBXZWJQYWdl Kik7CiAgICAgdmlydHVhbCB+Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhKCk7CiAKICAgICB2aXJ0 dWFsIHZvaWQgaW52YWxpZGF0ZVdpbmRvdyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0LCBi b29sIGltbWVkaWF0ZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9E cmF3aW5nQXJlYS5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5j cHAKaW5kZXggMGY5YjZhZTA5MDJmNDkwNzg5ZGZiNTA5MzczYWY0MmFjNDRlNjVmYS4uYTU2Y2Vk Zjk5YTgzOGRlZGQ0NTYwMjg5N2UyY2Q5MGIyMWQyODJkZiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL0RyYXdpbmdBcmVhLmNwcApAQCAtMzcsMjIgKzM3LDIyIEBACiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCi1QYXNzUmVmUHRyPERyYXdpbmdBcmVhPiBEcmF3aW5nQXJlYTo6Y3JlYXRl KFR5cGUgdHlwZSwgRHJhd2luZ0FyZWFJRCBpZGVudGlmaWVyLCBXZWJQYWdlKiB3ZWJQYWdlKQor UGFzc1JlZlB0cjxEcmF3aW5nQXJlYT4gRHJhd2luZ0FyZWE6OmNyZWF0ZShEcmF3aW5nQXJlYUJh c2U6OlR5cGUgdHlwZSwgRHJhd2luZ0FyZWFCYXNlOjpEcmF3aW5nQXJlYUlEIGlkZW50aWZpZXIs IFdlYlBhZ2UqIHdlYlBhZ2UpCiB7CiAgICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgICAgIGNhc2Ug Tm9uZToKKyAgICAgICAgY2FzZSBEcmF3aW5nQXJlYUJhc2U6Ok5vbmU6CiAgICAgICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgIGNhc2Ug Q2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhVHlwZToKKyAgICAgICAgY2FzZSBEcmF3aW5nQXJlYUJh c2U6OkNodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVR5cGU6CiAgICAgICAgICAgICByZXR1cm4gYWRv cHRSZWYobmV3IENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYShpZGVudGlmaWVyLCB3ZWJQYWdlKSk7 CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpICYmIFBMQVRGT1JNKE1BQykKLSAg ICAgICAgY2FzZSBMYXllckJhY2tlZERyYXdpbmdBcmVhVHlwZToKKyAgICAgICAgY2FzZSBEcmF3 aW5nQXJlYUJhc2U6OkxheWVyQmFja2VkRHJhd2luZ0FyZWFUeXBlOgogICAgICAgICAgICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBMYXllckJhY2tlZERyYXdpbmdBcmVhKGlkZW50aWZpZXIsIHdlYlBh Z2UpKTsKICNlbmRpZgogI2lmIEVOQUJMRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgICAgICBj YXNlIFRpbGVkRHJhd2luZ0FyZWFUeXBlOgorICAgICAgICBjYXNlIERyYXdpbmdBcmVhQmFzZTo6 VGlsZWREcmF3aW5nQXJlYVR5cGU6CiAgICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFRp bGVkRHJhd2luZ0FyZWEoaWRlbnRpZmllciwgd2ViUGFnZSkpOwogI2VuZGlmCiAgICAgfQpAQCAt NjAsOCArNjAsOCBAQCBQYXNzUmVmUHRyPERyYXdpbmdBcmVhPiBEcmF3aW5nQXJlYTo6Y3JlYXRl KFR5cGUgdHlwZSwgRHJhd2luZ0FyZWFJRCBpZGVudGlmaWVyLAogICAgIHJldHVybiAwOwogfQog Ci1EcmF3aW5nQXJlYTo6RHJhd2luZ0FyZWEoVHlwZSB0eXBlLCBEcmF3aW5nQXJlYUlEIGlkZW50 aWZpZXIsIFdlYlBhZ2UqIHdlYlBhZ2UpCi0gICAgOiBEcmF3aW5nQXJlYUJhc2UodHlwZSwgaWRl bnRpZmllcikKK0RyYXdpbmdBcmVhOjpEcmF3aW5nQXJlYShEcmF3aW5nQXJlYUJhc2U6OlR5cGUg dHlwZSwgRHJhd2luZ0FyZWFCYXNlOjpEcmF3aW5nQXJlYUlEIGlkZW50aWZpZXIsIFdlYlBhZ2Uq IHdlYlBhZ2UpCisgICAgOiBtX2luZm8odHlwZSwgaWRlbnRpZmllcikKICAgICAsIG1fd2ViUGFn ZSh3ZWJQYWdlKQogewogfQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RHJhd2luZ0FyZWEuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgK aW5kZXggMTE0OWQwMTEzZThiMGM2YjEzZDFjNjU4YmE0OWQ0NzBjZTBmNWZmMS4uZjk4OWI4ZGEy ODM3NjliYmYyNThlMDI4OTIzNWE2NjI4NjgwODMzMSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9EcmF3aW5nQXJlYS5oCkBAIC00MSwxMCArNDEsMTAgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAKIGNsYXNzIFdlYlBhZ2U7CiAKLWNsYXNzIERyYXdpbmdBcmVhIDogcHVibGljIERyYXdpbmdB cmVhQmFzZSwgcHVibGljIFJlZkNvdW50ZWQ8RHJhd2luZ0FyZWE+IHsKK2NsYXNzIERyYXdpbmdB cmVhIDogcHVibGljIFJlZkNvdW50ZWQ8RHJhd2luZ0FyZWE+IHsKIHB1YmxpYzoKICAgICAvLyBG SVhNRTogSXQgbWlnaHQgbWFrZSBzZW5zZSB0byBtb3ZlIHRoaXMgY3JlYXRlIGZ1bmN0aW9uIGlu dG8gYSBmYWN0b3J5IHN0eWxlIGNsYXNzLiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxEcmF3aW5n QXJlYT4gY3JlYXRlKFR5cGUsIERyYXdpbmdBcmVhSUQsIFdlYlBhZ2UqKTsKKyAgICBzdGF0aWMg UGFzc1JlZlB0cjxEcmF3aW5nQXJlYT4gY3JlYXRlKERyYXdpbmdBcmVhQmFzZTo6VHlwZSwgRHJh d2luZ0FyZWFCYXNlOjpEcmF3aW5nQXJlYUlELCBXZWJQYWdlKik7CiAKICAgICB2aXJ0dWFsIH5E cmF3aW5nQXJlYSgpOwogICAgIApAQCAtNjYsOSArNjYsMTIgQEAgcHVibGljOgogCiAgICAgdmly dHVhbCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBD OjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciopID0gMDsKIAorICAgIGNvbnN0 IERyYXdpbmdBcmVhQmFzZTo6RHJhd2luZ0FyZWFJbmZvJiBpbmZvKCkgY29uc3QgeyByZXR1cm4g bV9pbmZvOyB9CisKIHByb3RlY3RlZDoKLSAgICBEcmF3aW5nQXJlYShUeXBlLCBEcmF3aW5nQXJl YUlELCBXZWJQYWdlKik7CisgICAgRHJhd2luZ0FyZWEoRHJhd2luZ0FyZWFCYXNlOjpUeXBlLCBE cmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSUQsIFdlYlBhZ2UqKTsKIAorICAgIERyYXdpbmdB cmVhQmFzZTo6RHJhd2luZ0FyZWFJbmZvIG1faW5mbzsKICAgICBXZWJQYWdlKiBtX3dlYlBhZ2U7 CiB9OwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllckJhY2tl ZERyYXdpbmdBcmVhLmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyQmFja2Vk RHJhd2luZ0FyZWEuY3BwCmluZGV4IDk2ZDdjOTMzMTBlZGU1MTM3YTY4ZThmZmEzYTY1NmNkN2Yx ZmI3YTkuLjdmYjQ4YTdiM2IwYzFkM2E5NTIzOGIxMTAyMmRlMDkxMTg5N2ViNzAgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyQmFja2VkRHJhd2luZ0FyZWEuY3Bw CisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyQmFja2VkRHJhd2luZ0FyZWEu Y3BwCkBAIC0zOSw4ICszOSw4IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAotTGF5ZXJCYWNrZWREcmF3aW5nQXJlYTo6TGF5ZXJCYWNrZWREcmF3aW5n QXJlYShEcmF3aW5nQXJlYUlEIGlkZW50aWZpZXIsIFdlYlBhZ2UqIHdlYlBhZ2UpCi0gICAgOiBE cmF3aW5nQXJlYShMYXllckJhY2tlZERyYXdpbmdBcmVhVHlwZSwgaWRlbnRpZmllciwgd2ViUGFn ZSkKK0xheWVyQmFja2VkRHJhd2luZ0FyZWE6OkxheWVyQmFja2VkRHJhd2luZ0FyZWEoRHJhd2lu Z0FyZWFCYXNlOjpEcmF3aW5nQXJlYUlEIGlkZW50aWZpZXIsIFdlYlBhZ2UqIHdlYlBhZ2UpCisg ICAgOiBEcmF3aW5nQXJlYShEcmF3aW5nQXJlYUJhc2U6OkxheWVyQmFja2VkRHJhd2luZ0FyZWFU eXBlLCBpZGVudGlmaWVyLCB3ZWJQYWdlKQogICAgICwgbV9zeW5jVGltZXIoV2ViUHJvY2Vzczo6 c2hhcmVkKCkucnVuTG9vcCgpLCB0aGlzLCAmTGF5ZXJCYWNrZWREcmF3aW5nQXJlYTo6c3luY0Nv bXBvc2l0aW5nTGF5ZXJzKQogICAgICwgbV9hdHRhY2hlZChmYWxzZSkKICAgICAsIG1fc2hvdWxk UGFpbnQodHJ1ZSkKQEAgLTE0Myw3ICsxNDMsNyBAQCB2b2lkIExheWVyQmFja2VkRHJhd2luZ0Fy ZWE6OmRpZFVwZGF0ZSgpCiAKIHZvaWQgTGF5ZXJCYWNrZWREcmF3aW5nQXJlYTo6ZGlkUmVjZWl2 ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdl SUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKQogewotICAgIERyYXdpbmdB cmVhSUQgdGFyZ2V0RHJhd2luZ0FyZWFJRDsKKyAgICBEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdB cmVhSUQgdGFyZ2V0RHJhd2luZ0FyZWFJRDsKICAgICBpZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKENv cmVJUEM6Ok91dCh0YXJnZXREcmF3aW5nQXJlYUlEKSkpCiAgICAgICAgIHJldHVybjsKIApkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJCYWNrZWREcmF3aW5nQXJl YS5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJCYWNrZWREcmF3aW5nQXJlYS5o CmluZGV4IDQ3MDVlNzEzZDhkYjYzNjQ4YzRmMjQ5OWM1ZDAyN2NlMzI3ZmNhYzIuLjhhNGVlMDIw ZWUxOWE0YzJiMzI5ODViNjhmYWFkOTllMWJkNTE2NzAgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0xheWVyQmFja2VkRHJhd2luZ0FyZWEuaAorKysgYi9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9MYXllckJhY2tlZERyYXdpbmdBcmVhLmgKQEAgLTUyLDcgKzUyLDcg QEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIExheWVyQmFja2VkRHJhd2luZ0FyZWEgOiBw dWJsaWMgRHJhd2luZ0FyZWEsIHByaXZhdGUgV2ViQ29yZTo6R3JhcGhpY3NMYXllckNsaWVudCB7 CiBwdWJsaWM6Ci0gICAgTGF5ZXJCYWNrZWREcmF3aW5nQXJlYShEcmF3aW5nQXJlYUlEIGlkZW50 aWZpZXIsIFdlYlBhZ2UqKTsKKyAgICBMYXllckJhY2tlZERyYXdpbmdBcmVhKERyYXdpbmdBcmVh QmFzZTo6RHJhd2luZ0FyZWFJRCBpZGVudGlmaWVyLCBXZWJQYWdlKik7CiAgICAgdmlydHVhbCB+ TGF5ZXJCYWNrZWREcmF3aW5nQXJlYSgpOwogCiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGVX aW5kb3coY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCwgYm9vbCBpbW1lZGlhdGUpOwpkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWREcmF3aW5nQXJlYS5jcHAg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9UaWxlZERyYXdpbmdBcmVhLmNwcAppbmRleCAx OWE3MTk4ZTI0YmYxMzhkMjY3NjdjM2FiMWI2ZjUyNTJhZWU3YmViLi43M2YyNmJlNzIwNTFhOTkw N2ZkYjAwOGU3MzQwZjhhZmM4NDVlMjkxIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9UaWxlZERyYXdpbmdBcmVhLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9UaWxlZERyYXdpbmdBcmVhLmNwcApAQCAtNDIsOCArNDIsOCBAQCB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVRpbGVkRHJhd2luZ0FyZWE6OlRp bGVkRHJhd2luZ0FyZWEoRHJhd2luZ0FyZWFJRCBpZGVudGlmaWVyLCBXZWJQYWdlKiB3ZWJQYWdl KQotICAgIDogRHJhd2luZ0FyZWEoVGlsZWREcmF3aW5nQXJlYVR5cGUsIGlkZW50aWZpZXIsIHdl YlBhZ2UpCitUaWxlZERyYXdpbmdBcmVhOjpUaWxlZERyYXdpbmdBcmVhKERyYXdpbmdBcmVhQmFz ZTo6RHJhd2luZ0FyZWFJRCBpZGVudGlmaWVyLCBXZWJQYWdlKiB3ZWJQYWdlKQorICAgIDogRHJh d2luZ0FyZWEoRHJhd2luZ0FyZWFCYXNlOjpUaWxlZERyYXdpbmdBcmVhVHlwZSwgaWRlbnRpZmll ciwgd2ViUGFnZSkKICAgICAsIG1faXNXYWl0aW5nRm9yVXBkYXRlKGZhbHNlKQogICAgICwgbV9z aG91bGRQYWludCh0cnVlKQogICAgICwgbV9kaXNwbGF5VGltZXIoV2ViUHJvY2Vzczo6c2hhcmVk KCkucnVuTG9vcCgpLCB0aGlzLCAmVGlsZWREcmF3aW5nQXJlYTo6ZGlzcGxheSkKZGlmZiAtLWdp dCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuaCBiL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1RpbGVkRHJhd2luZ0FyZWEuaAppbmRleCBjZTIwYjY1ZWJh OGVlNzEyODg2YWY0NmM2OGYyMzRkYTIzZmY3NmU5Li41OGRiODQzNjc0ZjM5ODAxZDM2Y2I2MmQ1 OThlN2IwMGU5M2IxMGY2IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9U aWxlZERyYXdpbmdBcmVhLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGlsZWRE cmF3aW5nQXJlYS5oCkBAIC00MCw3ICs0MCw3IEBAIGNsYXNzIFVwZGF0ZUNodW5rOwogCiBjbGFz cyBUaWxlZERyYXdpbmdBcmVhIDogcHVibGljIERyYXdpbmdBcmVhIHsKIHB1YmxpYzoKLSAgICBU aWxlZERyYXdpbmdBcmVhKERyYXdpbmdBcmVhSUQgaWRlbnRpZmllciwgV2ViUGFnZSopOworICAg IFRpbGVkRHJhd2luZ0FyZWEoRHJhd2luZ0FyZWFCYXNlOjpEcmF3aW5nQXJlYUlEIGlkZW50aWZp ZXIsIFdlYlBhZ2UqKTsKICAgICB2aXJ0dWFsIH5UaWxlZERyYXdpbmdBcmVhKCk7CiAKICAgICB2 aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZVdpbmRvdyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0 LCBib29sIGltbWVkaWF0ZSk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmlu ZGV4IDA3ZDFkNDJjNjViYWQwYjIxYThhZjAwZTYxMWFjNjZkNTU2MTNjMzEuLjNkNmExNWIwNzNm NDU2ZGE0MjM4ZGFmMmU4YWUyZTJjN2EyNWVmNDcgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCkBAIC0yNzIsMTQgKzI3MiwxNCBAQCB2b2lkIFdlYlBhZ2U6OmNoYW5nZUFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIGxheWVyKQog ICAgIAogICAgIC8vIFRlbGwgdGhlIFVJIHByb2Nlc3MgdGhhdCBhY2NlbGVyYXRlZCBjb21wb3Np dGluZyBjaGFuZ2VkLiBJdCBtYXkgcmVzcG9uZCBieSBjaGFuZ2luZwogICAgIC8vIGRyYXdpbmcg YXJlYSB0eXBlcy4KLSAgICBEcmF3aW5nQXJlYTo6RHJhd2luZ0FyZWFJbmZvIG5ld0RyYXdpbmdB cmVhSW5mbzsKKyAgICBEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSW5mbyBuZXdEcmF3aW5n QXJlYUluZm87CiAKICAgICBpZiAoIVdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+ c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQ2hhbmdlQWNjZWxlcmF0ZWRDb21w b3NpdGluZyhjb21wb3NpdGluZyksIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENoYW5nZUFj Y2VsZXJhdGVkQ29tcG9zaXRpbmc6OlJlcGx5KG5ld0RyYXdpbmdBcmVhSW5mbyksIG1fcGFnZUlE KSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIGlmIChuZXdEcmF3aW5nQXJlYUluZm8udHlw ZSAhPSBkcmF3aW5nQXJlYSgpLT5pbmZvKCkudHlwZSkgewogICAgICAgICBtX2RyYXdpbmdBcmVh ID0gMDsKLSAgICAgICAgaWYgKG5ld0RyYXdpbmdBcmVhSW5mby50eXBlICE9IERyYXdpbmdBcmVh OjpOb25lKSB7CisgICAgICAgIGlmIChuZXdEcmF3aW5nQXJlYUluZm8udHlwZSAhPSBEcmF3aW5n QXJlYUJhc2U6Ok5vbmUpIHsKICAgICAgICAgICAgIG1fZHJhd2luZ0FyZWEgPSBEcmF3aW5nQXJl YTo6Y3JlYXRlKG5ld0RyYXdpbmdBcmVhSW5mby50eXBlLCBuZXdEcmF3aW5nQXJlYUluZm8uaWQs IHRoaXMpOwogICAgICAgICAgICAgbV9kcmF3aW5nQXJlYS0+c2V0TmVlZHNEaXNwbGF5KEludFJl Y3QoSW50UG9pbnQoMCwgMCksIG1fdmlld1NpemUpKTsKICAgICAgICAgfQo=