146213 2015-06-22 13:20:18 -0700 Simplify Connection::SyncMessageState 2015-06-22 14:12:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1103907 0 andersca 2015-06-22 13:20:18 -0700 Simplify Connection::SyncMessageState 1103908 1 255364 andersca 2015-06-22 13:26:07 -0700 Created attachment 255364 Patch 1103914 2 255364 kling 2015-06-22 14:07:06 -0700 Comment on attachment 255364 Patch r=me 1103915 3 andersca 2015-06-22 14:12:09 -0700 Committed r185843: <http://trac.webkit.org/changeset/185843> 255364 2015-06-22 13:26:07 -0700 2015-06-22 14:07:06 -0700 Patch bug-146213-20150622132526.patch text/plain 8954 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWE3OTA0Njg5MjdjNWE2 ODliMzhlOWJjZjMyMDQzM2QxYjY5Yjg4Yi4uYjdkMGYwNDM3NmM4MzVjZmI0NDFmMjc5MDI1MTZl NTc3YWZhYzQ3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE1LTA2LTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgQ29u bmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MjEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2luY2Ugd2Ugbm8gbG9uZ2VyIHN1cHBvcnQgQ29ubmVjdGlvbnMg ZGlzcGF0Y2hpbmcgdG8gbXVsdGlwbGUgdGhyZWFkcywgd2UgY2FuIG1ha2UgU3luY01lc3NhZ2VT dGF0ZQorICAgICAgICBpbnRvIGEgc2luZ2xldG9uIGFuZCBnZXQgcmlkIG9mIHRoZSBSdW5Mb29w IC0+IFN5bmNNZXNzYWdlU3RhdGUgaGFzaCBtYXAuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMv Q29ubmVjdGlvbi5jcHA6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3Rh dGU6OnNpbmdsZXRvbik6CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3Rh dGU6OlN5bmNNZXNzYWdlU3RhdGUpOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpTeW5jTWVz c2FnZVN0YXRlOjpwcm9jZXNzSW5jb21pbmdNZXNzYWdlKToKKyAgICAgICAgKElQQzo6Q29ubmVj dGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6ZGlzcGF0Y2hNZXNzYWdlcyk6CisgICAgICAgIChJUEM6 OkNvbm5lY3Rpb246OndhaXRGb3JTeW5jUmVwbHkpOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9u Ojpwcm9jZXNzSW5jb21pbmdTeW5jUmVwbHkpOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpw cm9jZXNzSW5jb21pbmdNZXNzYWdlKToKKyAgICAgICAgKElQQzo6Q29ubmVjdGlvbjo6Y29ubmVj dGlvbkRpZENsb3NlKToKKyAgICAgICAgKElQQzo6Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0 ZTo6c3luY01lc3NhZ2VTdGF0ZU1hcCk6IERlbGV0ZWQuCisgICAgICAgIChJUEM6OkNvbm5lY3Rp b246OlN5bmNNZXNzYWdlU3RhdGU6OnN5bmNNZXNzYWdlU3RhdGVNYXBNdXRleCk6IERlbGV0ZWQu CisgICAgICAgIChJUEM6OkNvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OmdldE9yQ3JlYXRl KTogRGVsZXRlZC4KKyAgICAgICAgKElQQzo6Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6 flN5bmNNZXNzYWdlU3RhdGUpOiBEZWxldGVkLgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpD b25uZWN0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvQ29ubmVjdGlvbi5o OgorCisyMDE1LTA2LTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK ICAgICAgICAgUmVtb3ZlIG1fY2xpZW50UnVuTG9vcCBmcm9tIElQQzo6Q29ubmVjdGlvbgogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MjEyCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmNwcAppbmRleCA4YzE0M2I2MzI0 M2Y2ZmJjMWRmODk3MzI4MjU4YzRjMTNkNDJhZmRlLi42NjRjYzM0YTUyNjExZWQ0NGQ5OTc4NjIz MDJlMzY0Mjk1ZDNiMGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMv Q29ubmVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5lY3Rp b24uY3BwCkBAIC01NSwxMCArNTUsMTIgQEAgc3RydWN0IFdhaXRGb3JNZXNzYWdlU3RhdGUgewog ICAgIHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRGVjb2Rlcj4gZGVjb2RlcjsKIH07CiAKLWNsYXNz IENvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGUgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50 ZWQ8Q29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZT4geworY2xhc3MgQ29ubmVjdGlvbjo6U3lu Y01lc3NhZ2VTdGF0ZSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxTeW5jTWVzc2FnZVN0YXRl PiBnZXRPckNyZWF0ZShSdW5Mb29wJik7Ci0gICAgflN5bmNNZXNzYWdlU3RhdGUoKTsKKyAgICBz dGF0aWMgU3luY01lc3NhZ2VTdGF0ZSYgc2luZ2xldG9uKCk7CisKKyAgICBTeW5jTWVzc2FnZVN0 YXRlKCk7CisgICAgflN5bmNNZXNzYWdlU3RhdGUoKSA9IGRlbGV0ZTsKIAogICAgIHZvaWQgd2Fr ZVVwQ2xpZW50UnVuTG9vcCgpCiAgICAgewpAQCAtNzksMjkgKzgxLDggQEAgcHVibGljOgogICAg IHZvaWQgZGlzcGF0Y2hNZXNzYWdlcyhDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbik7CiAK IHByaXZhdGU6Ci0gICAgZXhwbGljaXQgU3luY01lc3NhZ2VTdGF0ZShSdW5Mb29wJik7Ci0KLSAg ICB0eXBlZGVmIEhhc2hNYXA8UnVuTG9vcCosIFN5bmNNZXNzYWdlU3RhdGUqPiBTeW5jTWVzc2Fn ZVN0YXRlTWFwOwotICAgIHN0YXRpYyBTeW5jTWVzc2FnZVN0YXRlTWFwJiBzeW5jTWVzc2FnZVN0 YXRlTWFwKCkKLSAgICB7Ci0gICAgICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxTeW5jTWVzc2Fn ZVN0YXRlTWFwPiBzeW5jTWVzc2FnZVN0YXRlTWFwOwotICAgICAgICByZXR1cm4gc3luY01lc3Nh Z2VTdGF0ZU1hcDsKLSAgICB9Ci0KLSAgICBzdGF0aWMgc3RkOjptdXRleCYgc3luY01lc3NhZ2VT dGF0ZU1hcE11dGV4KCkKLSAgICB7Ci0gICAgICAgIHN0YXRpYyBMYXp5TmV2ZXJEZXN0cm95ZWQ8 c3RkOjptdXRleD4gc3luY01lc3NhZ2VTdGF0ZU1hcE11dGV4OwotICAgICAgICBzdGF0aWMgc3Rk OjpvbmNlX2ZsYWcgb25jZUZsYWc7Ci0gICAgICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBb XSB7Ci0gICAgICAgICAgICBzeW5jTWVzc2FnZVN0YXRlTWFwTXV0ZXguY29uc3RydWN0KCk7Ci0g ICAgICAgIH0pOwotCi0gICAgICAgIHJldHVybiBzeW5jTWVzc2FnZVN0YXRlTWFwTXV0ZXg7Ci0g ICAgfQotCiAgICAgdm9pZCBkaXNwYXRjaE1lc3NhZ2VBbmRSZXNldERpZFNjaGVkdWxlRGlzcGF0 Y2hNZXNzYWdlc0ZvckNvbm5lY3Rpb24oQ29ubmVjdGlvbiYpOwogCi0gICAgUnVuTG9vcCYgbV9y dW5Mb29wOwogICAgIEJpbmFyeVNlbWFwaG9yZSBtX3dhaXRGb3JTeW5jUmVwbHlTZW1hcGhvcmU7 CiAKICAgICAvLyBQcm90ZWN0cyBtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdlc1dvcmtTZXQg YW5kIG1fbWVzc2FnZXNUb0Rpc3BhdGNoV2hpbGVXYWl0aW5nRm9yU3luY1JlcGx5LgpAQCAtMTI2 LDM1ICsxMDcsMjIgQEAgcHVibGljOgogfTsKIAogCi1SZWY8Q29ubmVjdGlvbjo6U3luY01lc3Nh Z2VTdGF0ZT4gQ29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6Z2V0T3JDcmVhdGUoUnVuTG9v cCYgcnVuTG9vcCkKK0Nvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGUmIENvbm5lY3Rpb246OlN5 bmNNZXNzYWdlU3RhdGU6OnNpbmdsZXRvbigpCiB7Ci0gICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6 bXV0ZXg+IGxvY2soc3luY01lc3NhZ2VTdGF0ZU1hcE11dGV4KCkpOwotCi0gICAgYXV0byYgc2xv dCA9IHN5bmNNZXNzYWdlU3RhdGVNYXAoKS5hZGQoJnJ1bkxvb3AsIG51bGxwdHIpLml0ZXJhdG9y LT52YWx1ZTsKLSAgICBpZiAoc2xvdCkKLSAgICAgICAgcmV0dXJuICpzbG90OworICAgIHN0YXRp YyBzdGQ6Om9uY2VfZmxhZyBvbmNlRmxhZzsKKyAgICBzdGF0aWMgTGF6eU5ldmVyRGVzdHJveWVk PFN5bmNNZXNzYWdlU3RhdGU+IHN5bmNNZXNzYWdlU3RhdGU7CiAKLSAgICBSZWY8U3luY01lc3Nh Z2VTdGF0ZT4gc3luY01lc3NhZ2VTdGF0ZSA9IGFkb3B0UmVmKCpuZXcgU3luY01lc3NhZ2VTdGF0 ZShydW5Mb29wKSk7Ci0gICAgc2xvdCA9IHN5bmNNZXNzYWdlU3RhdGUucHRyKCk7CisgICAgc3Rk OjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKKyAgICAgICAgc3luY01lc3NhZ2VTdGF0ZS5jb25z dHJ1Y3QoKTsKKyAgICB9KTsKIAogICAgIHJldHVybiBzeW5jTWVzc2FnZVN0YXRlOwogfQogCi1D b25uZWN0aW9uOjpTeW5jTWVzc2FnZVN0YXRlOjpTeW5jTWVzc2FnZVN0YXRlKFJ1bkxvb3AmIHJ1 bkxvb3ApCi0gICAgOiBtX3J1bkxvb3AocnVuTG9vcCkKK0Nvbm5lY3Rpb246OlN5bmNNZXNzYWdl U3RhdGU6OlN5bmNNZXNzYWdlU3RhdGUoKQogewogfQogCi1Db25uZWN0aW9uOjpTeW5jTWVzc2Fn ZVN0YXRlOjp+U3luY01lc3NhZ2VTdGF0ZSgpCi17Ci0gICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6 bXV0ZXg+IGxvY2soc3luY01lc3NhZ2VTdGF0ZU1hcE11dGV4KCkpOwotCi0gICAgQVNTRVJUKHN5 bmNNZXNzYWdlU3RhdGVNYXAoKS5jb250YWlucygmbV9ydW5Mb29wKSk7Ci0gICAgc3luY01lc3Nh Z2VTdGF0ZU1hcCgpLnJlbW92ZSgmbV9ydW5Mb29wKTsKLQotICAgIEFTU0VSVChtX21lc3NhZ2Vz VG9EaXNwYXRjaFdoaWxlV2FpdGluZ0ZvclN5bmNSZXBseS5pc0VtcHR5KCkpOwotfQotCiBib29s IENvbm5lY3Rpb246OlN5bmNNZXNzYWdlU3RhdGU6OnByb2Nlc3NJbmNvbWluZ01lc3NhZ2UoQ29u bmVjdGlvbiYgY29ubmVjdGlvbiwgc3RkOjp1bmlxdWVfcHRyPE1lc3NhZ2VEZWNvZGVyPiYgbWVz c2FnZSkKIHsKICAgICBpZiAoIW1lc3NhZ2UtPnNob3VsZERpc3BhdGNoTWVzc2FnZVdoZW5XYWl0 aW5nRm9yU3luY1JlcGx5KCkpCkBAIC0xNjcsNyArMTM1LDcgQEAgYm9vbCBDb25uZWN0aW9uOjpT eW5jTWVzc2FnZVN0YXRlOjpwcm9jZXNzSW5jb21pbmdNZXNzYWdlKENvbm5lY3Rpb24mIGNvbm5l Y3Rpb24KICAgICAgICAgCiAgICAgICAgIGlmIChtX2RpZFNjaGVkdWxlRGlzcGF0Y2hNZXNzYWdl c1dvcmtTZXQuYWRkKCZjb25uZWN0aW9uKS5pc05ld0VudHJ5KSB7CiAgICAgICAgICAgICBSZWZQ dHI8Q29ubmVjdGlvbj4gcHJvdGVjdGVkQ29ubmVjdGlvbigmY29ubmVjdGlvbik7Ci0gICAgICAg ICAgICBtX3J1bkxvb3AuZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZENvbm5lY3Rpb25dIHsKKyAg ICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkQ29ubmVj dGlvbl0gewogICAgICAgICAgICAgICAgIGRpc3BhdGNoTWVzc2FnZUFuZFJlc2V0RGlkU2NoZWR1 bGVEaXNwYXRjaE1lc3NhZ2VzRm9yQ29ubmVjdGlvbigqcHJvdGVjdGVkQ29ubmVjdGlvbik7CiAg ICAgICAgICAgICB9KTsKICAgICAgICAgfQpAQCAtMTgyLDcgKzE1MCw3IEBAIGJvb2wgQ29ubmVj dGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6cHJvY2Vzc0luY29taW5nTWVzc2FnZShDb25uZWN0aW9u JiBjb25uZWN0aW9uCiAKIHZvaWQgQ29ubmVjdGlvbjo6U3luY01lc3NhZ2VTdGF0ZTo6ZGlzcGF0 Y2hNZXNzYWdlcyhDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbikKIHsKLSAgICBBU1NFUlQo Jm1fcnVuTG9vcCA9PSAmUnVuTG9vcDo6Y3VycmVudCgpKTsKKyAgICBBU1NFUlQoUnVuTG9vcDo6 aXNNYWluKCkpOwogCiAgICAgVmVjdG9yPENvbm5lY3Rpb25BbmRJbmNvbWluZ01lc3NhZ2U+IG1l c3NhZ2VzVG9EaXNwYXRjaFdoaWxlV2FpdGluZ0ZvclN5bmNSZXBseTsKIApAQCAtMjQ5LDcgKzIx Nyw2IEBAIENvbm5lY3Rpb246OkNvbm5lY3Rpb24oSWRlbnRpZmllciBpZGVudGlmaWVyLCBib29s IGlzU2VydmVyLCBDbGllbnQmIGNsaWVudCkKICAgICAsIG1faW5EaXNwYXRjaE1lc3NhZ2VNYXJr ZWREaXNwYXRjaFdoZW5XYWl0aW5nRm9yU3luY1JlcGx5Q291bnQoMCkKICAgICAsIG1fZGlkUmVj ZWl2ZUludmFsaWRNZXNzYWdlKGZhbHNlKQogICAgICwgbV93YWl0aW5nRm9yTWVzc2FnZShudWxs cHRyKQotICAgICwgbV9zeW5jTWVzc2FnZVN0YXRlKFN5bmNNZXNzYWdlU3RhdGU6OmdldE9yQ3Jl YXRlKFJ1bkxvb3A6Om1haW4oKSkpCiAgICAgLCBtX3Nob3VsZFdhaXRGb3JTeW5jUmVwbGllcyh0 cnVlKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CkBAIC01NzYsNyArNTQzLDcg QEAgc3RkOjp1bmlxdWVfcHRyPE1lc3NhZ2VEZWNvZGVyPiBDb25uZWN0aW9uOjp3YWl0Rm9yU3lu Y1JlcGx5KHVpbnQ2NF90IHN5bmNSZXF1ZXMKICAgICBib29sIHRpbWVkT3V0ID0gZmFsc2U7CiAg ICAgd2hpbGUgKCF0aW1lZE91dCkgewogICAgICAgICAvLyBGaXJzdCwgY2hlY2sgaWYgd2UgaGF2 ZSBhbnkgbWVzc2FnZXMgdGhhdCB3ZSBuZWVkIHRvIHByb2Nlc3MuCi0gICAgICAgIG1fc3luY01l c3NhZ2VTdGF0ZS0+ZGlzcGF0Y2hNZXNzYWdlcyhudWxscHRyKTsKKyAgICAgICAgU3luY01lc3Nh Z2VTdGF0ZTo6c2luZ2xldG9uKCkuZGlzcGF0Y2hNZXNzYWdlcyhudWxscHRyKTsKICAgICAgICAg CiAgICAgICAgIHsKICAgICAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX3N5bmNSZXBseVN0 YXRlTXV0ZXgpOwpAQCAtNjE0LDcgKzU4MSw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRGVj b2Rlcj4gQ29ubmVjdGlvbjo6d2FpdEZvclN5bmNSZXBseSh1aW50NjRfdCBzeW5jUmVxdWVzCiAg ICAgICAgICAgICB0aW1lZE91dCA9IGN1cnJlbnRUaW1lKCkgPj0gYWJzb2x1dGVUaW1lOwogI2Vu ZGlmCiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgdGltZWRPdXQgPSAhbV9zeW5jTWVzc2Fn ZVN0YXRlLT53YWl0KGFic29sdXRlVGltZSk7CisgICAgICAgICAgICB0aW1lZE91dCA9ICFTeW5j TWVzc2FnZVN0YXRlOjpzaW5nbGV0b24oKS53YWl0KGFic29sdXRlVGltZSk7CiAgICAgICAgIAog ICAgIH0KICAgICAKQEAgLTY0Miw3ICs2MDksNyBAQCB2b2lkIENvbm5lY3Rpb246OnByb2Nlc3NJ bmNvbWluZ1N5bmNSZXBseShzdGQ6OnVuaXF1ZV9wdHI8TWVzc2FnZURlY29kZXI+IGRlY29kZQog CiAgICAgICAgIC8vIFdlIGdvdCBhIHJlcGx5IHRvIHRoZSBsYXN0IHNlbmQgbWVzc2FnZSwgd2Fr ZSB1cCB0aGUgY2xpZW50IHJ1biBsb29wIHNvIGl0IGNhbiBiZSBwcm9jZXNzZWQuCiAgICAgICAg IGlmIChpID09IG1fcGVuZGluZ1N5bmNSZXBsaWVzLnNpemUoKSkKLSAgICAgICAgICAgIG1fc3lu Y01lc3NhZ2VTdGF0ZS0+d2FrZVVwQ2xpZW50UnVuTG9vcCgpOworICAgICAgICAgICAgU3luY01l c3NhZ2VTdGF0ZTo6c2luZ2xldG9uKCkud2FrZVVwQ2xpZW50UnVuTG9vcCgpOwogCiAgICAgICAg IHJldHVybjsKICAgICB9CkBAIC03MDUsNyArNjcyLDcgQEAgdm9pZCBDb25uZWN0aW9uOjpwcm9j ZXNzSW5jb21pbmdNZXNzYWdlKHN0ZDo6dW5pcXVlX3B0cjxNZXNzYWdlRGVjb2Rlcj4gbWVzc2Fn ZSkKICAgICAvLyBDaGVjayBpZiB0aGlzIGlzIGEgc3luYyBtZXNzYWdlIG9yIGlmIGl0J3MgYSBt ZXNzYWdlIHRoYXQgc2hvdWxkIGJlIGRpc3BhdGNoZWQgZXZlbiB3aGVuIHdhaXRpbmcgZm9yCiAg ICAgLy8gYSBzeW5jIHJlcGx5LiBJZiBpdCBpcywgYW5kIHdlJ3JlIHdhaXRpbmcgZm9yIGEgc3lu YyByZXBseSB0aGlzIG1lc3NhZ2UgbmVlZHMgdG8gYmUgZGlzcGF0Y2hlZC4KICAgICAvLyBJZiB3 ZSBkb24ndCB3ZSdsbCBlbmQgdXAgd2l0aCBhIGRlYWRsb2NrIHdoZXJlIGJvdGggc3luYyBtZXNz YWdlIHNlbmRlcnMgYXJlIHN0dWNrIHdhaXRpbmcgZm9yIGEgcmVwbHkuCi0gICAgaWYgKG1fc3lu Y01lc3NhZ2VTdGF0ZS0+cHJvY2Vzc0luY29taW5nTWVzc2FnZSgqdGhpcywgbWVzc2FnZSkpCisg ICAgaWYgKFN5bmNNZXNzYWdlU3RhdGU6OnNpbmdsZXRvbigpLnByb2Nlc3NJbmNvbWluZ01lc3Nh Z2UoKnRoaXMsIG1lc3NhZ2UpKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBDaGVjayBpZiB3 ZSdyZSB3YWl0aW5nIGZvciB0aGlzIG1lc3NhZ2UuCkBAIC03NDgsNyArNzE1LDcgQEAgdm9pZCBD b25uZWN0aW9uOjpjb25uZWN0aW9uRGlkQ2xvc2UoKQogICAgICAgICBtX3Nob3VsZFdhaXRGb3JT eW5jUmVwbGllcyA9IGZhbHNlOwogCiAgICAgICAgIGlmICghbV9wZW5kaW5nU3luY1JlcGxpZXMu aXNFbXB0eSgpKQotICAgICAgICAgICAgbV9zeW5jTWVzc2FnZVN0YXRlLT53YWtlVXBDbGllbnRS dW5Mb29wKCk7CisgICAgICAgICAgICBTeW5jTWVzc2FnZVN0YXRlOjpzaW5nbGV0b24oKS53YWtl VXBDbGllbnRSdW5Mb29wKCk7CiAKICAgICAgICAgZm9yIChTZWNvbmRhcnlUaHJlYWRQZW5kaW5n U3luY1JlcGx5TWFwOjppdGVyYXRvciBpdGVyID0gbV9zZWNvbmRhcnlUaHJlYWRQZW5kaW5nU3lu Y1JlcGx5TWFwLmJlZ2luKCk7IGl0ZXIgIT0gbV9zZWNvbmRhcnlUaHJlYWRQZW5kaW5nU3luY1Jl cGx5TWFwLmVuZCgpOyArK2l0ZXIpCiAgICAgICAgICAgICBpdGVyLT52YWx1ZS0+c2VtYXBob3Jl LnNpZ25hbCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0Nvbm5l Y3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Db25uZWN0aW9uLmgKaW5kZXgg MWU1ZmQxZTQyZjBhMTg3YWJjOTdhN2NlZmI2YjFkYjllN2E3ZDI3ZS4uNWQyY2NkZGZmMWYxYjg3 MTQxZDVmNjhhMGIwZjgyYjc4M2Q3ZmM4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vSVBDL0Nvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMv Q29ubmVjdGlvbi5oCkBAIC0yOTMsNyArMjkzLDYgQEAgcHJpdmF0ZToKIAogICAgIGNsYXNzIFN5 bmNNZXNzYWdlU3RhdGU7CiAgICAgZnJpZW5kIGNsYXNzIFN5bmNNZXNzYWdlU3RhdGU7Ci0gICAg UmVmUHRyPFN5bmNNZXNzYWdlU3RhdGU+IG1fc3luY01lc3NhZ2VTdGF0ZTsKIAogICAgIE11dGV4 IG1fc3luY1JlcGx5U3RhdGVNdXRleDsKICAgICBib29sIG1fc2hvdWxkV2FpdEZvclN5bmNSZXBs aWVzOwo=