124163 2013-11-11 13:07:54 -0800 Add a FrameLoadState object and begin moving loading related members from WebFrameProxy 2013-11-11 21:45:18 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin eflews.bot gyuyoung.kim ossy oldest_to_newest 949425 0 andersca 2013-11-11 13:07:54 -0800 Add a FrameLoadState object and begin moving loading related members from WebFrameProxy 949426 1 216606 andersca 2013-11-11 13:09:42 -0800 Created attachment 216606 Patch 949432 2 216606 eflews.bot 2013-11-11 13:23:14 -0800 Comment on attachment 216606 Patch Attachment 216606 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/21249496 949472 3 andersca 2013-11-11 15:30:28 -0800 Committed r159077: <http://trac.webkit.org/changeset/159077> 949536 4 ossy 2013-11-11 21:45:18 -0800 (In reply to comment #3) > Committed r159077: <http://trac.webkit.org/changeset/159077> and buildfix landed in http://trac.webkit.org/changeset/159083 216606 2013-11-11 13:09:42 -0800 2013-11-11 15:25:48 -0800 Patch bug-124163-20131111130942.patch text/plain 20460 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTlkMWE0MjBkMGM3N2Y5 YzcyMWE1NDk2NjRiZDcxNGQ5YTVmM2JlOS4uODU2YTk1YzQ2MzdlMjE3NjI3MDdkZDJkMTk5YmQz NzFjNDkyNjMxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDEzLTExLTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEgRnJhbWVM b2FkU3RhdGUgb2JqZWN0IGFuZCBiZWdpbiBtb3ZpbmcgbG9hZGluZyByZWxhdGVkIG1lbWJlcnMg ZnJvbSBXZWJGcmFtZVByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjQxNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lLmNwcDoKKyAgICAgICAgKFdLRnJh bWVHZXRGcmFtZUxvYWRTdGF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL0ZyYW1lTG9hZFN0YXRl LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZFN0YXRlOjpGcmFtZUxvYWRT dGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZFN0YXRlOjp+RnJhbWVMb2FkU3RhdGUp OgorICAgICAgICAqIFVJUHJvY2Vzcy9GcmFtZUxvYWRTdGF0ZS5oOiBBZGRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1l UHJveHk6OldlYkZyYW1lUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5Ojpk aWRTdGFydFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lUHJveHk6 OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWQpOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZVByb3h5OjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYktpdDo6 V2ViRnJhbWVQcm94eTo6ZGlkRmluaXNoTG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1l UHJveHk6OmRpZEZhaWxMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6ZGlk U2FtZURvY3VtZW50TmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lUHJveHk6 OnNldFVucmVhY2hhYmxlVVJMKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5o OgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5OjpmcmFtZUxvYWRTdGF0ZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OmxvYWRTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6 OldlYkZyYW1lUHJveHk6OnVybCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OnBy b3Zpc2lvbmFsVVJMKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6dW5yZWFjaGFi bGVVUkwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6YWN0aXZlVVJMKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFN0YXRlQXRQcm9jZXNzRXhp dCk6CisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCisyMDEz LTExLTExICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAg UmVtb3ZlIGJsb2NrIGJhc2VkIEFQSXMgZnJvbSB0aGUgV2ViS2l0MiBDIEFQSQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0MTU3CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lLmNwcAppbmRleCA4NGQ5NWYzMTljMDk3NzIy NTU3ZTBmZGYwOGNiNThlZDljYmNkNzVjLi4xZmI3ZTQ3NzEwYjRmYTM2ZWZjYWY2NTA5YzE3NmQ0 NmQ3NTA3ZWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tG cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWUuY3Bw CkBAIC00NCwxMyArNDQsMTMgQEAgYm9vbCBXS0ZyYW1lSXNNYWluRnJhbWUoV0tGcmFtZVJlZiBm cmFtZVJlZikKIFdLRnJhbWVMb2FkU3RhdGUgV0tGcmFtZUdldEZyYW1lTG9hZFN0YXRlKFdLRnJh bWVSZWYgZnJhbWVSZWYpCiB7CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSB0b0ltcGwoZnJh bWVSZWYpOwotICAgIHN3aXRjaCAoZnJhbWUtPmxvYWRTdGF0ZSgpKSB7Ci0gICAgICAgIGNhc2Ug V2ViRnJhbWVQcm94eTo6TG9hZFN0YXRlUHJvdmlzaW9uYWw6Ci0gICAgICAgICAgICByZXR1cm4g a1dLRnJhbWVMb2FkU3RhdGVQcm92aXNpb25hbDsKLSAgICAgICAgY2FzZSBXZWJGcmFtZVByb3h5 OjpMb2FkU3RhdGVDb21taXR0ZWQ6Ci0gICAgICAgICAgICByZXR1cm4ga1dLRnJhbWVMb2FkU3Rh dGVDb21taXR0ZWQ7Ci0gICAgICAgIGNhc2UgV2ViRnJhbWVQcm94eTo6TG9hZFN0YXRlRmluaXNo ZWQ6Ci0gICAgICAgICAgICByZXR1cm4ga1dLRnJhbWVMb2FkU3RhdGVGaW5pc2hlZDsKKyAgICBz d2l0Y2ggKGZyYW1lLT5mcmFtZUxvYWRTdGF0ZSgpLm1fbG9hZFN0YXRlKSB7CisgICAgY2FzZSBG cmFtZUxvYWRTdGF0ZTo6TG9hZFN0YXRlUHJvdmlzaW9uYWw6CisgICAgICAgIHJldHVybiBrV0tG cmFtZUxvYWRTdGF0ZVByb3Zpc2lvbmFsOworICAgIGNhc2UgRnJhbWVMb2FkU3RhdGU6OkxvYWRT dGF0ZUNvbW1pdHRlZDoKKyAgICAgICAgcmV0dXJuIGtXS0ZyYW1lTG9hZFN0YXRlQ29tbWl0dGVk OworICAgIGNhc2UgRnJhbWVMb2FkU3RhdGU6OkxvYWRTdGF0ZUZpbmlzaGVkOgorICAgICAgICBy ZXR1cm4ga1dLRnJhbWVMb2FkU3RhdGVGaW5pc2hlZDsKICAgICB9CiAgICAgCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRnJh bWVMb2FkU3RhdGUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0ZyYW1lTG9hZFN0YXRl LmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5mYmNmYzk3MTQ4NmJmYTIxODcyOTlkN2NhZjdjNDk3YzlmNGE5YWVl Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0ZyYW1lTG9hZFN0 YXRlLmNwcApAQCAtMCwwICsxLDQwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn CisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwor ICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICog SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5o IgorI2luY2x1ZGUgIkZyYW1lTG9hZFN0YXRlLmgiCisKK25hbWVzcGFjZSBXZWJLaXQgeworCitG cmFtZUxvYWRTdGF0ZTo6RnJhbWVMb2FkU3RhdGUoKQorICAgIDogbV9sb2FkU3RhdGUoTG9hZFN0 YXRlRmluaXNoZWQpCit7Cit9CisKK0ZyYW1lTG9hZFN0YXRlOjp+RnJhbWVMb2FkU3RhdGUoKQor eworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9GcmFtZUxvYWRTdGF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Zy YW1lTG9hZFN0YXRlLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmUzNTQzNmIxMzIxMmY3MGMyOTcyNTgwMjFhMDlh MGU3YjgxNjFlZAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9G cmFtZUxvYWRTdGF0ZS5oCkBAIC0wLDAgKzEsNTUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIw MTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJl ZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBg YEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJ QlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lO RVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9S IFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIEZy YW1lTG9hZFN0YXRlX2gKKyNkZWZpbmUgRnJhbWVMb2FkU3RhdGVfaAorCisjaW5jbHVkZSA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBGcmFtZUxv YWRTdGF0ZSB7CitwdWJsaWM6CisgICAgRnJhbWVMb2FkU3RhdGUoKTsKKyAgICB+RnJhbWVMb2Fk U3RhdGUoKTsKKworICAgIGVudW0gTG9hZFN0YXRlIHsKKyAgICAgICAgTG9hZFN0YXRlUHJvdmlz aW9uYWwsCisgICAgICAgIExvYWRTdGF0ZUNvbW1pdHRlZCwKKyAgICAgICAgTG9hZFN0YXRlRmlu aXNoZWQKKyAgICB9OworCisgICAgLy8gRklYTUU6IFRoZXNlIHNob3VsZCBhbGwgYmUgcHJpdmF0 ZSwgYW5kIEZyYW1lTG9hZFN0YXRlIHNob3VsZAorICAgIC8vIHByb3ZpZGUgc3RhdGUgdHJhbnNp dGlvbiBtZW1iZXIgZnVuY3Rpb25zLgorICAgIExvYWRTdGF0ZSBtX2xvYWRTdGF0ZTsKKyAgICBT dHJpbmcgbV91cmw7CisgICAgU3RyaW5nIG1fcHJvdmlzaW9uYWxVUkw7CisgICAgU3RyaW5nIG1f dW5yZWFjaGFibGVVUkw7CisgICAgU3RyaW5nIG1fbGFzdFVucmVhY2hhYmxlVVJMOworfTsKKwor fSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZiAvLyBGcmFtZUxvYWRTdGF0ZV9oCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggYTU3MDg3YzFmZDRj OGRhYzIwMjIzMDdhZDQ1YjZhMTU4OWVhZDJmMy4uYzgwYzgyMDQyN2Y3N2ZjYjYyNTA0MTZhNzBi NDEyODFkYjY1ZTg0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZy YW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5 LmNwcApAQCAtNDQsNyArNDQsNiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogV2ViRnJhbWVQcm94 eTo6V2ViRnJhbWVQcm94eShXZWJQYWdlUHJveHkqIHBhZ2UsIHVpbnQ2NF90IGZyYW1lSUQpCiAg ICAgOiBtX3BhZ2UocGFnZSkKLSAgICAsIG1fbG9hZFN0YXRlKExvYWRTdGF0ZUZpbmlzaGVkKQog ICAgICwgbV9pc0ZyYW1lU2V0KGZhbHNlKQogICAgICwgbV9mcmFtZUlEKGZyYW1lSUQpCiB7CkBA IC0xMTksMzEgKzExOCwzMSBAQCBib29sIFdlYkZyYW1lUHJveHk6OmlzRGlzcGxheWluZ1BERkRv Y3VtZW50KCkgY29uc3QKIAogdm9pZCBXZWJGcmFtZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFs TG9hZChjb25zdCBTdHJpbmcmIHVybCkKIHsKLSAgICBBU1NFUlQobV9wcm92aXNpb25hbFVSTC5p c0VtcHR5KCkpOwotICAgIG1fbG9hZFN0YXRlID0gTG9hZFN0YXRlUHJvdmlzaW9uYWw7Ci0gICAg bV9wcm92aXNpb25hbFVSTCA9IHVybDsKKyAgICBBU1NFUlQobV9mcmFtZUxvYWRTdGF0ZS5tX3By b3Zpc2lvbmFsVVJMLmlzRW1wdHkoKSk7CisgICAgbV9mcmFtZUxvYWRTdGF0ZS5tX2xvYWRTdGF0 ZSA9IEZyYW1lTG9hZFN0YXRlOjpMb2FkU3RhdGVQcm92aXNpb25hbDsKKyAgICBtX2ZyYW1lTG9h ZFN0YXRlLm1fcHJvdmlzaW9uYWxVUkwgPSB1cmw7CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94eTo6 ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmluZyYg dXJsKQogewotICAgIEFTU0VSVChtX2xvYWRTdGF0ZSA9PSBMb2FkU3RhdGVQcm92aXNpb25hbCk7 Ci0gICAgbV9wcm92aXNpb25hbFVSTCA9IHVybDsKKyAgICBBU1NFUlQobV9mcmFtZUxvYWRTdGF0 ZS5tX2xvYWRTdGF0ZSA9PSBGcmFtZUxvYWRTdGF0ZTo6TG9hZFN0YXRlUHJvdmlzaW9uYWwpOwor ICAgIG1fZnJhbWVMb2FkU3RhdGUubV9wcm92aXNpb25hbFVSTCA9IHVybDsKIH0KIAogdm9pZCBX ZWJGcmFtZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkKCkKIHsKLSAgICBBU1NFUlQobV9s b2FkU3RhdGUgPT0gTG9hZFN0YXRlUHJvdmlzaW9uYWwpOwotICAgIG1fbG9hZFN0YXRlID0gTG9h ZFN0YXRlRmluaXNoZWQ7Ci0gICAgbV9wcm92aXNpb25hbFVSTCA9IFN0cmluZygpOwotICAgIG1f dW5yZWFjaGFibGVVUkwgPSBtX2xhc3RVbnJlYWNoYWJsZVVSTDsKKyAgICBBU1NFUlQobV9mcmFt ZUxvYWRTdGF0ZS5tX2xvYWRTdGF0ZSA9PSBGcmFtZUxvYWRTdGF0ZTo6TG9hZFN0YXRlUHJvdmlz aW9uYWwpOworICAgIG1fZnJhbWVMb2FkU3RhdGUubV9sb2FkU3RhdGUgPSBGcmFtZUxvYWRTdGF0 ZTo6TG9hZFN0YXRlRmluaXNoZWQ7CisgICAgbV9mcmFtZUxvYWRTdGF0ZS5tX3Byb3Zpc2lvbmFs VVJMID0gU3RyaW5nKCk7CisgICAgbV9mcmFtZUxvYWRTdGF0ZS5tX3VucmVhY2hhYmxlVVJMID0g bV9mcmFtZUxvYWRTdGF0ZS5tX2xhc3RVbnJlYWNoYWJsZVVSTDsKIH0KIAogdm9pZCBXZWJGcmFt ZVByb3h5OjpkaWRDb21taXRMb2FkKGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUsIGNvbnN0IFBs YXRmb3JtQ2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8pCiB7Ci0gICAgQVNTRVJUKG1f bG9hZFN0YXRlID09IExvYWRTdGF0ZVByb3Zpc2lvbmFsKTsKLSAgICBtX2xvYWRTdGF0ZSA9IExv YWRTdGF0ZUNvbW1pdHRlZDsKLSAgICBtX3VybCA9IG1fcHJvdmlzaW9uYWxVUkw7Ci0gICAgbV9w cm92aXNpb25hbFVSTCA9IFN0cmluZygpOworICAgIEFTU0VSVChtX2ZyYW1lTG9hZFN0YXRlLm1f bG9hZFN0YXRlID09IEZyYW1lTG9hZFN0YXRlOjpMb2FkU3RhdGVQcm92aXNpb25hbCk7CisgICAg bV9mcmFtZUxvYWRTdGF0ZS5tX2xvYWRTdGF0ZSA9IEZyYW1lTG9hZFN0YXRlOjpMb2FkU3RhdGVD b21taXR0ZWQ7CisgICAgbV9mcmFtZUxvYWRTdGF0ZS5tX3VybCA9IG1fZnJhbWVMb2FkU3RhdGUu bV9wcm92aXNpb25hbFVSTDsKKyAgICBtX2ZyYW1lTG9hZFN0YXRlLm1fcHJvdmlzaW9uYWxVUkwg PSBTdHJpbmcoKTsKICAgICBtX3RpdGxlID0gU3RyaW5nKCk7CiAgICAgbV9NSU1FVHlwZSA9IGNv bnRlbnRUeXBlOwogICAgIG1faXNGcmFtZVNldCA9IGZhbHNlOwpAQCAtMTUyLDIxICsxNTEsMjEg QEAgdm9pZCBXZWJGcmFtZVByb3h5OjpkaWRDb21taXRMb2FkKGNvbnN0IFN0cmluZyYgY29udGVu dFR5cGUsIGNvbnN0IFBsYXRmb3JtQ2VydGkKIAogdm9pZCBXZWJGcmFtZVByb3h5OjpkaWRGaW5p c2hMb2FkKCkKIHsKLSAgICBBU1NFUlQobV9sb2FkU3RhdGUgPT0gTG9hZFN0YXRlQ29tbWl0dGVk KTsKLSAgICBBU1NFUlQobV9wcm92aXNpb25hbFVSTC5pc0VtcHR5KCkpOwotICAgIG1fbG9hZFN0 YXRlID0gTG9hZFN0YXRlRmluaXNoZWQ7CisgICAgQVNTRVJUKG1fZnJhbWVMb2FkU3RhdGUubV9s b2FkU3RhdGUgPT0gRnJhbWVMb2FkU3RhdGU6OkxvYWRTdGF0ZUNvbW1pdHRlZCk7CisgICAgQVNT RVJUKG1fZnJhbWVMb2FkU3RhdGUubV9wcm92aXNpb25hbFVSTC5pc0VtcHR5KCkpOworICAgIG1f ZnJhbWVMb2FkU3RhdGUubV9sb2FkU3RhdGUgPSBGcmFtZUxvYWRTdGF0ZTo6TG9hZFN0YXRlRmlu aXNoZWQ7CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94eTo6ZGlkRmFpbExvYWQoKQogewotICAgIEFT U0VSVChtX2xvYWRTdGF0ZSA9PSBMb2FkU3RhdGVDb21taXR0ZWQpOwotICAgIEFTU0VSVChtX3By b3Zpc2lvbmFsVVJMLmlzRW1wdHkoKSk7Ci0gICAgbV9sb2FkU3RhdGUgPSBMb2FkU3RhdGVGaW5p c2hlZDsKKyAgICBBU1NFUlQobV9mcmFtZUxvYWRTdGF0ZS5tX2xvYWRTdGF0ZSA9PSBGcmFtZUxv YWRTdGF0ZTo6TG9hZFN0YXRlQ29tbWl0dGVkKTsKKyAgICBBU1NFUlQobV9mcmFtZUxvYWRTdGF0 ZS5tX3Byb3Zpc2lvbmFsVVJMLmlzRW1wdHkoKSk7CisgICAgbV9mcmFtZUxvYWRTdGF0ZS5tX2xv YWRTdGF0ZSA9IEZyYW1lTG9hZFN0YXRlOjpMb2FkU3RhdGVGaW5pc2hlZDsKIH0KIAogdm9pZCBX ZWJGcmFtZVByb3h5OjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uKGNvbnN0IFN0cmluZyYgdXJs KQogewotICAgIG1fdXJsID0gdXJsOworICAgIG1fZnJhbWVMb2FkU3RhdGUubV91cmwgPSB1cmw7 CiB9CiAKIHZvaWQgV2ViRnJhbWVQcm94eTo6ZGlkQ2hhbmdlVGl0bGUoY29uc3QgU3RyaW5nJiB0 aXRsZSkKQEAgLTIzMiw4ICsyMzEsOCBAQCB2b2lkIFdlYkZyYW1lUHJveHk6OmdldFJlc291cmNl RGF0YShXZWJVUkwqIHJlc291cmNlVVJMLCBQYXNzUmVmUHRyPERhdGFDYWxsYmFjawogCiB2b2lk IFdlYkZyYW1lUHJveHk6OnNldFVucmVhY2hhYmxlVVJMKGNvbnN0IFN0cmluZyYgdW5yZWFjaGFi bGVVUkwpCiB7Ci0gICAgbV9sYXN0VW5yZWFjaGFibGVVUkwgPSBtX3VucmVhY2hhYmxlVVJMOwot ICAgIG1fdW5yZWFjaGFibGVVUkwgPSB1bnJlYWNoYWJsZVVSTDsKKyAgICBtX2ZyYW1lTG9hZFN0 YXRlLm1fbGFzdFVucmVhY2hhYmxlVVJMID0gbV9mcmFtZUxvYWRTdGF0ZS5tX3VucmVhY2hhYmxl VVJMOworICAgIG1fZnJhbWVMb2FkU3RhdGUubV91bnJlYWNoYWJsZVVSTCA9IHVucmVhY2hhYmxl VVJMOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViRnJhbWVQcm94eS5oCmluZGV4IDBiZWU2NjZmZmZkNGFmMmQxMWI1ZmM3ZGFkMjc0OGEyNjk2 YjZhZDUuLmU3ZDY1OWRkZTQwZTUzYmNlMGEyNjNhMTkzZjVkMWVmNTAyOWI2NTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaApAQCAtMjcsNiArMjcsNyBAQAogI2Rl ZmluZSBXZWJGcmFtZVByb3h5X2gKIAogI2luY2x1ZGUgIkFQSU9iamVjdC5oIgorI2luY2x1ZGUg IkZyYW1lTG9hZFN0YXRlLmgiCiAjaW5jbHVkZSAiSW1tdXRhYmxlQXJyYXkuaCIKICNpbmNsdWRl ICJHZW5lcmljQ2FsbGJhY2suaCIKICNpbmNsdWRlICJXZWJGcmFtZUxpc3RlbmVyUHJveHkuaCIK QEAgLTYwLDEyICs2MSw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgfldlYkZyYW1lUHJveHko KTsKIAotICAgIGVudW0gTG9hZFN0YXRlIHsKLSAgICAgICAgTG9hZFN0YXRlUHJvdmlzaW9uYWws Ci0gICAgICAgIExvYWRTdGF0ZUNvbW1pdHRlZCwKLSAgICAgICAgTG9hZFN0YXRlRmluaXNoZWQK LSAgICB9OwotCiAgICAgdWludDY0X3QgZnJhbWVJRCgpIGNvbnN0IHsgcmV0dXJuIG1fZnJhbWVJ RDsgfQogICAgIFdlYlBhZ2VQcm94eSogcGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZTsgfQog CkBAIC03NiwxNSArNzEsMTcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SXNGcmFtZVNldChib29s IHZhbHVlKSB7IG1faXNGcmFtZVNldCA9IHZhbHVlOyB9CiAgICAgYm9vbCBpc0ZyYW1lU2V0KCkg Y29uc3QgeyByZXR1cm4gbV9pc0ZyYW1lU2V0OyB9CiAKLSAgICBMb2FkU3RhdGUgbG9hZFN0YXRl KCkgY29uc3QgeyByZXR1cm4gbV9sb2FkU3RhdGU7IH0KKyAgICBGcmFtZUxvYWRTdGF0ZSYgZnJh bWVMb2FkU3RhdGUoKSB7IHJldHVybiBtX2ZyYW1lTG9hZFN0YXRlOyB9CisKKyAgICBGcmFtZUxv YWRTdGF0ZTo6TG9hZFN0YXRlIGxvYWRTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZnJhbWVMb2Fk U3RhdGUubV9sb2FkU3RhdGU7IH0KICAgICAKICAgICB2b2lkIHN0b3BMb2FkaW5nKCkgY29uc3Q7 CiAKLSAgICBjb25zdCBTdHJpbmcmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsOyB9Ci0gICAg Y29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvdmlzaW9u YWxVUkw7IH0KKyAgICBjb25zdCBTdHJpbmcmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1fZnJhbWVM b2FkU3RhdGUubV91cmw7IH0KKyAgICBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMKCkgY29u c3QgeyByZXR1cm4gbV9mcmFtZUxvYWRTdGF0ZS5tX3Byb3Zpc2lvbmFsVVJMOyB9CiAKICAgICB2 b2lkIHNldFVucmVhY2hhYmxlVVJMKGNvbnN0IFN0cmluZyYpOwotICAgIGNvbnN0IFN0cmluZyYg dW5yZWFjaGFibGVVUkwoKSBjb25zdCB7IHJldHVybiBtX3VucmVhY2hhYmxlVVJMOyB9CisgICAg Y29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCgpIGNvbnN0IHsgcmV0dXJuIG1fZnJhbWVMb2Fk U3RhdGUubV91bnJlYWNoYWJsZVVSTDsgfQogCiAgICAgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSgp IGNvbnN0IHsgcmV0dXJuIG1fTUlNRVR5cGU7IH0KIApAQCAtMTIxLDExICsxMTgsOSBAQCBwcml2 YXRlOgogICAgIFdlYkZyYW1lUHJveHkoV2ViUGFnZVByb3h5KiBwYWdlLCB1aW50NjRfdCBmcmFt ZUlEKTsKIAogICAgIFdlYlBhZ2VQcm94eSogbV9wYWdlOwotICAgIExvYWRTdGF0ZSBtX2xvYWRT dGF0ZTsKLSAgICBTdHJpbmcgbV91cmw7Ci0gICAgU3RyaW5nIG1fcHJvdmlzaW9uYWxVUkw7Ci0g ICAgU3RyaW5nIG1fdW5yZWFjaGFibGVVUkw7Ci0gICAgU3RyaW5nIG1fbGFzdFVucmVhY2hhYmxl VVJMOworCisgICAgRnJhbWVMb2FkU3RhdGUgbV9mcmFtZUxvYWRTdGF0ZTsKKwogICAgIFN0cmlu ZyBtX01JTUVUeXBlOwogICAgIFN0cmluZyBtX3RpdGxlOwogICAgIGJvb2wgbV9pc0ZyYW1lU2V0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA5MzhlMGY5 N2MwMTdiYWZkOGY3MzBmNzg5OGM2ODEwNGI1MzAwNWM4Li5iYzFhOTgxZTY4MjU5Nzk4OTU2NzI5 MmUxYjgxMTFkODUwYzU2N2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcApAQCAtMjM4LDcgKzIzOCw3IEBAIFdlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KFBh Z2VDbGllbnQqIHBhZ2VDbGllbnQsIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwCiAgICAg LCBtX2VzdGltYXRlZFByb2dyZXNzKDApCiAgICAgLCBtX3ZpZXdTdGF0ZShWaWV3U3RhdGU6Ok5v RmxhZ3MpCiAgICAgLCBtX2JhY2tGb3J3YXJkTGlzdChXZWJCYWNrRm9yd2FyZExpc3Q6OmNyZWF0 ZSh0aGlzKSkKLSAgICAsIG1fbG9hZFN0YXRlQXRQcm9jZXNzRXhpdChXZWJGcmFtZVByb3h5OjpM b2FkU3RhdGVGaW5pc2hlZCkKKyAgICAsIG1fbG9hZFN0YXRlQXRQcm9jZXNzRXhpdChGcmFtZUxv YWRTdGF0ZTo6TG9hZFN0YXRlRmluaXNoZWQpCiAgICAgLCBtX3RlbXBvcmFyaWx5Q2xvc2VkQ29t cG9zaXRpb24oZmFsc2UpCiAgICAgLCBtX3RleHRab29tRmFjdG9yKDEpCiAgICAgLCBtX3BhZ2Va b29tRmFjdG9yKDEpCkBAIC04NDcsMTEgKzg0NywxMSBAQCBTdHJpbmcgV2ViUGFnZVByb3h5Ojph Y3RpdmVVUkwoKSBjb25zdAogICAgIGlmICghbV9tYWluRnJhbWUtPnVucmVhY2hhYmxlVVJMKCku aXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gbV9tYWluRnJhbWUtPnVucmVhY2hhYmxlVVJMKCk7 CiAKLSAgICBzd2l0Y2ggKG1fbWFpbkZyYW1lLT5sb2FkU3RhdGUoKSkgewotICAgIGNhc2UgV2Vi RnJhbWVQcm94eTo6TG9hZFN0YXRlUHJvdmlzaW9uYWw6CisgICAgc3dpdGNoIChtX21haW5GcmFt ZS0+ZnJhbWVMb2FkU3RhdGUoKS5tX2xvYWRTdGF0ZSkgeworICAgIGNhc2UgRnJhbWVMb2FkU3Rh dGU6OkxvYWRTdGF0ZVByb3Zpc2lvbmFsOgogICAgICAgICByZXR1cm4gbV9tYWluRnJhbWUtPnBy b3Zpc2lvbmFsVVJMKCk7Ci0gICAgY2FzZSBXZWJGcmFtZVByb3h5OjpMb2FkU3RhdGVDb21taXR0 ZWQ6Ci0gICAgY2FzZSBXZWJGcmFtZVByb3h5OjpMb2FkU3RhdGVGaW5pc2hlZDoKKyAgICBjYXNl IEZyYW1lTG9hZFN0YXRlOjpMb2FkU3RhdGVDb21taXR0ZWQ6CisgICAgY2FzZSBGcmFtZUxvYWRT dGF0ZTo6TG9hZFN0YXRlRmluaXNoZWQ6CiAgICAgICAgIHJldHVybiBtX21haW5GcmFtZS0+dXJs KCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXgg MGM0MTRkOTRjMzg0ZmEzM2YxZTE5YTBlN2ZjOTJjMjdmZjM3NGRiZi4uN2FmMTQ3MjQwOTQyNjgz MGU2MDJlZTQ5MzQ3MzQ4NmE1ZWNhZTc4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaApAQCAtNjEwLDcgKzYxMCw3IEBAIHB1YmxpYzoKICAgICBQYXNzUmVmUHRyPElt bXV0YWJsZUFycmF5PiByZWxhdGVkUGFnZXMoKSBjb25zdDsKIAogICAgIGNvbnN0IFN0cmluZyYg dXJsQXRQcm9jZXNzRXhpdCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsQXRQcm9jZXNzRXhpdDsgfQot ICAgIFdlYkZyYW1lUHJveHk6OkxvYWRTdGF0ZSBsb2FkU3RhdGVBdFByb2Nlc3NFeGl0KCkgY29u c3QgeyByZXR1cm4gbV9sb2FkU3RhdGVBdFByb2Nlc3NFeGl0OyB9CisgICAgRnJhbWVMb2FkU3Rh dGU6OkxvYWRTdGF0ZSBsb2FkU3RhdGVBdFByb2Nlc3NFeGl0KCkgY29uc3QgeyByZXR1cm4gbV9s b2FkU3RhdGVBdFByb2Nlc3NFeGl0OyB9CiAKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAg IFdlYkNvcmU6OkRyYWdTZXNzaW9uIGRyYWdTZXNzaW9uKCkgY29uc3QgeyByZXR1cm4gbV9jdXJy ZW50RHJhZ1Nlc3Npb247IH0KQEAgLTEwOTAsNyArMTA5MCw3IEBAIHByaXZhdGU6CiAgICAgU3Ry aW5nIG1fdG9vbFRpcDsKIAogICAgIFN0cmluZyBtX3VybEF0UHJvY2Vzc0V4aXQ7Ci0gICAgV2Vi RnJhbWVQcm94eTo6TG9hZFN0YXRlIG1fbG9hZFN0YXRlQXRQcm9jZXNzRXhpdDsKKyAgICBGcmFt ZUxvYWRTdGF0ZTo6TG9hZFN0YXRlIG1fbG9hZFN0YXRlQXRQcm9jZXNzRXhpdDsKIAogICAgIEVk aXRvclN0YXRlIG1fZWRpdG9yU3RhdGU7CiAgICAgYm9vbCBtX3RlbXBvcmFyaWx5Q2xvc2VkQ29t cG9zaXRpb247IC8vIEVkaXRvciBzdGF0ZSBjaGFuZ2VkIGZyb20gaGFzQ29tcG9zaXRpb24gdG8g IWhhc0NvbXBvc2l0aW9uLCBidXQgdGhhdCB3YXMgb25seSB3aXRoIHNob3VsZElnbm9yZUNvbXBv c2l0aW9uU2VsZWN0aW9uQ2hhbmdlIHlldC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA4NWViMzNlYzg1NDMxNmRlZmU0ZTFiYmRj MGQwY2RmMzUwZjI4ZGE1Li5lNDJlMDc3YjgxZmM4MjNhNWFmYjI5ZjZjMjg3YjljOGNlZTg5NzU4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKKysrIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCkBAIC0yNjYsNiArMjY2LDggQEAKIAkJMUFFMDBENEYxODJENkY1MDAwMDg3REQ3IC8qIFdL QnJvd3NpbmdDb250ZXh0SGFuZGxlSW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRTAwRDRFMTgyRDZGNTAwMDA4N0RENyAvKiBXS0Jyb3dz aW5nQ29udGV4dEhhbmRsZUludGVybmFsLmggKi87IH07CiAJCTFBRTAwRDVDMTgyREFERTEwMDA4 N0RENyAvKiBLZXllZEVuY29kZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gMUFFMDBENUExODJEQURFMTAwMDg3REQ3IC8qIEtleWVkRW5jb2Rlci5j cHAgKi87IH07CiAJCTFBRTAwRDVEMTgyREFERTEwMDA4N0RENyAvKiBLZXllZEVuY29kZXIuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRTAwRDVCMTgy REFERTEwMDA4N0RENyAvKiBLZXllZEVuY29kZXIuaCAqLzsgfTsKKwkJMUFFMDBENjAxODMxNzky MTAwMDg3REQ3IC8qIEZyYW1lTG9hZFN0YXRlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRTAwRDVFMTgzMTc5MjEwMDA4N0RENyAvKiBGcmFtZUxv YWRTdGF0ZS5jcHAgKi87IH07CisJCTFBRTAwRDYxMTgzMTc5MjEwMDA4N0RENyAvKiBGcmFtZUxv YWRTdGF0ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MUFFMDBENUYxODMxNzkyMTAwMDg3REQ3IC8qIEZyYW1lTG9hZFN0YXRlLmggKi87IH07CiAJCTFB RTExN0Y2MTFEQkIzMDkwMDk4MTYxNSAvKiBQcm9jZXNzTGF1bmNoZXIuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFFMTE3RjUxMURCQjMwOTAwOTgx NjE1IC8qIFByb2Nlc3NMYXVuY2hlci5jcHAgKi87IH07CiAJCTFBRTQ5NzY4MTFGRjY1OEUwMDQ4 QjQ2NCAvKiBOUEpTT2JqZWN0LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxQUU0OTc2NjExRkY2NThFMDA0OEI0NjQgLyogTlBKU09iamVjdC5oICovOyB9 OwogCQkxQUU0OTc2OTExRkY2NThFMDA0OEI0NjQgLyogTlBKU09iamVjdC5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUU0OTc2NzExRkY2NThFMDA0 OEI0NjQgLyogTlBKU09iamVjdC5jcHAgKi87IH07CkBAIC0xNzUyLDYgKzE3NTQsOCBAQAogCQkx QUUwMEQ0RTE4MkQ2RjUwMDAwODdERDcgLyogV0tCcm93c2luZ0NvbnRleHRIYW5kbGVJbnRlcm5h bC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS0Jyb3dzaW5nQ29udGV4dEhh bmRsZUludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBRTAwRDVBMTgy REFERTEwMDA4N0RENyAvKiBLZXllZEVuY29kZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gS2V5ZWRFbmNvZGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJMUFFMDBENUIxODJEQURFMTAwMDg3REQ3IC8qIEtleWVkRW5jb2Rlci5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBLZXllZEVuY29kZXIuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKKwkJMUFFMDBENUUxODMxNzkyMTAwMDg3REQ3IC8qIEZyYW1lTG9hZFN0YXRl LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEZyYW1lTG9hZFN0YXRl LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUFFMDBENUYxODMxNzkyMTAwMDg3 REQ3IC8qIEZyYW1lTG9hZFN0YXRlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IEZyYW1lTG9hZFN0YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBRTExN0Y1 MTFEQkIzMDkwMDk4MTYxNSAvKiBQcm9jZXNzTGF1bmNoZXIuY3BwICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gUHJvY2Vzc0xhdW5jaGVyLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJMUFFNDk3NjYxMUZGNjU4RTAwNDhCNDY0IC8qIE5QSlNPYmplY3QuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTlBKU09iamVjdC5oOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkxQUU0OTc2NzExRkY2NThFMDA0OEI0NjQgLyogTlBKU09iamVj dC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOUEpTT2JqZWN0LmNw cDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQyOTQsNiArNDI5OCw4IEBACiAJCQkJ QkMyNjUyMTMxMTgyNjA4MTAwMjQzRTEyIC8qIERyYXdpbmdBcmVhUHJveHkuaCAqLywKIAkJCQkx QTY0MjJGQzEyREQwOEZFMDBDQUFFMkMgLyogRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdlcy5pbiAq LywKIAkJCQkxQTkxMDA3MDEyNjY3NUM0MDAxODQyRjUgLyogRmluZEluZGljYXRvci5jcHAgKi8s CisJCQkJMUFFMDBENUUxODMxNzkyMTAwMDg3REQ3IC8qIEZyYW1lTG9hZFN0YXRlLmNwcCAqLywK KwkJCQkxQUUwMEQ1RjE4MzE3OTIxMDAwODdERDcgLyogRnJhbWVMb2FkU3RhdGUuaCAqLywKIAkJ CQkxQTkxMDA2RjEyNjY3NUMzMDAxODQyRjUgLyogRmluZEluZGljYXRvci5oICovLAogCQkJCUJD MTc3NTNFMTE4QkFCRjAwMDdEOUU5QSAvKiBHZW5lcmljQ2FsbGJhY2suaCAqLywKIAkJCQlCQzA2 RjQ0OTEyREJEMUY1MDAyRDc4REUgLyogR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFn ZXJQcm94eS5jcHAgKi8sCkBAIC01NzkzLDYgKzU3OTksNyBAQAogCQkJCTFDQThCOTQ2MTI3Qzg4 MkEwMDU3NkMyQiAvKiBXZWJJbnNwZWN0b3JQcm94eU1lc3NhZ2VzLmggaW4gSGVhZGVycyAqLywK IAkJCQk1MTAzMkYxRTE4MEY3OTE3MDA5NjFCQjcgLyogRGF0YWJhc2VUb1dlYlByb2Nlc3NDb25u ZWN0aW9uTWVzc2FnZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTUxQTlFMTA2MTMxNUNDRkMwMDlF NzAzMSAvKiBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmggaW4gSGVhZGVycyAqLywKKwkJCQkx QUUwMEQ2MTE4MzE3OTIxMDAwODdERDcgLyogRnJhbWVMb2FkU3RhdGUuaCBpbiBIZWFkZXJzICov LAogCQkJCUJDNTk1NDg5MTVDNzg2ODUwMEZEMUUzRSAvKiBXZWJLaXQyLmggaW4gSGVhZGVycyAq LywKIAkJCQlCQ0I2MzQ3ODExNkJGMTA2MDA2MDMyMTUgLyogV2ViS2l0Ml9DLmggaW4gSGVhZGVy cyAqLywKIAkJCQlCQzlCQTUwNTE2OTdDNDUzMDBFNDQ2MTYgLyogV2ViS2l0MkluaXRpYWxpemUu aCBpbiBIZWFkZXJzICovLApAQCAtNjc2Myw2ICs2NzcwLDcgQEAKIAkJCQkxQTNENjEwNTEzQTdG MDNBMDBGOTVENEUgLyogQXJndW1lbnRDb2RlcnMuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMUFB RjBDNEIxMkIxNjMzNDAwOEU0OUUyIC8qIEFyZ3VtZW50Q29kZXJzQ0YuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJRTE3OUZEOUYxMzREMzgyNTAwMTVCODgzIC8qIEFyZ3VtZW50Q29kZXJzTWFjLm1t IGluIFNvdXJjZXMgKi8sCisJCQkJMUFFMDBENjAxODMxNzkyMTAwMDg3REQ3IC8qIEZyYW1lTG9h ZFN0YXRlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUJDMDMyREE1MTBGNDM3RDEwMDU4QzE1QSAv KiBBcmd1bWVudERlY29kZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkMwMzJEQTcxMEY0MzdE MTAwNThDMTVBIC8qIEFyZ3VtZW50RW5jb2Rlci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCQ0VF OTY2QzExMkZBRjU3MDA2QkNDMjQgLyogQXR0YWNobWVudC5jcHAgaW4gU291cmNlcyAqLywK