162036 2016-09-15 15:11:47 -0700 Add support for enum class parameters in the message generator 2016-09-16 10:37:42 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162062 1 andersca andersca commit-queue mcatanzaro oldest_to_newest 1230205 0 andersca 2016-09-15 15:11:47 -0700 Add support for enum class parameters in the message generator 1230208 1 289005 andersca 2016-09-15 15:14:36 -0700 Created attachment 289005 Patch 1230216 2 andersca 2016-09-15 15:40:37 -0700 Committed r206000: <http://trac.webkit.org/changeset/206000> 1230434 3 commit-queue 2016-09-16 10:05:26 -0700 Re-opened since this is blocked by bug 162062 1230436 4 mcatanzaro 2016-09-16 10:07:01 -0700 Please see bug #162056. 1230449 5 andersca 2016-09-16 10:37:42 -0700 Committed r206030: <http://trac.webkit.org/changeset/206030> 289005 2016-09-15 15:14:36 -0700 2016-09-15 15:17:19 -0700 Patch bug-162036-20160915151158.patch text/plain 11535 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1OTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjkzYjFiYjE1ZjQyMGM0 ZWExNTJhNzJhNDRiYWY2N2FkM2E0MDI1MS4uNWE2YmQ1Y2YwM2E0NzkxY2MyNmI0YmYyZTgzM2Ex ZWFlYTgyZWZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE2LTA5LTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIGVudW0gY2xhc3MgcGFyYW1ldGVycyBpbiB0aGUgbWVzc2FnZSBnZW5lcmF0b3IKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjAzNgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsc28sIGNvbnZlcnQg dGhlIFdlYlBhZ2U6OlNldExheWVySG9zdGluZ01vZGUgdG8gdGFrZSBhbiBhY3R1YWwgZW51bSBj bGFzcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5OgorICAgICAgICAo ZnVuY3Rpb25fcGFyYW1ldGVyX3R5cGUpOgorICAgICAgICBDaGFuZ2UgdGhpcyB0byB0YWtlIHRo ZSBwYXJhbWV0ZXIga2luZCBhcyB3ZWxsLCBhbmQgdXNlIHRoZSByYXcgdHlwZSBmb3IgZW51bXMu CisKKyAgICAgICAgKGFyZ3VtZW50c190eXBlKToKKyAgICAgICAgKG1lc3NhZ2VfdG9fc3RydWN0 X2RlY2xhcmF0aW9uKToKKyAgICAgICAgUGFzcyB0aGUga2luZCB0byBmdW5jdGlvbl9wYXJhbWV0 ZXJfdHlwZS4KKworICAgICAgICAoZm9yd2FyZF9kZWNsYXJhdGlvbik6CisgICAgICAgIChmb3J3 YXJkX2RlY2xhcmF0aW9uc19mb3JfbmFtZXNwYWNlKToKKyAgICAgICAgRm9yd2FyZCBkZWNsYXJl IGVudW1zIHdpdGggImVudW0gY2xhc3MiLgorCisgICAgICAgIChoZWFkZXJzX2Zvcl90eXBlKToK KyAgICAgICAgQWRkIFdlYktpdDo6TGF5ZXJIb3N0aW5nTW9kZSBhcyBhIHNwZWNpYWwgY2FzZS4K KworICAgICAgICAoZ2VuZXJhdGVfbWVzc2FnZV9oYW5kbGVyKToKKyAgICAgICAgUGFzcyB0aGUg a2luZCB0byBmdW5jdGlvbl9wYXJhbWV0ZXJfdHlwZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0L3BhcnNlci5weToKKyAgICAgICAgKHBhcnNlX3BhcmFtZXRlcnNfc3RyaW5nKToKKyAgICAg ICAgUGFyc2UgJ2VudW0nIGFzIHdlbGwuCisKKyAgICAgICAgKiBTaGFyZWQvTGF5ZXJUcmVlQ29u dGV4dC5oOgorICAgICAgICBBZGQgZW51bSB0cmFpdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp2aWV3RGlk RW50ZXJXaW5kb3cpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxheWVySG9zdGlu Z01vZGVEaWRDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldExheWVySG9zdGluZ01vZGUpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgIENoYW5nZSB1bnNpZ25lZCB0byBM YXllckhvc3RpbmdNb2RlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW46CisgICAgICAgIENoYW5nZSB1bnNpZ25lZCB0byBMYXllckhvc3RpbmdNb2Rl LgorCiAyMDE2LTA5LTE0ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAg ICBkaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2UoKSBjYW4gY2hhbmdlIHNlbGVjdGlvbiB0ZW1w b3JhcmlseTsgdXBkYXRlcyBzaG91bGQgbm90IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv U2NyaXB0cy93ZWJraXQvbWVzc2FnZXMucHkgYi9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtp dC9tZXNzYWdlcy5weQppbmRleCA2MWMzZmU0N2I2ZmMyNGQ3MTM4NTBjOWQyZWI5YWUzZDI1MTFj MmRjLi4zN2FmNmM0NDE2OGY0ZDk5ZWI0NTE3MDNkNzZiNzY0OWY2ZmQ5OTE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weQorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weQpAQCAtNjYsNyArNjYsNyBAQCBkZWYg c3Vycm91bmRfaW5fY29uZGl0aW9uKHN0cmluZywgY29uZGl0aW9uKToKICAgICByZXR1cm4gJyNp ZiAlc1xuJXMjZW5kaWZcbicgJSAoY29uZGl0aW9uLCBzdHJpbmcpCiAKIAotZGVmIGZ1bmN0aW9u X3BhcmFtZXRlcl90eXBlKHR5cGUpOgorZGVmIGZ1bmN0aW9uX3BhcmFtZXRlcl90eXBlKHR5cGUs IGtpbmQpOgogICAgICMgRG9uJ3QgdXNlIHJlZmVyZW5jZXMgZm9yIGJ1aWx0LWluIHR5cGVzLgog ICAgIGJ1aWx0aW5fdHlwZXMgPSBmcm96ZW5zZXQoWwogICAgICAgICAnYm9vbCcsCkBAIC04NSw2 ICs4NSw5IEBAIGRlZiBmdW5jdGlvbl9wYXJhbWV0ZXJfdHlwZSh0eXBlKToKICAgICBpZiB0eXBl IGluIGJ1aWx0aW5fdHlwZXM6CiAgICAgICAgIHJldHVybiB0eXBlCiAKKyAgICBpZiBraW5kID09 ICdlbnVtJzoKKyAgICAgICAgcmV0dXJuIHR5cGUKKwogICAgIHJldHVybiAnY29uc3QgJXMmJyAl IHR5cGUKIAogCkBAIC05Myw3ICs5Niw3IEBAIGRlZiByZXBseV9wYXJhbWV0ZXJfdHlwZSh0eXBl KToKIAogCiBkZWYgYXJndW1lbnRzX3R5cGUobWVzc2FnZSk6Ci0gICAgcmV0dXJuICdzdGQ6OnR1 cGxlPCVzPicgJSAnLCAnLmpvaW4oZnVuY3Rpb25fcGFyYW1ldGVyX3R5cGUocGFyYW1ldGVyLnR5 cGUpIGZvciBwYXJhbWV0ZXIgaW4gbWVzc2FnZS5wYXJhbWV0ZXJzKQorICAgIHJldHVybiAnc3Rk Ojp0dXBsZTwlcz4nICUgJywgJy5qb2luKGZ1bmN0aW9uX3BhcmFtZXRlcl90eXBlKHBhcmFtZXRl ci50eXBlLCBwYXJhbWV0ZXIua2luZCkgZm9yIHBhcmFtZXRlciBpbiBtZXNzYWdlLnBhcmFtZXRl cnMpCiAKIAogZGVmIHJlcGx5X3R5cGUobWVzc2FnZSk6CkBAIC0xMDIsNyArMTA1LDcgQEAgZGVm IHJlcGx5X3R5cGUobWVzc2FnZSk6CiAKIGRlZiBtZXNzYWdlX3RvX3N0cnVjdF9kZWNsYXJhdGlv bihtZXNzYWdlKToKICAgICByZXN1bHQgPSBbXQotICAgIGZ1bmN0aW9uX3BhcmFtZXRlcnMgPSBb KGZ1bmN0aW9uX3BhcmFtZXRlcl90eXBlKHgudHlwZSksIHgubmFtZSkgZm9yIHggaW4gbWVzc2Fn ZS5wYXJhbWV0ZXJzXQorICAgIGZ1bmN0aW9uX3BhcmFtZXRlcnMgPSBbKGZ1bmN0aW9uX3BhcmFt ZXRlcl90eXBlKHgudHlwZSwgeC5raW5kKSwgeC5uYW1lKSBmb3IgeCBpbiBtZXNzYWdlLnBhcmFt ZXRlcnNdCiAgICAgcmVzdWx0LmFwcGVuZCgnY2xhc3MgJXMge1xuJyAlIG1lc3NhZ2UubmFtZSkK ICAgICByZXN1bHQuYXBwZW5kKCdwdWJsaWM6XG4nKQogICAgIHJlc3VsdC5hcHBlbmQoJyAgICB0 eXBlZGVmICVzIEFyZ3VtZW50cztcbicgJSBhcmd1bWVudHNfdHlwZShtZXNzYWdlKSkKQEAgLTEx Myw3ICsxMTYsNyBAQCBkZWYgbWVzc2FnZV90b19zdHJ1Y3RfZGVjbGFyYXRpb24obWVzc2FnZSk6 CiAgICAgcmVzdWx0LmFwcGVuZCgnXG4nKQogICAgIGlmIG1lc3NhZ2UucmVwbHlfcGFyYW1ldGVy cyAhPSBOb25lOgogICAgICAgICBpZiBtZXNzYWdlLmhhc19hdHRyaWJ1dGUoREVMQVlFRF9BVFRS SUJVVEUpOgotICAgICAgICAgICAgc2VuZF9wYXJhbWV0ZXJzID0gWyhmdW5jdGlvbl9wYXJhbWV0 ZXJfdHlwZSh4LnR5cGUpLCB4Lm5hbWUpIGZvciB4IGluIG1lc3NhZ2UucmVwbHlfcGFyYW1ldGVy c10KKyAgICAgICAgICAgIHNlbmRfcGFyYW1ldGVycyA9IFsoZnVuY3Rpb25fcGFyYW1ldGVyX3R5 cGUoeC50eXBlLCB4LmtpbmQpLCB4Lm5hbWUpIGZvciB4IGluIG1lc3NhZ2UucmVwbHlfcGFyYW1l dGVyc10KICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJyAgICBzdHJ1Y3QgRGVsYXllZFJlcGx5 IDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPERlbGF5ZWRSZXBseT4ge1xuJykKICAgICAg ICAgICAgIHJlc3VsdC5hcHBlbmQoJyAgICAgICAgRGVsYXllZFJlcGx5KFBhc3NSZWZQdHI8SVBD OjpDb25uZWN0aW9uPiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4pO1xuJykKICAgICAg ICAgICAgIHJlc3VsdC5hcHBlbmQoJyAgICAgICAgfkRlbGF5ZWRSZXBseSgpO1xuJykKQEAgLTE0 MywyMCArMTQ2LDIxIEBAIGRlZiBtZXNzYWdlX3RvX3N0cnVjdF9kZWNsYXJhdGlvbihtZXNzYWdl KToKICAgICByZXR1cm4gc3Vycm91bmRfaW5fY29uZGl0aW9uKCcnLmpvaW4ocmVzdWx0KSwgbWVz c2FnZS5jb25kaXRpb24pCiAKIAotZGVmIHN0cnVjdF9vcl9jbGFzcyhuYW1lc3BhY2UsIGtpbmRf YW5kX3R5cGUpOgorZGVmIGZvcndhcmRfZGVjbGFyYXRpb24obmFtZXNwYWNlLCBraW5kX2FuZF90 eXBlKToKICAgICBraW5kLCB0eXBlID0ga2luZF9hbmRfdHlwZQogCiAgICAgcXVhbGlmaWVkX25h bWUgPSAnJXM6OiVzJyAlIChuYW1lc3BhY2UsIHR5cGUpCiAgICAgaWYga2luZCA9PSAnc3RydWN0 JzoKICAgICAgICAgcmV0dXJuICdzdHJ1Y3QgJXMnICUgdHlwZQorICAgIGVsaWYga2luZCA9PSAn ZW51bSc6CisgICAgICAgIHJldHVybiAnZW51bSBjbGFzcyAlcycgJSB0eXBlCiAgICAgZWxzZToK ICAgICAgICAgcmV0dXJuICdjbGFzcyAlcycgJSB0eXBlCiAKLQogZGVmIGZvcndhcmRfZGVjbGFy YXRpb25zX2Zvcl9uYW1lc3BhY2UobmFtZXNwYWNlLCBraW5kX2FuZF90eXBlcyk6CiAgICAgcmVz dWx0ID0gW10KICAgICByZXN1bHQuYXBwZW5kKCduYW1lc3BhY2UgJXMge1xuJyAlIG5hbWVzcGFj ZSkKLSAgICByZXN1bHQgKz0gWycgICAgJXM7XG4nICUgc3RydWN0X29yX2NsYXNzKG5hbWVzcGFj ZSwgeCkgZm9yIHggaW4ga2luZF9hbmRfdHlwZXNdCisgICAgcmVzdWx0ICs9IFsnICAgICVzO1xu JyAlIGZvcndhcmRfZGVjbGFyYXRpb24obmFtZXNwYWNlLCB4KSBmb3IgeCBpbiBraW5kX2FuZF90 eXBlc10KICAgICByZXN1bHQuYXBwZW5kKCd9XG4nKQogICAgIHJldHVybiAnJy5qb2luKHJlc3Vs dCkKIApAQCAtMzcwLDYgKzM3NCw3IEBAIGRlZiBoZWFkZXJzX2Zvcl90eXBlKHR5cGUpOgogICAg ICAgICAnc3RydWN0IFdlYktpdDo6V2ViVXNlclN0eWxlU2hlZXREYXRhJzogWyciV2ViVXNlckNv bnRlbnRDb250cm9sbGVyRGF0YVR5cGVzLmgiJ10sCiAgICAgICAgICdzdHJ1Y3QgV2ViS2l0OjpX ZWJTY3JpcHRNZXNzYWdlSGFuZGxlckRhdGEnOiBbJyJXZWJVc2VyQ29udGVudENvbnRyb2xsZXJE YXRhVHlwZXMuaCInXSwKICAgICAgICAgJ3N0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVf cG9pbnQnOiBbJzxjaHJvbm8+J10sCisgICAgICAgICdXZWJLaXQ6OkxheWVySG9zdGluZ01vZGUn OiBbJyJMYXllclRyZWVDb250ZXh0LmgiJ10sCiAgICAgfQogCiAgICAgaGVhZGVycyA9IFtdCkBA IC00NzMsNyArNDc4LDcgQEAgZGVmIGdlbmVyYXRlX21lc3NhZ2VfaGFuZGxlcihmaWxlKToKICAg ICAgICAgcmVzdWx0LmFwcGVuZCgnbmFtZXNwYWNlIE1lc3NhZ2VzIHtcblxubmFtZXNwYWNlICVz IHtcblxuJyAlIHJlY2VpdmVyLm5hbWUpCiAKICAgICAgICAgZm9yIG1lc3NhZ2UgaW4gc3luY19k ZWxheWVkX21lc3NhZ2VzOgotICAgICAgICAgICAgc2VuZF9wYXJhbWV0ZXJzID0gWyhmdW5jdGlv bl9wYXJhbWV0ZXJfdHlwZSh4LnR5cGUpLCB4Lm5hbWUpIGZvciB4IGluIG1lc3NhZ2UucmVwbHlf cGFyYW1ldGVyc10KKyAgICAgICAgICAgIHNlbmRfcGFyYW1ldGVycyA9IFsoZnVuY3Rpb25fcGFy YW1ldGVyX3R5cGUoeC50eXBlLCB4LmtpbmQpLCB4Lm5hbWUpIGZvciB4IGluIG1lc3NhZ2UucmVw bHlfcGFyYW1ldGVyc10KIAogICAgICAgICAgICAgaWYgbWVzc2FnZS5jb25kaXRpb246CiAgICAg ICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgnI2lmICVzXG5cbicgJSBtZXNzYWdlLmNvbmRpdGlv bikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0L3BhcnNlci5weSBi L1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0L3BhcnNlci5weQppbmRleCA2OWE4MWRmZWY2 MmFmODU4NDJjNDQwOTEyYmQ2NTk1YzkyMTNkNTY2Li4xZTRjYWRlZTU5ZDczMTcwNDkzYWRlMDAy YWQ3ZWZhMjFjZDViYzFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtp dC9wYXJzZXIucHkKKysrIGIvU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJraXQvcGFyc2VyLnB5 CkBAIC0xMzMsNiArMTMzLDkgQEAgZGVmIHBhcnNlX3BhcmFtZXRlcnNfc3RyaW5nKHBhcmFtZXRl cnNfc3RyaW5nKToKICAgICAgICAgaWYgc3BsaXRbMF0uc3RhcnRzd2l0aCgnc3RydWN0ICcpOgog ICAgICAgICAgICAgcGFyYW1ldGVyX2tpbmQgPSAnc3RydWN0JwogICAgICAgICAgICAgc3BsaXRb MF0gPSBzcGxpdFswXVs3Ol0KKyAgICAgICAgZWxpZiBzcGxpdFswXS5zdGFydHN3aXRoKCdlbnVt ICcpOgorICAgICAgICAgICAgcGFyYW1ldGVyX2tpbmQgPSAnZW51bScKKyAgICAgICAgICAgIHNw bGl0WzBdID0gc3BsaXRbMF1bNTpdCiAKICAgICAgICAgcGFyYW1ldGVyX3R5cGUgPSBzcGxpdFsw XQogICAgICAgICBwYXJhbWV0ZXJfbmFtZSA9IHNwbGl0WzFdCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L0xheWVyVHJlZUNvbnRleHQuaAppbmRleCA0N2ZiNjEzOTFkMGY0NTljOTQ3MmUxYmQyZDg0ZDlj ZGUyMDhkMTc0Li40NzU2ZjYwNWIyMTEzMzJjODA4ZThiZDAzOWFhNzJiMjA0NmNiZDcwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTGF5ZXJUcmVlQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9MYXllclRyZWVDb250ZXh0LmgKQEAgLTIzLDEwICsyMywxMCBA QAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNpZm5kZWYgTGF5 ZXJUcmVlQ29udGV4dF9oCi0jZGVmaW5lIExheWVyVHJlZUNvbnRleHRfaAorI3ByYWdtYSBvbmNl CiAKICNpbmNsdWRlIDxzdGRpbnQuaD4KKyNpbmNsdWRlIDx3dGYvRW51bVRyYWl0cy5oPgogCiBu YW1lc3BhY2UgSVBDIHsKIGNsYXNzIERlY29kZXI7CkBAIC02Miw2ICs2MiwxNiBAQCBpbmxpbmUg Ym9vbCBvcGVyYXRvciE9KGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGEsIGNvbnN0IExheWVyVHJl ZUNvbnRleHQmIGIpCiAgICAgcmV0dXJuICEoYSA9PSBiKTsKIH0KIAotfTsKK30KIAotI2VuZGlm IC8vIExheWVyVHJlZUNvbnRleHRfaAorbmFtZXNwYWNlIFdURiB7Cit0ZW1wbGF0ZTw+IHN0cnVj dCBFbnVtVHJhaXRzPFdlYktpdDo6TGF5ZXJIb3N0aW5nTW9kZT4geworICAgIHVzaW5nIHZhbHVl cyA9IEVudW1WYWx1ZXM8CisgICAgICAgIFdlYktpdDo6TGF5ZXJIb3N0aW5nTW9kZSwKKyNpZiBI QVZFKE9VVF9PRl9QUk9DRVNTX0xBWUVSX0hPU1RJTkcpCisgICAgICAgIFdlYktpdDo6TGF5ZXJI b3N0aW5nTW9kZTo6T3V0T2ZQcm9jZXNzLAorI2VuZGlmCisgICAgICAgIFdlYktpdDo6TGF5ZXJI b3N0aW5nTW9kZTo6SW5Qcm9jZXNzCisgICAgPjsKK307Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDAyYzJjMjIwOGI5Yjk4N2U3NzNkMGJlNGVjMDI3 MzZiODYyZWQ5ODcuLjRiZTkzZjA3ZjI1YTJlZjUxMWEyM2E5M2Y3YmY1MjBiMTc5ZWM2YzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xNTAzLDcgKzE1 MDMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6dmlld0RpZEVudGVyV2luZG93KCkKICAgICBMYXll ckhvc3RpbmdNb2RlIGxheWVySG9zdGluZ01vZGUgPSBtX3BhZ2VDbGllbnQudmlld0xheWVySG9z dGluZ01vZGUoKTsKICAgICBpZiAobV9sYXllckhvc3RpbmdNb2RlICE9IGxheWVySG9zdGluZ01v ZGUpIHsKICAgICAgICAgbV9sYXllckhvc3RpbmdNb2RlID0gbGF5ZXJIb3N0aW5nTW9kZTsKLSAg ICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRMYXllckhvc3RpbmdN b2RlKHN0YXRpY19jYXN0PHVuc2lnbmVkPihsYXllckhvc3RpbmdNb2RlKSksIG1fcGFnZUlEKTsK KyAgICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRMYXllckhvc3Rp bmdNb2RlKGxheWVySG9zdGluZ01vZGUpLCBtX3BhZ2VJRCk7CiAgICAgfQogfQogCkBAIC0xNjIw LDcgKzE2MjAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bGF5ZXJIb3N0aW5nTW9kZURpZENoYW5n ZSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fbGF5ZXJIb3N0aW5nTW9kZSA9IGxheWVySG9z dGluZ01vZGU7Ci0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRMYXll ckhvc3RpbmdNb2RlKHN0YXRpY19jYXN0PHVuc2lnbmVkPihsYXllckhvc3RpbmdNb2RlKSksIG1f cGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldExheWVy SG9zdGluZ01vZGUobGF5ZXJIb3N0aW5nTW9kZSksIG1fcGFnZUlEKTsKIH0KIAogdm9pZCBXZWJQ YWdlUHJveHk6OndhaXRGb3JEaWRVcGRhdGVWaWV3U3RhdGUoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDg0NzRmZGI4ZjJkMWMyZmM0ZGU3 MDBlZDgxMDdmNWUyMzczNDgzNmYuLmM0NmEzODkyYTA2MGYyOGUzODQzZGU1MDU4N2RmYzk4NTg1 NzRjYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKQEAgLTU3Nyw3ICs1NzcsNyBAQCB2b2lkIFdlYlBhZ2U6OnJlaW5pdGlhbGl6ZVdlYlBhZ2Uo Y29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICAgICBpZiAobV92 aWV3U3RhdGUgIT0gcGFyYW1ldGVycy52aWV3U3RhdGUpCiAgICAgICAgIHNldFZpZXdTdGF0ZShw YXJhbWV0ZXJzLnZpZXdTdGF0ZSwgZmFsc2UsIFZlY3Rvcjx1aW50NjRfdD4oKSk7CiAgICAgaWYg KG1fbGF5ZXJIb3N0aW5nTW9kZSAhPSBwYXJhbWV0ZXJzLmxheWVySG9zdGluZ01vZGUpCi0gICAg ICAgIHNldExheWVySG9zdGluZ01vZGUoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHBhcmFtZXRlcnMu bGF5ZXJIb3N0aW5nTW9kZSkpOworICAgICAgICBzZXRMYXllckhvc3RpbmdNb2RlKHBhcmFtZXRl cnMubGF5ZXJIb3N0aW5nTW9kZSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6c2V0UGFnZUFjdGl2aXR5 U3RhdGUoUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGFjdGl2aXR5U3RhdGUpCkBAIC0yNjA4LDkg KzI2MDgsOSBAQCB2b2lkIFdlYlBhZ2U6OnNldFZpZXdTdGF0ZShWaWV3U3RhdGU6OkZsYWdzIHZp ZXdTdGF0ZSwgYm9vbCB3YW50c0RpZFVwZGF0ZVZpZXdTdAogICAgICAgICB1cGRhdGVJc0luV2lu ZG93KCk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6c2V0TGF5ZXJIb3N0aW5nTW9kZSh1bnNpZ25lZCBs YXllckhvc3RpbmdNb2RlKQordm9pZCBXZWJQYWdlOjpzZXRMYXllckhvc3RpbmdNb2RlKExheWVy SG9zdGluZ01vZGUgbGF5ZXJIb3N0aW5nTW9kZSkKIHsKLSAgICBtX2xheWVySG9zdGluZ01vZGUg PSBzdGF0aWNfY2FzdDxMYXllckhvc3RpbmdNb2RlPihsYXllckhvc3RpbmdNb2RlKTsKKyAgICBt X2xheWVySG9zdGluZ01vZGUgPSBsYXllckhvc3RpbmdNb2RlOwogCiAgICAgbV9kcmF3aW5nQXJl YS0+c2V0TGF5ZXJIb3N0aW5nTW9kZShtX2xheWVySG9zdGluZ01vZGUpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCBiZTgwMmM3OGY4MTk5NjQw ZTQ2OTEwNDU3MjY3M2RjZDliZGI0YzczLi5mYzk1MmEzZTgyYmMwNjhlNjRiMzE5ZjQ0MTE4ZTg0 ODA4YjJlN2M5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKQEAgLTQzOSw3ICs0MzksNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1Zpc2libGVPck9jY2x1 ZGVkKCkgY29uc3QgeyByZXR1cm4gbV92aWV3U3RhdGUgJiBXZWJDb3JlOjpWaWV3U3RhdGU6Oklz VmlzaWJsZU9yT2NjbHVkZWQ7IH0KIAogICAgIExheWVySG9zdGluZ01vZGUgbGF5ZXJIb3N0aW5n TW9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5ZXJIb3N0aW5nTW9kZTsgfQotICAgIHZvaWQgc2V0 TGF5ZXJIb3N0aW5nTW9kZSh1bnNpZ25lZCk7CisgICAgdm9pZCBzZXRMYXllckhvc3RpbmdNb2Rl KExheWVySG9zdGluZ01vZGUpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdm9pZCB1cGRh dGVQbHVnaW5zQWN0aXZlQW5kRm9jdXNlZFN0YXRlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IGU3ODE3NThl ZDQ0MGY3ZjA5ZjViM2Y2ZTgzOGU0MGQyYjRjN2E0NjEuLjUwMjMzMDgyMWJlZmI3OWFjMGEzYjdi ZjE1MmY3ZjQzNWE1MDg0NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0yMyw3ICsyMyw3IEBACiBtZXNzYWdl cyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICAgICBTZXRJbml0aWFsRm9jdXMoYm9vbCBm b3J3YXJkLCBib29sIGlzS2V5Ym9hcmRFdmVudFZhbGlkLCBXZWJLaXQ6OldlYktleWJvYXJkRXZl bnQgZXZlbnQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgU2V0Vmlld1N0YXRlKHVuc2lnbmVk IHZpZXdTdGF0ZSwgYm9vbCB3YW50c0RpZFVwZGF0ZVZpZXdTdGF0ZSwgVmVjdG9yPHVpbnQ2NF90 PiBjYWxsYmFja0lEcykKLSAgICBTZXRMYXllckhvc3RpbmdNb2RlKHVuc2lnbmVkIGxheWVySG9z dGluZ01vZGUpCisgICAgU2V0TGF5ZXJIb3N0aW5nTW9kZShlbnVtIFdlYktpdDo6TGF5ZXJIb3N0 aW5nTW9kZSBsYXllckhvc3RpbmdNb2RlKQogCiAgICAgU2V0U2Vzc2lvbklEKFdlYkNvcmU6OlNl c3Npb25JRCBzZXNzaW9uSUQpCiAK