139006 2014-11-22 15:11:00 -0800 Extend WKRenderObject and WKRenderLayer with some more useful data 2019-01-29 01:15:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser fred.wang mitz sam simon.fraser oldest_to_newest 1050734 0 simon.fraser 2014-11-22 15:11:00 -0800 Extend WKRenderObject and WKRenderLayer with some more useful data 1050735 1 242123 simon.fraser 2014-11-22 15:12:42 -0800 Created attachment 242123 Patch 1050737 2 242123 sam 2014-11-22 15:38:56 -0800 Comment on attachment 242123 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242123&action=review > Source/WebKit2/Shared/API/c/WKRenderObject.cpp:51 > + return 0; nullptr? 1050804 3 simon.fraser 2014-11-23 22:04:34 -0800 http://trac.webkit.org/changeset/176509 242123 2014-11-22 15:12:42 -0800 2019-01-29 01:15:32 -0800 Patch bug-139006-20141122151300.patch text/plain 22742 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYyYzU0YTdlMjRmYWE0 ZTg5ZTUxYWM1ZWY3Y2RjMmQ3ZGYzNGZkMi4uOTUwZGExZTA2NjkyZWVhY2E1ZGMwZmU2N2E1NzJj MzFkZWFlOTMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTExLTIyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4dGVuZCBXS1Jl bmRlck9iamVjdCBhbmQgV0tSZW5kZXJMYXllciB3aXRoIHNvbWUgbW9yZSB1c2VmdWwgZGF0YQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5MDA2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3J0IFdl YkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6YmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKSBj b25zdC4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorCiAyMDE0LTExLTE5ICBBZGEgQ2hh biAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHdheSB0byBtdXRlIGFuIEF1 ZGlvQ29udGV4dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA2MGQ5MDY1NzViNTgzMjQwYjc3MDJlNzc5MTIzNjA3 ZjNjYjBkNzVlLi4wYjU0N2M4MTA4NzljZWUxYjliYjFkMWRmZmJmNWJhZWM0YjIxY2M3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTQtMTEtMjIgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgRXh0ZW5kIFdLUmVuZGVyT2JqZWN0IGFuZCBX S1JlbmRlckxheWVyIHdpdGggc29tZSBtb3JlIHVzZWZ1bCBkYXRhCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkwMDYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEltcGxlbWVudCBXS1JlbmRl ckxheWVyR2V0QmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUsCisgICAgICAgIFdLUmVuZGVyT2Jq ZWN0Q29weVRleHRTbmlwcGV0IGFuZCBXS1JlbmRlck9iamVjdEdldFRleHRMZW5ndGggZm9yIGlt cHJvdmVkCisgICAgICAgIFJlbmRlckxheWVyIGFuZCBSZW5kZXJUcmVlIGRpc3BsYXkgaW4gY2xp ZW50cyBvZiB0aGUgQyBTUEkuICAgICAgICAKKworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS1Jl bmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdLUmVuZGVyTGF5ZXJHZXRCYWNraW5nU3RvcmVNZW1v cnlFc3RpbWF0ZSk6CisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLUmVuZGVyTGF5ZXIuaDoKKyAg ICAgICAgKiBTaGFyZWQvQVBJL2MvV0tSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV0tSZW5k ZXJPYmplY3RDb3B5VGV4dFNuaXBwZXQpOgorICAgICAgICAoV0tSZW5kZXJPYmplY3RHZXRUZXh0 TGVuZ3RoKToKKyAgICAgICAgKiBTaGFyZWQvQVBJL2MvV0tSZW5kZXJPYmplY3QuaDoKKyAgICAg ICAgKiBTaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaDoKKyAgICAgICAgKFdlYktpdDo6VXNlck1l c3NhZ2VFbmNvZGVyOjpiYXNlRW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6VXNlck1lc3NhZ2VE ZWNvZGVyOjpiYXNlRGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUmVuZGVyTGF5ZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJSZW5kZXJMYXllcjo6Y3JlYXRlKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVuZGVyTGF5ZXI6OldlYlJlbmRlckxheWVyKToKKyAgICAgICAgKiBTaGFyZWQv V2ViUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVuZGVyTGF5ZXI6OmJhY2tp bmdTdG9yZU1lbW9yeUVzdGltYXRlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViUmVuZGVyT2JqZWN0 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVuZGVyT2JqZWN0OjpjcmVhdGUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJSZW5kZXJPYmplY3Q6OldlYlJlbmRlck9iamVjdCk6CisgICAgICAgICog U2hhcmVkL1dlYlJlbmRlck9iamVjdC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJSZW5kZXJPYmpl Y3Q6OnRleHRTbmlwcGV0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVuZGVyT2JqZWN0Ojp0ZXh0 TGVuZ3RoKToKKwogMjAxNC0xMS0yMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIGFsaWdubWVudCBjb2RlIGZyb20gY2FjaGUgY29kZXJzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCmluZGV4IDUzYTk0YzJmOTE3ZjhlZGE4M2YwZDg5MWQxYTVkMTVhMDMzM2Q1 ODMuLjZiMTMxYjY3YWFhZDYzNTY5YWE5YzBiYWFkOGVmODFiZjRjMWZkNDQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCkBAIC0xODQzLDYgKzE4NDMsNyBAQCBfX1pOSzdXZWJDb3JlMThQbGF0Zm9ybVBh c3RlYm9hcmQxMWNoYW5nZUNvdW50RXYKIF9fWk5LN1dlYkNvcmUxOFJlbmRlckxheWVyQmFja2lu ZzExY29udGVudHNCb3hFdgogX19aTks3V2ViQ29yZTE4UmVuZGVyTGF5ZXJCYWNraW5nMTJ0aWxl ZEJhY2tpbmdFdgogX19aTks3V2ViQ29yZTE4UmVuZGVyTGF5ZXJCYWNraW5nMjBjb21wb3NpdGlu Z0xheWVyVHlwZUV2CitfX1pOSzdXZWJDb3JlMThSZW5kZXJMYXllckJhY2tpbmcyNmJhY2tpbmdT dG9yZU1lbW9yeUVzdGltYXRlRXYKIF9fWk5LN1dlYkNvcmUxOUFuaW1hdGlvbkNvbnRyb2xsZXIx MWlzU3VzcGVuZGVkRXYKIF9fWk5LN1dlYkNvcmUxOUFuaW1hdGlvbkNvbnRyb2xsZXIyNG51bWJl ck9mQWN0aXZlQW5pbWF0aW9uc0VQTlNfOERvY3VtZW50RQogX19aTks3V2ViQ29yZTE5QW5pbWF0 aW9uQ29udHJvbGxlcjMzYWxsb3dzTmV3QW5pbWF0aW9uc1doaWxlU3VzcGVuZGVkRXYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1JlbmRlckxheWVyLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1JlbmRlckxheWVyLmNwcAppbmRleCA4MmNmOTU5 YmU2ZTA1ZGM1MmEzOTNiNzk2MDhmMTA1MTVlY2Y5MDAxLi4wMTQwN2FmMjJlZjkyZjJiZWVkYjRm YTBiZWM4ZjJmNTQwZjQwYzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJ L2MvV0tSZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dL UmVuZGVyTGF5ZXIuY3BwCkBAIC0xMTAsNiArMTEwLDExIEBAIFdLQ29tcG9zaXRpbmdMYXllclR5 cGUgV0tSZW5kZXJMYXllckdldENvbXBvc2l0aW5nTGF5ZXJUeXBlKFdLUmVuZGVyTGF5ZXJSZWYg cmVuCiAgICAgcmV0dXJuIGtXS0NvbXBvc2l0aW5nTGF5ZXJUeXBlTm9uZTsKIH0KIAorV0tfRVhQ T1JUIGRvdWJsZSBXS1JlbmRlckxheWVyR2V0QmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoV0tS ZW5kZXJMYXllclJlZiByZW5kZXJMYXllclJlZikKK3sKKyAgICByZXR1cm4gdG9JbXBsKHJlbmRl ckxheWVyUmVmKS0+YmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKTsKK30KKwogV0tBcnJheVJl ZiBXS1JlbmRlckxheWVyR2V0TmVnYXRpdmVaT3JkZXJMaXN0KFdLUmVuZGVyTGF5ZXJSZWYgcmVu ZGVyTGF5ZXJSZWYpCiB7CiAgICAgcmV0dXJuIHRvQVBJKHRvSW1wbChyZW5kZXJMYXllclJlZikt Pm5lZ2F0aXZlWk9yZGVyTGlzdCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BUEkvYy9XS1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tS ZW5kZXJMYXllci5oCmluZGV4IGFjNTU5NWZkODg0YzU3ZTkyYmZhMmFiYjBjODFmNzE3ZGVlMDI1 MDcuLmQyODQzOTY0MmZmYTYxOWQ0YmEwMWQ0OGY5NjA2MTY4NDRhNDdmOTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1JlbmRlckxheWVyLmgKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLUmVuZGVyTGF5ZXIuaApAQCAtNjIsNiArNjIsNyBAQCBl bnVtIFdLQ29tcG9zaXRpbmdMYXllclR5cGUgewogdHlwZWRlZiBlbnVtIFdLQ29tcG9zaXRpbmdM YXllclR5cGUgV0tDb21wb3NpdGluZ0xheWVyVHlwZTsKIAogV0tfRVhQT1JUIFdLQ29tcG9zaXRp bmdMYXllclR5cGUgV0tSZW5kZXJMYXllckdldENvbXBvc2l0aW5nTGF5ZXJUeXBlKFdLUmVuZGVy TGF5ZXJSZWYgcmVuZGVyTGF5ZXIpOworV0tfRVhQT1JUIGRvdWJsZSBXS1JlbmRlckxheWVyR2V0 QmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoV0tSZW5kZXJMYXllclJlZiByZW5kZXJMYXllcik7 CiAKIFdLX0VYUE9SVCBXS0FycmF5UmVmIFdLUmVuZGVyTGF5ZXJHZXROZWdhdGl2ZVpPcmRlckxp c3QoV0tSZW5kZXJMYXllclJlZiByZW5kZXJMYXllcik7CiBXS19FWFBPUlQgV0tBcnJheVJlZiBX S1JlbmRlckxheWVyR2V0Tm9ybWFsRmxvd0xpc3QoV0tSZW5kZXJMYXllclJlZiByZW5kZXJMYXll cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tSZW5kZXJPYmpl Y3QuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLUmVuZGVyT2JqZWN0LmNwcApp bmRleCA4NjRiNmU3YWQ5OGRlNzUxZmFjZTVkZjZkZWM0YjZhYjUxYWJlM2I2Li4zZTQzYjYxZTFm NGI1ZjQ5OTAzMTk4OGE1NzNhOTgxYTYwZTY1ZjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvQVBJL2MvV0tSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9BUEkvYy9XS1JlbmRlck9iamVjdC5jcHAKQEAgLTQyLDYgKzQyLDIwIEBAIFdLU3RyaW5n UmVmIFdLUmVuZGVyT2JqZWN0Q29weU5hbWUoV0tSZW5kZXJPYmplY3RSZWYgcmVuZGVyT2JqZWN0 UmVmKQogICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwocmVuZGVyT2JqZWN0UmVmKS0+bmFt ZSgpKTsKIH0KIAorV0tTdHJpbmdSZWYgV0tSZW5kZXJPYmplY3RDb3B5VGV4dFNuaXBwZXQoV0tS ZW5kZXJPYmplY3RSZWYgcmVuZGVyT2JqZWN0UmVmKQoreworICAgIFdlYlJlbmRlck9iamVjdCog cmVuZGVyT2JqZWN0ID0gdG9JbXBsKHJlbmRlck9iamVjdFJlZik7CisgICAgaWYgKCFyZW5kZXJP YmplY3QtPnRleHRTbmlwcGV0KCkuaXNOdWxsKCkpCisgICAgICAgIHJldHVybiB0b0NvcGllZEFQ SShyZW5kZXJPYmplY3QtPnRleHRTbmlwcGV0KCkpOworCisgICAgcmV0dXJuIDA7Cit9CisKK3Vu c2lnbmVkIFdLUmVuZGVyT2JqZWN0R2V0VGV4dExlbmd0aChXS1JlbmRlck9iamVjdFJlZiByZW5k ZXJPYmplY3RSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChyZW5kZXJPYmplY3RSZWYpLT50ZXh0 TGVuZ3RoKCk7Cit9CisKIFdLU3RyaW5nUmVmIFdLUmVuZGVyT2JqZWN0Q29weUVsZW1lbnRUYWdO YW1lKFdLUmVuZGVyT2JqZWN0UmVmIHJlbmRlck9iamVjdFJlZikKIHsKICAgICBXZWJSZW5kZXJP YmplY3QqIHJlbmRlck9iamVjdCA9IHRvSW1wbChyZW5kZXJPYmplY3RSZWYpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tSZW5kZXJPYmplY3QuaAppbmRleCA1MWQzNzEyNjg4ZjU4 MWFhN2FlOGUyZTRlYzg0NjU3MzJkYWVlZjRkLi4wOTczYWU4Y2YxYmMxMTBiNGVkZjQ2MzA0ODVh ZWZhZjJjYTgxZGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tS ZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tSZW5kZXJP YmplY3QuaApAQCAtMzYsNyArMzYsOCBAQCBleHRlcm4gIkMiIHsKIFdLX0VYUE9SVCBXS1R5cGVJ RCBXS1JlbmRlck9iamVjdEdldFR5cGVJRCgpOwogCiBXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tS ZW5kZXJPYmplY3RDb3B5TmFtZShXS1JlbmRlck9iamVjdFJlZiByZW5kZXJPYmplY3QpOwotCitX S19FWFBPUlQgV0tTdHJpbmdSZWYgV0tSZW5kZXJPYmplY3RDb3B5VGV4dFNuaXBwZXQoV0tSZW5k ZXJPYmplY3RSZWYgcmVuZGVyT2JqZWN0KTsKK1dLX0VYUE9SVCB1bnNpZ25lZCBXS1JlbmRlck9i amVjdEdldFRleHRMZW5ndGgoV0tSZW5kZXJPYmplY3RSZWYgcmVuZGVyT2JqZWN0KTsKIFdLX0VY UE9SVCBXS1N0cmluZ1JlZiBXS1JlbmRlck9iamVjdENvcHlFbGVtZW50VGFnTmFtZShXS1JlbmRl ck9iamVjdFJlZiByZW5kZXJPYmplY3QpOwogV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLUmVuZGVy T2JqZWN0Q29weUVsZW1lbnRJRChXS1JlbmRlck9iamVjdFJlZiByZW5kZXJPYmplY3QpOwogV0tf RVhQT1JUIFdLQXJyYXlSZWYgV0tSZW5kZXJPYmplY3RHZXRFbGVtZW50Q2xhc3NOYW1lcyhXS1Jl bmRlck9iamVjdFJlZiByZW5kZXJPYmplY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv U2hhcmVkL1VzZXJNZXNzYWdlQ29kZXJzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlck1l c3NhZ2VDb2RlcnMuaAppbmRleCAwMWI2NzYyNGMxYzJiMTk4OWUwNmZlNGI3Y2EwZmVjYzgxYzli NTZlLi40NzcyMmFjNWUyZmQxYTExNmY0ODE5NmJlOWVlNTBlNDlkN2VmYTdjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaApAQCAtMTU1LDYgKzE1NSw3IEBAIHB1 YmxpYzoKICAgICAgICAgICAgIGVuY29kZXIgPDwgcmVuZGVyTGF5ZXItPmlzQ2xpcHBlZCgpOwog ICAgICAgICAgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDx1aW50MzJfdD4ocmVuZGVyTGF5ZXIt PmNvbXBvc2l0aW5nTGF5ZXJUeXBlKCkpOwogICAgICAgICAgICAgZW5jb2RlciA8PCByZW5kZXJM YXllci0+YWJzb2x1dGVCb3VuZGluZ0JveCgpOworICAgICAgICAgICAgZW5jb2RlciA8PCByZW5k ZXJMYXllci0+YmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKTsKICAgICAgICAgICAgIGVuY29k ZXIgPDwgT3duZXIoY29kZXIsIHJlbmRlckxheWVyLT5uZWdhdGl2ZVpPcmRlckxpc3QoKSk7CiAg ICAgICAgICAgICBlbmNvZGVyIDw8IE93bmVyKGNvZGVyLCByZW5kZXJMYXllci0+bm9ybWFsRmxv d0xpc3QoKSk7CiAgICAgICAgICAgICBlbmNvZGVyIDw8IE93bmVyKGNvZGVyLCByZW5kZXJMYXll ci0+cG9zaXRpdmVaT3JkZXJMaXN0KCkpOwpAQCAtMTY4LDYgKzE2OSw4IEBAIHB1YmxpYzoKICAg ICAgICAgICAgIGVuY29kZXIgPDwgT3duZXIoY29kZXIsIHJlbmRlck9iamVjdC0+ZWxlbWVudENs YXNzTmFtZXMoKSk7CiAgICAgICAgICAgICBlbmNvZGVyIDw8IHJlbmRlck9iamVjdC0+YWJzb2x1 dGVQb3NpdGlvbigpOwogICAgICAgICAgICAgZW5jb2RlciA8PCByZW5kZXJPYmplY3QtPmZyYW1l UmVjdCgpOworICAgICAgICAgICAgZW5jb2RlciA8PCByZW5kZXJPYmplY3QtPnRleHRTbmlwcGV0 KCk7CisgICAgICAgICAgICBlbmNvZGVyIDw8IHJlbmRlck9iamVjdC0+dGV4dExlbmd0aCgpOwog ICAgICAgICAgICAgZW5jb2RlciA8PCBPd25lcihjb2RlciwgcmVuZGVyT2JqZWN0LT5jaGlsZHJl bigpKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CkBAIC0zOTAsNiArMzkz LDcgQEAgcHVibGljOgogICAgICAgICAgICAgYm9vbCBpc0NsaXBwZWQ7CiAgICAgICAgICAgICB1 aW50MzJfdCBjb21wb3NpdGluZ0xheWVyVHlwZUFzVUludDMyOwogICAgICAgICAgICAgV2ViQ29y ZTo6SW50UmVjdCBhYnNvbHV0ZUJvdW5kaW5nQm94OworICAgICAgICAgICAgZG91YmxlIGJhY2tp bmdTdG9yZU1lbW9yeUVzdGltYXRlOwogICAgICAgICAgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBu ZWdhdGl2ZVpPcmRlckxpc3Q7CiAgICAgICAgICAgICBSZWZQdHI8QVBJOjpPYmplY3Q+IG5vcm1h bEZsb3dMaXN0OwogICAgICAgICAgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBwb3NpdGl2ZVpPcmRl ckxpc3Q7CkBAIC00MDksNiArNDEzLDggQEAgcHVibGljOgogICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUoYWJzb2x1dGVCb3VuZGlu Z0JveCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShiYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSkpCisgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgT3duZXIgbmVnYXRpdmVaT3JkZXJMaXN0Q29k ZXIoY29kZXIsIG5lZ2F0aXZlWk9yZGVyTGlzdCk7CiAgICAgICAgICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKG5lZ2F0aXZlWk9yZGVyTGlzdENvZGVyKSkKICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CkBAIC00MTksMTQgKzQyNSwxNiBAQCBwdWJsaWM6CiAgICAgICAgICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHBvc2l0aXZlWk9yZGVyTGlzdENvZGVyKSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICBjb2Rlci5tX3Jvb3QgPSBXZWJSZW5kZXJMYXllcjo6 Y3JlYXRlKHN0YXRpY19wb2ludGVyX2Nhc3Q8V2ViUmVuZGVyT2JqZWN0PihyZW5kZXJlciksIGlz UmVmbGVjdGlvbiwgaXNDbGlwcGluZywgaXNDbGlwcGVkLCBzdGF0aWNfY2FzdDxXZWJSZW5kZXJM YXllcjo6Q29tcG9zaXRpbmdMYXllclR5cGU+KGNvbXBvc2l0aW5nTGF5ZXJUeXBlQXNVSW50MzIp LAotICAgICAgICAgICAgICAgIGFic29sdXRlQm91bmRpbmdCb3gsIHN0YXRpY19wb2ludGVyX2Nh c3Q8QVBJOjpBcnJheT4obmVnYXRpdmVaT3JkZXJMaXN0KSwgc3RhdGljX3BvaW50ZXJfY2FzdDxB UEk6OkFycmF5Pihub3JtYWxGbG93TGlzdCksCisgICAgICAgICAgICAgICAgYWJzb2x1dGVCb3Vu ZGluZ0JveCwgYmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUsIHN0YXRpY19wb2ludGVyX2Nhc3Q8 QVBJOjpBcnJheT4obmVnYXRpdmVaT3JkZXJMaXN0KSwgc3RhdGljX3BvaW50ZXJfY2FzdDxBUEk6 OkFycmF5Pihub3JtYWxGbG93TGlzdCksCiAgICAgICAgICAgICAgICAgc3RhdGljX3BvaW50ZXJf Y2FzdDxBUEk6OkFycmF5Pihwb3NpdGl2ZVpPcmRlckxpc3QpKTsKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CiAgICAgICAgIGNhc2UgQVBJOjpPYmplY3Q6OlR5cGU6OlJlbmRlck9iamVj dDogewogICAgICAgICAgICAgU3RyaW5nIG5hbWU7CisgICAgICAgICAgICBTdHJpbmcgdGV4dFNu aXBwZXQ7CiAgICAgICAgICAgICBTdHJpbmcgZWxlbWVudFRhZ05hbWU7CiAgICAgICAgICAgICBT dHJpbmcgZWxlbWVudElEOworICAgICAgICAgICAgdW5zaWduZWQgdGV4dExlbmd0aDsKICAgICAg ICAgICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gZWxlbWVudENsYXNzTmFtZXM7CiAgICAgICAgICAg ICBXZWJDb3JlOjpJbnRQb2ludCBhYnNvbHV0ZVBvc2l0aW9uOwogICAgICAgICAgICAgV2ViQ29y ZTo6SW50UmVjdCBmcmFtZVJlY3Q7CkBAIC00NDUsMTIgKzQ1MywxNiBAQCBwdWJsaWM6CiAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29k ZShmcmFtZVJlY3QpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAg IGlmICghZGVjb2Rlci5kZWNvZGUodGV4dFNuaXBwZXQpKQorICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUodGV4dExlbmd0aCkpCisg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgT3duZXIgbWVzc2FnZUNv ZGVyKGNvZGVyLCBjaGlsZHJlbik7CiAgICAgICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKG1l c3NhZ2VDb2RlcikpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAg aWYgKGNoaWxkcmVuICYmIGNoaWxkcmVuLT50eXBlKCkgIT0gQVBJOjpPYmplY3Q6OlR5cGU6OkFy cmF5KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIGNvZGVyLm1f cm9vdCA9IFdlYlJlbmRlck9iamVjdDo6Y3JlYXRlKG5hbWUsIGVsZW1lbnRUYWdOYW1lLCBlbGVt ZW50SUQsIHN0YXRpY19wb2ludGVyX2Nhc3Q8QVBJOjpBcnJheT4oZWxlbWVudENsYXNzTmFtZXMp LCBhYnNvbHV0ZVBvc2l0aW9uLCBmcmFtZVJlY3QsIHN0YXRpY19wb2ludGVyX2Nhc3Q8QVBJOjpB cnJheT4oY2hpbGRyZW4pKTsKKyAgICAgICAgICAgIGNvZGVyLm1fcm9vdCA9IFdlYlJlbmRlck9i amVjdDo6Y3JlYXRlKG5hbWUsIGVsZW1lbnRUYWdOYW1lLCBlbGVtZW50SUQsIHN0YXRpY19wb2lu dGVyX2Nhc3Q8QVBJOjpBcnJheT4oZWxlbWVudENsYXNzTmFtZXMpLCBhYnNvbHV0ZVBvc2l0aW9u LCBmcmFtZVJlY3QsIHRleHRTbmlwcGV0LCB0ZXh0TGVuZ3RoLCBzdGF0aWNfcG9pbnRlcl9jYXN0 PEFQSTo6QXJyYXk+KGNoaWxkcmVuKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQog ICAgICAgICBjYXNlIEFQSTo6T2JqZWN0OjpUeXBlOjpVUkw6IHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJSZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDE4NDk0YjAyNzdmNjM4ODg2N2YyYjM3YTRlM2E5 ODU5MWFlNjQwOGQuLmUwYWI4OTNmODBjMGUyNWM1ZTY0N2E2OGQzYjc1MDM2ZjI4NDJmNjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJSZW5kZXJMYXllci5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlJlbmRlckxheWVyLmNwcApAQCAtNjIsOSArNjIsOSBA QCBQYXNzUmVmUHRyPFdlYlJlbmRlckxheWVyPiBXZWJSZW5kZXJMYXllcjo6Y3JlYXRlKFdlYlBh Z2UqIHBhZ2UpCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJSZW5kZXJMYXllcihyb290TGF5 ZXIpKTsKIH0KIAotUGFzc1JlZlB0cjxXZWJSZW5kZXJMYXllcj4gV2ViUmVuZGVyTGF5ZXI6OmNy ZWF0ZShQYXNzUmVmUHRyPFdlYlJlbmRlck9iamVjdD4gcmVuZGVyZXIsIGJvb2wgaXNSZWZsZWN0 aW9uLCBib29sIGlzQ2xpcHBpbmcsIGJvb2wgaXNDbGlwcGVkLCBDb21wb3NpdGluZ0xheWVyVHlw ZSB0eXBlLCBXZWJDb3JlOjpJbnRSZWN0IGFic29sdXRlQm91bmRpbmdCb3gsIFBhc3NSZWZQdHI8 QVBJOjpBcnJheT4gbmVnYXRpdmVaT3JkZXJMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IG5v cm1hbEZsb3dMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IHBvc2l0aXZlWk9yZGVyTGlzdCkK K1Bhc3NSZWZQdHI8V2ViUmVuZGVyTGF5ZXI+IFdlYlJlbmRlckxheWVyOjpjcmVhdGUoUGFzc1Jl ZlB0cjxXZWJSZW5kZXJPYmplY3Q+IHJlbmRlcmVyLCBib29sIGlzUmVmbGVjdGlvbiwgYm9vbCBp c0NsaXBwaW5nLCBib29sIGlzQ2xpcHBlZCwgQ29tcG9zaXRpbmdMYXllclR5cGUgdHlwZSwgV2Vi Q29yZTo6SW50UmVjdCBhYnNvbHV0ZUJvdW5kaW5nQm94LCBkb3VibGUgYmFja2luZ1N0b3JlTWVt b3J5RXN0aW1hdGUsIFBhc3NSZWZQdHI8QVBJOjpBcnJheT4gbmVnYXRpdmVaT3JkZXJMaXN0LCBQ YXNzUmVmUHRyPEFQSTo6QXJyYXk+IG5vcm1hbEZsb3dMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJy YXk+IHBvc2l0aXZlWk9yZGVyTGlzdCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlJl bmRlckxheWVyKHJlbmRlcmVyLCBpc1JlZmxlY3Rpb24sIGlzQ2xpcHBpbmcsIGlzQ2xpcHBlZCwg dHlwZSwgYWJzb2x1dGVCb3VuZGluZ0JveCwgbmVnYXRpdmVaT3JkZXJMaXN0LCBub3JtYWxGbG93 TGlzdCwgcG9zaXRpdmVaT3JkZXJMaXN0KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJS ZW5kZXJMYXllcihyZW5kZXJlciwgaXNSZWZsZWN0aW9uLCBpc0NsaXBwaW5nLCBpc0NsaXBwZWQs IHR5cGUsIGFic29sdXRlQm91bmRpbmdCb3gsIGJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlLCBu ZWdhdGl2ZVpPcmRlckxpc3QsIG5vcm1hbEZsb3dMaXN0LCBwb3NpdGl2ZVpPcmRlckxpc3QpKTsK IH0KIAogUGFzc1JlZlB0cjxBUEk6OkFycmF5PiBXZWJSZW5kZXJMYXllcjo6Y3JlYXRlQXJyYXlG cm9tTGF5ZXJMaXN0KFZlY3RvcjxSZW5kZXJMYXllcio+KiBsaXN0KQpAQCAtMTA0LDEwICsxMDQs MTMgQEAgV2ViUmVuZGVyTGF5ZXI6OldlYlJlbmRlckxheWVyKFJlbmRlckxheWVyKiBsYXllcikK ICAgICAgICAgICAgIG1fY29tcG9zaXRpbmdMYXllclR5cGUgPSBDb250YWluZXI7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQorCisgICAgICAgIG1fYmFja2luZ1N0b3JlTWVtb3J5RXN0 aW1hdGUgPSBiYWNraW5nLT5iYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpOwogICAgIH0gZWxz ZSB7CiAgICAgICAgIG1faXNDbGlwcGluZyA9IGZhbHNlOwogICAgICAgICBtX2lzQ2xpcHBlZCA9 IGZhbHNlOwogICAgICAgICBtX2NvbXBvc2l0aW5nTGF5ZXJUeXBlID0gTm9uZTsKKyAgICAgICAg bV9iYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSA9IDA7CiAgICAgfQogCiAgICAgbV9hYnNvbHV0 ZUJvdW5kaW5nQm94ID0gbGF5ZXItPmFic29sdXRlQm91bmRpbmdCb3goKTsKQEAgLTExNywxMyAr MTIwLDE0IEBAIFdlYlJlbmRlckxheWVyOjpXZWJSZW5kZXJMYXllcihSZW5kZXJMYXllciogbGF5 ZXIpCiAgICAgbV9wb3NpdGl2ZVpPcmRlckxpc3QgPSBjcmVhdGVBcnJheUZyb21MYXllckxpc3Qo bGF5ZXItPnBvc1pPcmRlckxpc3QoKSk7CiB9CiAKLVdlYlJlbmRlckxheWVyOjpXZWJSZW5kZXJM YXllcihQYXNzUmVmUHRyPFdlYlJlbmRlck9iamVjdD4gcmVuZGVyZXIsIGJvb2wgaXNSZWZsZWN0 aW9uLCBib29sIGlzQ2xpcHBpbmcsIGJvb2wgaXNDbGlwcGVkLCBDb21wb3NpdGluZ0xheWVyVHlw ZSB0eXBlLCBXZWJDb3JlOjpJbnRSZWN0IGFic29sdXRlQm91bmRpbmdCb3gsIFBhc3NSZWZQdHI8 QVBJOjpBcnJheT4gbmVnYXRpdmVaT3JkZXJMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IG5v cm1hbEZsb3dMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IHBvc2l0aXZlWk9yZGVyTGlzdCkK K1dlYlJlbmRlckxheWVyOjpXZWJSZW5kZXJMYXllcihQYXNzUmVmUHRyPFdlYlJlbmRlck9iamVj dD4gcmVuZGVyZXIsIGJvb2wgaXNSZWZsZWN0aW9uLCBib29sIGlzQ2xpcHBpbmcsIGJvb2wgaXND bGlwcGVkLCBDb21wb3NpdGluZ0xheWVyVHlwZSB0eXBlLCBXZWJDb3JlOjpJbnRSZWN0IGFic29s dXRlQm91bmRpbmdCb3gsIGRvdWJsZSBiYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSwgUGFzc1Jl ZlB0cjxBUEk6OkFycmF5PiBuZWdhdGl2ZVpPcmRlckxpc3QsIFBhc3NSZWZQdHI8QVBJOjpBcnJh eT4gbm9ybWFsRmxvd0xpc3QsIFBhc3NSZWZQdHI8QVBJOjpBcnJheT4gcG9zaXRpdmVaT3JkZXJM aXN0KQogICAgIDogbV9yZW5kZXJlcihyZW5kZXJlcikKICAgICAsIG1faXNSZWZsZWN0aW9uKGlz UmVmbGVjdGlvbikKICAgICAsIG1faXNDbGlwcGluZyhpc0NsaXBwaW5nKQogICAgICwgbV9pc0Ns aXBwZWQoaXNDbGlwcGVkKQogICAgICwgbV9jb21wb3NpdGluZ0xheWVyVHlwZSh0eXBlKQogICAg ICwgbV9hYnNvbHV0ZUJvdW5kaW5nQm94KGFic29sdXRlQm91bmRpbmdCb3gpCisgICAgLCBtX2Jh Y2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKGJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlKQogICAg ICwgbV9uZWdhdGl2ZVpPcmRlckxpc3QobmVnYXRpdmVaT3JkZXJMaXN0KQogICAgICwgbV9ub3Jt YWxGbG93TGlzdChub3JtYWxGbG93TGlzdCkKICAgICAsIG1fcG9zaXRpdmVaT3JkZXJMaXN0KHBv c2l0aXZlWk9yZGVyTGlzdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJS ZW5kZXJMYXllci5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlJlbmRlckxheWVyLmgKaW5k ZXggYjRmZmU5YTgzNjgyMzhjYzk4MTA5NTNlOGZhNjIwNDI3YmM5OTcwMS4uMDI2YTcwOGYxYTM5 M2MxNzUxNDVjZjU0YWEyNjk2M2FiYzJiYzY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlJlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlJl bmRlckxheWVyLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogICAgIGVudW0gQ29tcG9zaXRp bmdMYXllclR5cGUgeyBOb25lLCBOb3JtYWwsIFRpbGVkLCBNZWRpYSwgQ29udGFpbmVyIH07CiAK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJSZW5kZXJMYXllcj4gY3JlYXRlKFdlYlBhZ2UqKTsK LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJSZW5kZXJMYXllcj4gY3JlYXRlKFBhc3NSZWZQdHI8 V2ViUmVuZGVyT2JqZWN0PiByZW5kZXJlciwgYm9vbCBpc1JlZmxlY3Rpb24sIGJvb2wgaXNDbGlw cGluZywgYm9vbCBpc0NsaXBwZWQsIENvbXBvc2l0aW5nTGF5ZXJUeXBlLCBXZWJDb3JlOjpJbnRS ZWN0IGFic29sdXRlQm91bmRpbmdCb3gsIFBhc3NSZWZQdHI8QVBJOjpBcnJheT4gbmVnYXRpdmVa T3JkZXJMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IG5vcm1hbEZsb3dMaXN0LCBQYXNzUmVm UHRyPEFQSTo6QXJyYXk+IHBvc2l0aXZlWk9yZGVyTGlzdCk7CisgICAgc3RhdGljIFBhc3NSZWZQ dHI8V2ViUmVuZGVyTGF5ZXI+IGNyZWF0ZShQYXNzUmVmUHRyPFdlYlJlbmRlck9iamVjdD4gcmVu ZGVyZXIsIGJvb2wgaXNSZWZsZWN0aW9uLCBib29sIGlzQ2xpcHBpbmcsIGJvb2wgaXNDbGlwcGVk LCBDb21wb3NpdGluZ0xheWVyVHlwZSwgV2ViQ29yZTo6SW50UmVjdCBhYnNvbHV0ZUJvdW5kaW5n Qm94LCBkb3VibGUgYmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUsIFBhc3NSZWZQdHI8QVBJOjpB cnJheT4gbmVnYXRpdmVaT3JkZXJMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IG5vcm1hbEZs b3dMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IHBvc2l0aXZlWk9yZGVyTGlzdCk7CiAKICAg ICBBUEk6OkFycmF5KiBuZWdhdGl2ZVpPcmRlckxpc3QoKSBjb25zdCB7IHJldHVybiBtX25lZ2F0 aXZlWk9yZGVyTGlzdC5nZXQoKTsgfQogICAgIEFQSTo6QXJyYXkqIG5vcm1hbEZsb3dMaXN0KCkg Y29uc3QgeyByZXR1cm4gbV9ub3JtYWxGbG93TGlzdC5nZXQoKTsgfQpAQCAtNTMsMTAgKzUzLDEx IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ2xpcHBlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNDbGlw cGVkOyB9CiAgICAgQ29tcG9zaXRpbmdMYXllclR5cGUgY29tcG9zaXRpbmdMYXllclR5cGUoKSBj b25zdCB7IHJldHVybiBtX2NvbXBvc2l0aW5nTGF5ZXJUeXBlOyB9IAogICAgIFdlYkNvcmU6Oklu dFJlY3QgYWJzb2x1dGVCb3VuZGluZ0JveCgpIGNvbnN0IHsgcmV0dXJuIG1fYWJzb2x1dGVCb3Vu ZGluZ0JveDsgfQorICAgIGRvdWJsZSBiYWNraW5nU3RvcmVNZW1vcnlFc3RpbWF0ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fYmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGU7IH0KIAogcHJpdmF0ZToKICAg ICBleHBsaWNpdCBXZWJSZW5kZXJMYXllcihXZWJDb3JlOjpSZW5kZXJMYXllciopOwotICAgIFdl YlJlbmRlckxheWVyKFBhc3NSZWZQdHI8V2ViUmVuZGVyT2JqZWN0PiByZW5kZXJlciwgYm9vbCBp c1JlZmxlY3Rpb24sIGJvb2wgaXNDbGlwcGluZywgYm9vbCBpc0NsaXBwZWQsIENvbXBvc2l0aW5n TGF5ZXJUeXBlLCBXZWJDb3JlOjpJbnRSZWN0IGFic29sdXRlQm91bmRpbmdCb3gsIFBhc3NSZWZQ dHI8QVBJOjpBcnJheT4gbmVnYXRpdmVaT3JkZXJMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+ IG5vcm1hbEZsb3dMaXN0LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IHBvc2l0aXZlWk9yZGVyTGlz dCk7CisgICAgV2ViUmVuZGVyTGF5ZXIoUGFzc1JlZlB0cjxXZWJSZW5kZXJPYmplY3Q+IHJlbmRl cmVyLCBib29sIGlzUmVmbGVjdGlvbiwgYm9vbCBpc0NsaXBwaW5nLCBib29sIGlzQ2xpcHBlZCwg Q29tcG9zaXRpbmdMYXllclR5cGUsIFdlYkNvcmU6OkludFJlY3QgYWJzb2x1dGVCb3VuZGluZ0Jv eCwgZG91YmxlIGJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlLCBQYXNzUmVmUHRyPEFQSTo6QXJy YXk+IG5lZ2F0aXZlWk9yZGVyTGlzdCwgUGFzc1JlZlB0cjxBUEk6OkFycmF5PiBub3JtYWxGbG93 TGlzdCwgUGFzc1JlZlB0cjxBUEk6OkFycmF5PiBwb3NpdGl2ZVpPcmRlckxpc3QpOwogCiAgICAg c3RhdGljIFBhc3NSZWZQdHI8QVBJOjpBcnJheT4gY3JlYXRlQXJyYXlGcm9tTGF5ZXJMaXN0KFZl Y3RvcjxXZWJDb3JlOjpSZW5kZXJMYXllcio+Kik7CiAKQEAgLTY2LDYgKzY3LDcgQEAgcHJpdmF0 ZToKICAgICBib29sIG1faXNDbGlwcGVkOwogICAgIENvbXBvc2l0aW5nTGF5ZXJUeXBlIG1fY29t cG9zaXRpbmdMYXllclR5cGU7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBtX2Fic29sdXRlQm91bmRp bmdCb3g7CisgICAgZG91YmxlIG1fYmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGU7CiAKICAgICBS ZWZQdHI8QVBJOjpBcnJheT4gbV9uZWdhdGl2ZVpPcmRlckxpc3Q7CiAgICAgUmVmUHRyPEFQSTo6 QXJyYXk+IG1fbm9ybWFsRmxvd0xpc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJSZW5kZXJP YmplY3QuY3BwCmluZGV4IGZhOGQ1OTVhNWVjM2NhM2FmMDZiZDkwZTQ4NGE3ZGMwNTAxYTAxZGUu LjBhNGJhNGMxMTViZGY3NDY0ZDM2MmNhMzU5ODRmZGYwYTU3NjEzMTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJSZW5kZXJPYmplY3QuY3BwCkBAIC00NiwyNiArNDYsMjcgQEAgUGFzc1Jl ZlB0cjxXZWJSZW5kZXJPYmplY3Q+IFdlYlJlbmRlck9iamVjdDo6Y3JlYXRlKFdlYlBhZ2UqIHBh Z2UpCiB7CiAgICAgRnJhbWUqIG1haW5GcmFtZSA9IHBhZ2UtPm1haW5GcmFtZSgpOwogICAgIGlm ICghbWFpbkZyYW1lKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAKICAgICBpZiAoIW1haW5GcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkuaGFzSFRNTFZpZXcoKSkK LSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgUmVuZGVy VmlldyogY29udGVudFJlbmRlcmVyID0gbWFpbkZyYW1lLT5jb250ZW50UmVuZGVyZXIoKTsKICAg ICBpZiAoIWNvbnRlbnRSZW5kZXJlcikKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJSZW5kZXJPYmplY3QoY29u dGVudFJlbmRlcmVyLCB0cnVlKSk7CiB9CiAKLVBhc3NSZWZQdHI8V2ViUmVuZGVyT2JqZWN0PiBX ZWJSZW5kZXJPYmplY3Q6OmNyZWF0ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYg ZWxlbWVudFRhZ05hbWUsIGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBQYXNzUmVmUHRyPEFQSTo6 QXJyYXk+IGVsZW1lbnRDbGFzc05hbWVzLCBXZWJDb3JlOjpJbnRQb2ludCBhYnNvbHV0ZVBvc2l0 aW9uLCBXZWJDb3JlOjpJbnRSZWN0IGZyYW1lUmVjdCwgUGFzc1JlZlB0cjxBUEk6OkFycmF5PiBj aGlsZHJlbikKK1Bhc3NSZWZQdHI8V2ViUmVuZGVyT2JqZWN0PiBXZWJSZW5kZXJPYmplY3Q6OmNy ZWF0ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgZWxlbWVudFRhZ05hbWUsIGNv bnN0IFN0cmluZyYgZWxlbWVudElELCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IGVsZW1lbnRDbGFz c05hbWVzLCBXZWJDb3JlOjpJbnRQb2ludCBhYnNvbHV0ZVBvc2l0aW9uLCBXZWJDb3JlOjpJbnRS ZWN0IGZyYW1lUmVjdCwgY29uc3QgU3RyaW5nJiB0ZXh0U25pcHBldCwgdW5zaWduZWQgdGV4dExl bmd0aCwgUGFzc1JlZlB0cjxBUEk6OkFycmF5PiBjaGlsZHJlbikKIHsKLSAgICByZXR1cm4gYWRv cHRSZWYobmV3IFdlYlJlbmRlck9iamVjdChuYW1lLCBlbGVtZW50VGFnTmFtZSwgZWxlbWVudElE LCBlbGVtZW50Q2xhc3NOYW1lcywgYWJzb2x1dGVQb3NpdGlvbiwgZnJhbWVSZWN0LCBjaGlsZHJl bikpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViUmVuZGVyT2JqZWN0KG5hbWUsIGVsZW1l bnRUYWdOYW1lLCBlbGVtZW50SUQsIGVsZW1lbnRDbGFzc05hbWVzLCBhYnNvbHV0ZVBvc2l0aW9u LCBmcmFtZVJlY3QsIHRleHRTbmlwcGV0LCB0ZXh0TGVuZ3RoLCBjaGlsZHJlbikpOwogfQogCiBX ZWJSZW5kZXJPYmplY3Q6OldlYlJlbmRlck9iamVjdChSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBi b29sIHNob3VsZEluY2x1ZGVEZXNjZW5kYW50cykKIHsKICAgICBtX25hbWUgPSByZW5kZXJlci0+ cmVuZGVyTmFtZSgpOworICAgIG1fdGV4dExlbmd0aCA9IDA7CiAKICAgICBpZiAoTm9kZSogbm9k ZSA9IHJlbmRlcmVyLT5ub2RlKCkpIHsKICAgICAgICAgaWYgKGlzPEVsZW1lbnQ+KCpub2RlKSkg ewpAQCAtODMsNiArODQsMTcgQEAgV2ViUmVuZGVyT2JqZWN0OjpXZWJSZW5kZXJPYmplY3QoUmVu ZGVyT2JqZWN0KiByZW5kZXJlciwgYm9vbCBzaG91bGRJbmNsdWRlRGVzY2UKICAgICAgICAgICAg ICAgICBtX2VsZW1lbnRDbGFzc05hbWVzID0gQVBJOjpBcnJheTo6Y3JlYXRlKFdURjo6bW92ZShj bGFzc05hbWVzKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBpZiAobm9k ZS0+aXNUZXh0Tm9kZSgpKSB7CisgICAgICAgICAgICBTdHJpbmcgdmFsdWUgPSBub2RlLT5ub2Rl VmFsdWUoKTsKKyAgICAgICAgICAgIG1fdGV4dExlbmd0aCA9IHZhbHVlLmxlbmd0aCgpOworCisg ICAgICAgICAgICBjb25zdCBpbnQgbWF4U25pcHBldExlbmd0aCA9IDQwOworICAgICAgICAgICAg aWYgKHZhbHVlLmxlbmd0aCgpID4gbWF4U25pcHBldExlbmd0aCkKKyAgICAgICAgICAgICAgICBt X3RleHRTbmlwcGV0ID0gdmFsdWUuc3Vic3RyaW5nKDAsIG1heFNuaXBwZXRMZW5ndGgpOworICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIG1fdGV4dFNuaXBwZXQgPSB2YWx1ZTsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIC8vIEZJWE1FOiBicm9rZW4gd2l0aCB0cmFuc2Zvcm1zCkBA IC0xMjIsMTQgKzEzNCwxNiBAQCBXZWJSZW5kZXJPYmplY3Q6OldlYlJlbmRlck9iamVjdChSZW5k ZXJPYmplY3QqIHJlbmRlcmVyLCBib29sIHNob3VsZEluY2x1ZGVEZXNjZQogICAgIG1fY2hpbGRy ZW4gPSBBUEk6OkFycmF5OjpjcmVhdGUoV1RGOjptb3ZlKGNoaWxkcmVuKSk7CiB9CiAKLVdlYlJl bmRlck9iamVjdDo6V2ViUmVuZGVyT2JqZWN0KGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3Ry aW5nJiBlbGVtZW50VGFnTmFtZSwgY29uc3QgU3RyaW5nJiBlbGVtZW50SUQsIFBhc3NSZWZQdHI8 QVBJOjpBcnJheT4gZWxlbWVudENsYXNzTmFtZXMsIFdlYkNvcmU6OkludFBvaW50IGFic29sdXRl UG9zaXRpb24sIFdlYkNvcmU6OkludFJlY3QgZnJhbWVSZWN0LCBQYXNzUmVmUHRyPEFQSTo6QXJy YXk+IGNoaWxkcmVuKQorV2ViUmVuZGVyT2JqZWN0OjpXZWJSZW5kZXJPYmplY3QoY29uc3QgU3Ry aW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGVsZW1lbnRUYWdOYW1lLCBjb25zdCBTdHJpbmcmIGVs ZW1lbnRJRCwgUGFzc1JlZlB0cjxBUEk6OkFycmF5PiBlbGVtZW50Q2xhc3NOYW1lcywgV2ViQ29y ZTo6SW50UG9pbnQgYWJzb2x1dGVQb3NpdGlvbiwgV2ViQ29yZTo6SW50UmVjdCBmcmFtZVJlY3Qs IGNvbnN0IFN0cmluZyYgdGV4dFNuaXBwZXQsIHVuc2lnbmVkIHRleHRMZW5ndGgsIFBhc3NSZWZQ dHI8QVBJOjpBcnJheT4gY2hpbGRyZW4pCiAgICAgOiBtX2NoaWxkcmVuKGNoaWxkcmVuKQogICAg ICwgbV9uYW1lKG5hbWUpCiAgICAgLCBtX2VsZW1lbnRUYWdOYW1lKGVsZW1lbnRUYWdOYW1lKQog ICAgICwgbV9lbGVtZW50SUQoZWxlbWVudElEKQorICAgICwgbV90ZXh0U25pcHBldCh0ZXh0U25p cHBldCkKICAgICAsIG1fZWxlbWVudENsYXNzTmFtZXMoZWxlbWVudENsYXNzTmFtZXMpCiAgICAg LCBtX2Fic29sdXRlUG9zaXRpb24oYWJzb2x1dGVQb3NpdGlvbikKICAgICAsIG1fZnJhbWVSZWN0 KGZyYW1lUmVjdCkKKyAgICAsIG1fdGV4dExlbmd0aCh0ZXh0TGVuZ3RoKQogewogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvV2ViUmVuZGVyT2JqZWN0LmgKaW5kZXggZGViMjA4Nzc5Y2FiYzY4MGRm NGM2OWVhMTMwOGNmMmYwOWJhYTE5Mi4uYWI5NTAzNzFmMjUyNzEyZWEyYjVlYjhjZmU5ZWQ3Y2Ey Y2EzMWI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlJlbmRlck9iamVj dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJSZW5kZXJPYmplY3QuaApAQCAtNTEs MTMgKzUxLDE4IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJSZW5k ZXJPYmplY3QocmVuZGVyZXIsIGZhbHNlKSk7CiAgICAgfQogCi0gICAgc3RhdGljIFBhc3NSZWZQ dHI8V2ViUmVuZGVyT2JqZWN0PiBjcmVhdGUoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJp bmcmIGVsZW1lbnRUYWdOYW1lLCBjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgUGFzc1JlZlB0cjxB UEk6OkFycmF5PiBlbGVtZW50Q2xhc3NOYW1lcywgV2ViQ29yZTo6SW50UG9pbnQgYWJzb2x1dGVQ b3NpdGlvbiwgV2ViQ29yZTo6SW50UmVjdCBmcmFtZVJlY3QsIFBhc3NSZWZQdHI8QVBJOjpBcnJh eT4gY2hpbGRyZW4pOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlJlbmRlck9iamVjdD4gY3Jl YXRlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBlbGVtZW50VGFnTmFtZSwgY29u c3QgU3RyaW5nJiBlbGVtZW50SUQsIFBhc3NSZWZQdHI8QVBJOjpBcnJheT4gZWxlbWVudENsYXNz TmFtZXMsIFdlYkNvcmU6OkludFBvaW50IGFic29sdXRlUG9zaXRpb24sIFdlYkNvcmU6OkludFJl Y3QgZnJhbWVSZWN0LCBjb25zdCBTdHJpbmcmIHRleHRTbmlwcGV0LCB1bnNpZ25lZCB0ZXh0TGVu Z3RoLCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IGNoaWxkcmVuKTsKIAogICAgIHZpcnR1YWwgfldl YlJlbmRlck9iamVjdCgpOwogCiAgICAgQVBJOjpBcnJheSogY2hpbGRyZW4oKSBjb25zdCB7IHJl dHVybiBtX2NoaWxkcmVuLmdldCgpOyB9CiAKICAgICBjb25zdCBTdHJpbmcmIG5hbWUoKSBjb25z dCB7IHJldHVybiBtX25hbWU7IH0KKworICAgIC8vIE9ubHkgbm9uLWVtcHR5IGZvciBSZW5kZXJU ZXh0IG9iamVjdHMuCisgICAgY29uc3QgU3RyaW5nJiB0ZXh0U25pcHBldCgpIGNvbnN0IHsgcmV0 dXJuIG1fdGV4dFNuaXBwZXQ7IH0KKyAgICB1bnNpZ25lZCB0ZXh0TGVuZ3RoKCkgY29uc3QgeyBy ZXR1cm4gbV90ZXh0TGVuZ3RoOyB9CisKICAgICBjb25zdCBTdHJpbmcmIGVsZW1lbnRUYWdOYW1l KCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50VGFnTmFtZTsgfQogICAgIGNvbnN0IFN0cmluZyYg ZWxlbWVudElEKCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50SUQ7IH0KICAgICBBUEk6OkFycmF5 KiBlbGVtZW50Q2xhc3NOYW1lcygpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVudENsYXNzTmFtZXMu Z2V0KCk7IH0KQEAgLTY2LDE2ICs3MSwxOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgV2Vi UmVuZGVyT2JqZWN0KFdlYkNvcmU6OlJlbmRlck9iamVjdCosIGJvb2wgc2hvdWxkSW5jbHVkZURl c2NlbmRhbnRzKTsKLSAgICBXZWJSZW5kZXJPYmplY3QoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25z dCBTdHJpbmcmIGVsZW1lbnRUYWdOYW1lLCBjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgUGFzc1Jl ZlB0cjxBUEk6OkFycmF5PiBlbGVtZW50Q2xhc3NOYW1lcywgV2ViQ29yZTo6SW50UG9pbnQgYWJz b2x1dGVQb3NpdGlvbiwgV2ViQ29yZTo6SW50UmVjdCBmcmFtZVJlY3QsIFBhc3NSZWZQdHI8QVBJ OjpBcnJheT4gY2hpbGRyZW4pOworICAgIFdlYlJlbmRlck9iamVjdChjb25zdCBTdHJpbmcmIG5h bWUsIGNvbnN0IFN0cmluZyYgZWxlbWVudFRhZ05hbWUsIGNvbnN0IFN0cmluZyYgZWxlbWVudElE LCBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+IGVsZW1lbnRDbGFzc05hbWVzLCBXZWJDb3JlOjpJbnRQ b2ludCBhYnNvbHV0ZVBvc2l0aW9uLCBXZWJDb3JlOjpJbnRSZWN0IGZyYW1lUmVjdCwgY29uc3Qg U3RyaW5nJiB0ZXh0U25pcHBldCwgdW5zaWduZWQgdGV4dExlbmd0aCwgUGFzc1JlZlB0cjxBUEk6 OkFycmF5PiBjaGlsZHJlbik7CiAKICAgICBSZWZQdHI8QVBJOjpBcnJheT4gbV9jaGlsZHJlbjsK IAogICAgIFN0cmluZyBtX25hbWU7CiAgICAgU3RyaW5nIG1fZWxlbWVudFRhZ05hbWU7CiAgICAg U3RyaW5nIG1fZWxlbWVudElEOworICAgIFN0cmluZyBtX3RleHRTbmlwcGV0OwogICAgIFJlZlB0 cjxBUEk6OkFycmF5PiBtX2VsZW1lbnRDbGFzc05hbWVzOwogICAgIFdlYkNvcmU6OkludFBvaW50 IG1fYWJzb2x1dGVQb3NpdGlvbjsKICAgICBXZWJDb3JlOjpJbnRSZWN0IG1fZnJhbWVSZWN0Owor ICAgIHVuc2lnbmVkIG1fdGV4dExlbmd0aDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=