54229 2011-02-10 11:38:50 -0800 [Qt] Remove the use of deprecated qVariant* 2011-02-10 13:18:41 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 ademar ademar commit-queue kling laszlo.gombos oldest_to_newest 349232 0 ademar 2011-02-10 11:38:50 -0800 QtWebKit uses deprecated qVariantFromValue() and similar calls, when the proper method to use would be QVariant::fromValue() and similar. This change was applied to all Qt sources (including qt/src/3rdparty/webkit there), so we should probably do the same on QtWebKit. Patch is on the way. 349275 1 82026 ademar 2011-02-10 12:33:03 -0800 Created attachment 82026 patch 349315 2 82026 commit-queue 2011-02-10 13:18:36 -0800 Comment on attachment 82026 patch Clearing flags on attachment: 82026 Committed r78263: <http://trac.webkit.org/changeset/78263> 349316 3 commit-queue 2011-02-10 13:18:41 -0800 All reviewed patches have been landed. Closing bug. 82026 2011-02-10 12:33:03 -0800 2011-02-10 13:18:36 -0800 patch 0001-Remove-the-use-of-deprecated-qVariant.patch text/plain 15241 ademar RnJvbSBkZmY3MTM2MzhjNTY5MjllZTBiYjBhZjkyNTBlZDZiNTkzZDUyNmZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGVtYXIgZGUgU291emEgUmVpcyBKciA8YWRlbWFyLnJlaXNA b3BlbmJvc3NhLm9yZz4KRGF0ZTogVGh1LCAxMCBGZWIgMjAxMSAxNjoyMTo1OCAtMDMwMApTdWJq ZWN0OiBbUEFUQ0hdIFJlbW92ZSB0aGUgdXNlIG9mIGRlcHJlY2F0ZWQgcVZhcmlhbnQqCgpUaGlz IHdhcyBhcHBsaWVkIG9uIHRoZSBRdCByZXBvc2l0b3J5IGFuZCBhZmZlY3RzIFF0V2ViS2l0IHRo ZXJlLgooNjMzZjNmNDVlNTQyMDY2M2NmNGNlYWRlYTc5ZTYyZmVhNDRjZDJlYikKClRoZSBzaWRl IGVmZmVjdCBvZiB0aGlzIGNoYW5nZSBpcyB0aGF0IHdlIHdvbid0IGJlIGFibGUgdG8gYnVpbGQK UXRXZWJLaXQgd2l0aCBNU1ZDIDYsIGFzIGl0IGRvZXNuJ3Qgc3VwcG9ydCBtZW1iZXIgdGVtcGxh dGUgZnVuY3Rpb25zCihub3Qgc3VyZSBpZiBpdCdzIHBvc3NpYmxlIHRvZGF5IGFueXdheSkuCgpP cmlnaW5hbCBwYXRjaCBmcm9tIE9saXZpZXIgR29mZmFydCA8b2xpdmllci5nb2ZmYXJ0QG5va2lh LmNvbT4sIHdpdGgKcmV2aWV3IHJlcG9ydGVkIGFzIGJlaW5nIGZyb20gdGhlIG1haWxpbmcgbGlz dC4KClRoZSBjaGFuZ2VzIGFyZSByZXN1bHQgb2YgdGhlIGZvbGxvd2luZyBjb21tYW5kczoKCiAg ICBnaXQgZ3JlcCAtTyJzZWQgLWkgJ3MvcVZhcmlhbnRWYWx1ZTwvcXZhcmlhbnRfY2FzdDwvJyIg cVZhcmlhbnRWYWx1ZQogICAgZ2l0IGdyZXAgLU8ic2VkIC1pICdzL3FWYXJpYW50U2V0VmFsdWUo XChbXiYqXCgpLF0qXCksICovXFwxLnNldFZhbHVlKC8nIiBxVmFyaWFudFNldFZhbHVlCiAgICBn aXQgZ3JlcCAtTyJzZWQgLWkgJ3MvcVZhcmlhbnRTZXRWYWx1ZSAqPFwoW14+XSpcKT4gKihcKFte JipcKCksXSpcKSwgKi9cXDIuc2V0VmFsdWU8XFwxPigvJyIgcVZhcmlhbnRTZXRWYWx1ZQogICAg Z2l0IGdyZXAgLU8ic2VkIC1pICdzL3FWYXJpYW50Q2FuQ29udmVydCAqPFwoW14+XSpcKT4gKihc KFteJipcKCksXSpcKSkvXFwyLmNhbkNvbnZlcnQ8XFwxPigpL2cnIiBxVmFyaWFudENhbkNvbnZl cnQKICAgIGdpdCBncmVwIC1PInNlZCAtaSAncy9xVmFyaWFudENhbkNvbnZlcnQgKjxcKFtePl0q XCk+ICooXChbXiYqXCgpLF0qKFteJipcKCksXSopXCkpL1xcMi5jYW5Db252ZXJ0PFxcMT4oKS9n JyIgcVZhcmlhbnRDYW5Db252ZXJ0CiAgICBnaXQgZ3JlcCAtTyJzZWQgLWkgJ3MvcVZhcmlhbnRG cm9tVmFsdWVcKCAqWyg8XVwpL1FWYXJpYW50Ojpmcm9tVmFsdWVcXDEvJyIgcVZhcmlhbnRGcm9t VmFsdWUKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMzEgKysrKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRf cnVudGltZS5jcHAgICAgICAgICAgICB8ICAgMTIgKysrLS0tCiAuLi4vcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwICB8ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQv cXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgIHwgICA0MSArKysrKysrKysrKysr KysrKysrKwogLi4uL3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNw cCAgfCAgICA0ICstCiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZy YW1lLmNwcCB8ICAgMjggKysrKysrKy0tLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgOTUgaW5zZXJ0 aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMyY2M4ZjMuLmNlODdhY2Eg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMS0wMi0xMCAgQWRlbWFyIGRlIFNvdXph IFJlaXMgSnIgIDxhZGVtYXIucmVpc0BvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUmVtb3ZlIHRoZSB1c2Ugb2YgZGVw cmVjYXRlZCBxVmFyaWFudCoKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU0MjI5CisKKyAgICAgICAgVGhpcyB3YXMgYXBwbGllZCBvbiB0aGUgUXQgcmVw b3NpdG9yeSBhbmQgYWZmZWN0cyBRdFdlYktpdCB0aGVyZS4KKyAgICAgICAgKDYzM2YzZjQ1ZTU0 MjA2NjNjZjRjZWFkZWE3OWU2MmZlYTQ0Y2QyZWIpCisKKyAgICAgICAgVGhlIHNpZGUgZWZmZWN0 IG9mIHRoaXMgY2hhbmdlIGlzIHRoYXQgd2Ugd29uJ3QgYmUgYWJsZSB0byBidWlsZAorICAgICAg ICBRdFdlYktpdCB3aXRoIE1TVkMgNiwgYXMgaXQgZG9lc24ndCBzdXBwb3J0IG1lbWJlciB0ZW1w bGF0ZSBmdW5jdGlvbnMKKyAgICAgICAgKG5vdCBzdXJlIGlmIGl0J3MgcG9zc2libGUgdG9kYXkg YW55d2F5KS4KKworICAgICAgICBPcmlnaW5hbCBwYXRjaCBmcm9tIE9saXZpZXIgR29mZmFydCA8 b2xpdmllci5nb2ZmYXJ0QG5va2lhLmNvbT4sIHdpdGgKKyAgICAgICAgcmV2aWV3IHJlcG9ydGVk IGFzIGJlaW5nIGZyb20gdGhlIG1haWxpbmcgbGlzdC4KKworICAgICAgICBUaGUgY2hhbmdlcyBh cmUgcmVzdWx0IG9mIHRoZSBmb2xsb3dpbmcgY29tbWFuZHM6CisKKyAgICAgICAgICAgIGdpdCBn cmVwIC1PInNlZCAtaSAncy9xVmFyaWFudFZhbHVlPC9xdmFyaWFudF9jYXN0PC8nIiBxVmFyaWFu dFZhbHVlCisgICAgICAgICAgICBnaXQgZ3JlcCAtTyJzZWQgLWkgJ3MvcVZhcmlhbnRTZXRWYWx1 ZShcKFteJipcKCksXSpcKSwgKi9cXDEuc2V0VmFsdWUoLyciIHFWYXJpYW50U2V0VmFsdWUKKyAg ICAgICAgICAgIGdpdCBncmVwIC1PInNlZCAtaSAncy9xVmFyaWFudFNldFZhbHVlICo8XChbXj5d KlwpPiAqKFwoW14mKlwoKSxdKlwpLCAqL1xcMi5zZXRWYWx1ZTxcXDE+KC8nIiBxVmFyaWFudFNl dFZhbHVlCisgICAgICAgICAgICBnaXQgZ3JlcCAtTyJzZWQgLWkgJ3MvcVZhcmlhbnRDYW5Db252 ZXJ0ICo8XChbXj5dKlwpPiAqKFwoW14mKlwoKSxdKlwpKS9cXDIuY2FuQ29udmVydDxcXDE+KCkv ZyciIHFWYXJpYW50Q2FuQ29udmVydAorICAgICAgICAgICAgZ2l0IGdyZXAgLU8ic2VkIC1pICdz L3FWYXJpYW50Q2FuQ29udmVydCAqPFwoW14+XSpcKT4gKihcKFteJipcKCksXSooW14mKlwoKSxd KilcKSkvXFwyLmNhbkNvbnZlcnQ8XFwxPigpL2cnIiBxVmFyaWFudENhbkNvbnZlcnQKKyAgICAg ICAgICAgIGdpdCBncmVwIC1PInNlZCAtaSAncy9xVmFyaWFudEZyb21WYWx1ZVwoICpbKDxdXCkv UVZhcmlhbnQ6OmZyb21WYWx1ZVxcMS8nIiBxVmFyaWFudEZyb21WYWx1ZQorCisgICAgICAgICog YnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Y29udmVy dFZhbHVlVG9RVmFyaWFudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQ bGF5ZXJQcml2YXRlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl UXQ6OmNvbW1pdExvYWQpOgorCiAyMDExLTAyLTEwICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1l bmFyZEBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmNwcAppbmRleCA0OGE1YTA1Li41NTA3ZmM5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCkBAIC01ODcsNyArNTg3 LDcgQEAgUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFyaWFudChFeGVjU3RhdGUqIGV4ZWMsIEpT VmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6VHlwZQogICAgICAgICAgICAgICAgICAgICBpZiAocXN0 cmluZy5taWQobGFzdFNsYXNoICsgMSkuY29udGFpbnMoUUxhdGluMUNoYXIoJ2knKSkpCiAgICAg ICAgICAgICAgICAgICAgICAgICByZWFsUmUuc2V0Q2FzZVNlbnNpdGl2aXR5KFF0OjpDYXNlSW5z ZW5zaXRpdmUpOwogCi0gICAgICAgICAgICAgICAgICAgIHJldCA9IHFWYXJpYW50RnJvbVZhbHVl KHJlYWxSZSk7CisgICAgICAgICAgICAgICAgICAgIHJldCA9IFFWYXJpYW50Ojpmcm9tVmFsdWUo cmVhbFJlKTsKICAgICAgICAgICAgICAgICAgICAgZGlzdCA9IDA7CiAgICAgICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgcUNvbnZEZWJ1ZygpIDw8ICJjb3VsZG4ndCBw YXJzZSBhIEpTIHJlZ2V4cCI7CkBAIC01OTgsNyArNTk4LDcgQEAgUVZhcmlhbnQgY29udmVydFZh bHVlVG9RVmFyaWFudChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6 VHlwZQogCiAgICAgICAgICAgICAgICAgUVJlZ0V4cCByZShxc3RyaW5nKTsKICAgICAgICAgICAg ICAgICBpZiAocmUuaXNWYWxpZCgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJldCA9IHFWYXJp YW50RnJvbVZhbHVlKHJlKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0ID0gUVZhcmlhbnQ6OmZy b21WYWx1ZShyZSk7CiAgICAgICAgICAgICAgICAgICAgIGRpc3QgPSAxMDsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CkBAIC02MTAsNyArNjEwLDcgQEAgUVZhcmlhbnQgY29udmVy dFZhbHVlVG9RVmFyaWFudChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRhVHlw ZTo6VHlwZQogICAgICAgICAgICAgICAgIGlmIChxdGluc3QpIHsKICAgICAgICAgICAgICAgICAg ICAgaWYgKHF0aW5zdC0+Z2V0T2JqZWN0KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHFD b252RGVidWcoKSA8PCAiZm91bmQgaW5zdGFuY2UsIHdpdGggb2JqZWN0OiIgPDwgKHZvaWQqKSBx dGluc3QtPmdldE9iamVjdCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgcmV0ID0gcVZhcmlh bnRGcm9tVmFsdWUocXRpbnN0LT5nZXRPYmplY3QoKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICByZXQgPSBRVmFyaWFudDo6ZnJvbVZhbHVlKHF0aW5zdC0+Z2V0T2JqZWN0KCkpOwogICAgICAg ICAgICAgICAgICAgICAgICAgcUNvbnZEZWJ1ZygpIDw8IHJldDsKICAgICAgICAgICAgICAgICAg ICAgICAgIGRpc3QgPSAwOwogICAgICAgICAgICAgICAgICAgICB9IGVsc2UgewpAQCAtNjIxLDcg KzYyMSw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVj LCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gTnVsbCkgewogICAgICAgICAgICAgICAgIFFPYmpl Y3QqIG51bGxvYmogPSAwOwotICAgICAgICAgICAgICAgIHJldCA9IHFWYXJpYW50RnJvbVZhbHVl KG51bGxvYmopOworICAgICAgICAgICAgICAgIHJldCA9IFFWYXJpYW50Ojpmcm9tVmFsdWUobnVs bG9iaik7CiAgICAgICAgICAgICAgICAgZGlzdCA9IDA7CiAgICAgICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgICAgIHFDb252RGVidWcoKSA8PCAicHJldmlvdXMgdHlwZSB3YXMgbm90IGFu IG9iamVjdDoiIDw8IHR5cGU7CkBAIC02MzQsNyArNjM0LDcgQEAgUVZhcmlhbnQgY29udmVydFZh bHVlVG9RVmFyaWFudChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6 VHlwZQogICAgICAgICAgICAgICAgIGlmIChxdGluc3QpIHsKICAgICAgICAgICAgICAgICAgICAg aWYgKHF0aW5zdC0+Z2V0T2JqZWN0KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHFDb252 RGVidWcoKSA8PCAiZm91bmQgaW5zdGFuY2UsIHdpdGggb2JqZWN0OiIgPDwgKHZvaWQqKSBxdGlu c3QtPmdldE9iamVjdCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgcmV0ID0gcVZhcmlhbnRG cm9tVmFsdWUoKHZvaWQgKilxdGluc3QtPmdldE9iamVjdCgpKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHJldCA9IFFWYXJpYW50Ojpmcm9tVmFsdWUoKHZvaWQgKilxdGluc3QtPmdldE9iamVj dCgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHFDb252RGVidWcoKSA8PCByZXQ7CiAgICAg ICAgICAgICAgICAgICAgICAgICBkaXN0ID0gMDsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNl IHsKQEAgLTY0NCw3ICs2NDQsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4 ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAgICAg ICAgICAgICAgIHFDb252RGVidWcoKSA8PCAid2Fzbid0IGEgcXRpbnN0YW5jZSI7CiAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIGlmICh0eXBlID09IE51bGwpIHsKLSAgICAg ICAgICAgICAgICByZXQgPSBxVmFyaWFudEZyb21WYWx1ZSgodm9pZCopMCk7CisgICAgICAgICAg ICAgICAgcmV0ID0gUVZhcmlhbnQ6OmZyb21WYWx1ZSgodm9pZCopMCk7CiAgICAgICAgICAgICAg ICAgZGlzdCA9IDA7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gTnVtYmVyKSB7CiAg ICAgICAgICAgICAgICAgLy8gSSBkb24ndCB0aGluayB0aGF0IGNvbnZlcnRpbmcgYSBkb3VibGUg dG8gYSBwb2ludGVyIGlzIGEgd2lzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCmluZGV4IDY0YTgz Y2UuLmNhZjljMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHAKQEAgLTIxNSw3ICsyMTUsNyBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF0Ojpjb21taXRMb2FkKGNvbnN0IFN0cmluZyYgdXJs KQogICAgICAgICAgICAgLy8gRG9uJ3Qgc2V0IHRoZSBoZWFkZXIgaWYgdGhlcmUgYXJlIG5vIGNv b2tpZXMuCiAgICAgICAgICAgICAvLyBUaGlzIHByZXZlbnRzIGEgd2FybmluZyBmcm9tIGJlaW5n IGVtaXR0ZWQuCiAgICAgICAgICAgICBpZiAoIWNvb2tpZXMuaXNFbXB0eSgpKQotICAgICAgICAg ICAgICAgIHJlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29va2llSGVhZGVyLCBx VmFyaWFudEZyb21WYWx1ZShjb29raWVzKSk7CisgICAgICAgICAgICAgICAgcmVxdWVzdC5zZXRI ZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpDb29raWVIZWFkZXIsIFFWYXJpYW50Ojpmcm9tVmFsdWUo Y29va2llcykpOwogCiAgICAgICAgICAgICAvLyBTZXQgdGhlIHJlZmZlcmVyLCBidXQgbm90IHdo ZW4gcmVxdWVzdGluZyBpbnNlY3VyZSBjb250ZW50IGZyb20gYSBzZWN1cmUgcGFnZQogICAgICAg ICAgICAgUVVybCBkb2N1bWVudFVybCA9IFFVcmwoUVN0cmluZyhkb2N1bWVudC0+ZG9jdW1lbnRV UkkoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCAyMjlmNmVkLi5hOTllNDQ0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDQ0IEBACisyMDExLTAyLTEwICBBZGVtYXIgZGUgU291emEgUmVpcyBKciAg PGFkZW1hci5yZWlzQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XSBSZW1vdmUgdGhlIHVzZSBvZiBkZXByZWNhdGVkIHFW YXJpYW50KgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTQyMjkKKworICAgICAgICBUaGlzIHdhcyBhcHBsaWVkIG9uIHRoZSBRdCByZXBvc2l0b3J5IGFu ZCBhZmZlY3RzIFF0V2ViS2l0IHRoZXJlLgorICAgICAgICAoNjMzZjNmNDVlNTQyMDY2M2NmNGNl YWRlYTc5ZTYyZmVhNDRjZDJlYikKKworICAgICAgICBUaGUgc2lkZSBlZmZlY3Qgb2YgdGhpcyBj aGFuZ2UgaXMgdGhhdCB3ZSB3b24ndCBiZSBhYmxlIHRvIGJ1aWxkCisgICAgICAgIFF0V2ViS2l0 IHdpdGggTVNWQyA2LCBhcyBpdCBkb2Vzbid0IHN1cHBvcnQgbWVtYmVyIHRlbXBsYXRlIGZ1bmN0 aW9ucworICAgICAgICAobm90IHN1cmUgaWYgaXQncyBwb3NzaWJsZSB0b2RheSBhbnl3YXkpLgor CisgICAgICAgIE9yaWdpbmFsIHBhdGNoIGZyb20gT2xpdmllciBHb2ZmYXJ0IDxvbGl2aWVyLmdv ZmZhcnRAbm9raWEuY29tPiwgd2l0aAorICAgICAgICByZXZpZXcgcmVwb3J0ZWQgYXMgYmVpbmcg ZnJvbSB0aGUgbWFpbGluZyBsaXN0LgorCisgICAgICAgIFRoZSBjaGFuZ2VzIGFyZSByZXN1bHQg b2YgdGhlIGZvbGxvd2luZyBjb21tYW5kczoKKworICAgICAgICAgICAgZ2l0IGdyZXAgLU8ic2Vk IC1pICdzL3FWYXJpYW50VmFsdWU8L3F2YXJpYW50X2Nhc3Q8LyciIHFWYXJpYW50VmFsdWUKKyAg ICAgICAgICAgIGdpdCBncmVwIC1PInNlZCAtaSAncy9xVmFyaWFudFNldFZhbHVlKFwoW14mKlwo KSxdKlwpLCAqL1xcMS5zZXRWYWx1ZSgvJyIgcVZhcmlhbnRTZXRWYWx1ZQorICAgICAgICAgICAg Z2l0IGdyZXAgLU8ic2VkIC1pICdzL3FWYXJpYW50U2V0VmFsdWUgKjxcKFtePl0qXCk+ICooXChb XiYqXCgpLF0qXCksICovXFwyLnNldFZhbHVlPFxcMT4oLyciIHFWYXJpYW50U2V0VmFsdWUKKyAg ICAgICAgICAgIGdpdCBncmVwIC1PInNlZCAtaSAncy9xVmFyaWFudENhbkNvbnZlcnQgKjxcKFte Pl0qXCk+ICooXChbXiYqXCgpLF0qXCkpL1xcMi5jYW5Db252ZXJ0PFxcMT4oKS9nJyIgcVZhcmlh bnRDYW5Db252ZXJ0CisgICAgICAgICAgICBnaXQgZ3JlcCAtTyJzZWQgLWkgJ3MvcVZhcmlhbnRD YW5Db252ZXJ0ICo8XChbXj5dKlwpPiAqKFwoW14mKlwoKSxdKihbXiYqXCgpLF0qKVwpKS9cXDIu Y2FuQ29udmVydDxcXDE+KCkvZyciIHFWYXJpYW50Q2FuQ29udmVydAorICAgICAgICAgICAgZ2l0 IGdyZXAgLU8ic2VkIC1pICdzL3FWYXJpYW50RnJvbVZhbHVlXCggKlsoPF1cKS9RVmFyaWFudDo6 ZnJvbVZhbHVlXFwxLyciIHFWYXJpYW50RnJvbVZhbHVlCisKKworICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcDoKKyAgICAgICAgKER1bXBSZW5kZXJU cmVlU3VwcG9ydFF0Ojpub2Rlc0Zyb21SZWN0KToKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUv dHN0X3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChNeVFPYmplY3Q6Om15SW52b2thYmxlV2l0aFFP YmplY3RMaXN0QXJnKToKKyAgICAgICAgKE15UU9iamVjdDo6bXlJbnZva2FibGVXaXRoTGlzdE9m SW50QXJnKToKKyAgICAgICAgKE15UU9iamVjdDo6bXlJbnZva2FibGVXaXRoUU9iamVjdFN0YXJB cmcpOgorICAgICAgICAoTXlRT2JqZWN0OjpteUludm9rYWJsZVdpdGhRQnJ1c2hBcmcpOgorICAg ICAgICAoTXlRT2JqZWN0OjpteUludm9rYWJsZVdpdGhCcnVzaFN0eWxlQXJnKToKKyAgICAgICAg KE15UU9iamVjdDo6bXlJbnZva2FibGVXaXRoVm9pZFN0YXJBcmcpOgorICAgICAgICAoTXlRT2Jq ZWN0OjpteUludm9rYWJsZVdpdGhBbWJpZ3VvdXNBcmcpOgorICAgICAgICAoTXlRT2JqZWN0Ojpt eUludm9rYWJsZVdpdGhEZWZhdWx0QXJncyk6CisgICAgICAgIChNeVFPYmplY3Q6Om15SW52b2th YmxlV2l0aFBvaW50QXJnKToKKyAgICAgICAgKE15UU9iamVjdDo6bXlPdmVybG9hZGVkU2xvdCk6 CisKIDIwMTEtMDItMTAgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5jcHAgYi9T b3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNw cAppbmRleCAzNmQxNzJlLi5lNmU2MzEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNwcApAQCAtODk3 LDkgKzg5Nyw5IEBAIFFWYXJpYW50TGlzdCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6bm9kZXNG cm9tUmVjdChjb25zdCBRV2ViRWxlbWVudCYgZG9jdW1lbnQsCiAgICAgZm9yIChpbnQgaSA9IDA7 IGkgPCBub2Rlcy0+bGVuZ3RoKCk7IGkrKykgewogICAgICAgICAvLyBRV2ViRWxlbWVudCB3aWxs IGJlIG51bGwgaWYgdGhlIE5vZGUgaXMgbm90IGFuIEhUTUwgRWxlbWVudAogICAgICAgICBpZiAo bm9kZXMtPml0ZW0oaSktPmlzSFRNTEVsZW1lbnQoKSkKLSAgICAgICAgICAgIHJlcyA8PCBxVmFy aWFudEZyb21WYWx1ZShRV2ViRWxlbWVudChub2Rlcy0+aXRlbShpKSkpOworICAgICAgICAgICAg cmVzIDw8IFFWYXJpYW50Ojpmcm9tVmFsdWUoUVdlYkVsZW1lbnQobm9kZXMtPml0ZW0oaSkpKTsK ICAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVzIDw8IHFWYXJpYW50RnJvbVZhbHVlKFFEUlRO b2RlKG5vZGVzLT5pdGVtKGkpKSk7CisgICAgICAgICAgICByZXMgPDwgUVZhcmlhbnQ6OmZyb21W YWx1ZShRRFJUTm9kZShub2Rlcy0+aXRlbShpKSkpOwogICAgIH0KICAgICByZXR1cm4gcmVzOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJm cmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1l LmNwcAppbmRleCBkZjdhM2UxLi4zYzQ3ZDFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtMzA4LDcgKzMwOCw3IEBAIHB1 YmxpYzoKICAgICB9CiAgICAgUV9JTlZPS0FCTEUgUU9iamVjdExpc3QgbXlJbnZva2FibGVXaXRo UU9iamVjdExpc3RBcmcoY29uc3QgUU9iamVjdExpc3QgJmxzdCkgewogICAgICAgICBtX3F0RnVu Y3Rpb25JbnZva2VkID0gMTQ7Ci0gICAgICAgIG1fYWN0dWFscyA8PCBxVmFyaWFudEZyb21WYWx1 ZShsc3QpOworICAgICAgICBtX2FjdHVhbHMgPDwgUVZhcmlhbnQ6OmZyb21WYWx1ZShsc3QpOwog ICAgICAgICByZXR1cm4gbHN0OwogICAgIH0KICAgICBRX0lOVk9LQUJMRSBRVmFyaWFudCBteUlu dm9rYWJsZVdpdGhWYXJpYW50QXJnKGNvbnN0IFFWYXJpYW50ICZ2KSB7CkBAIC0zMjMsMzggKzMy MywzOCBAQCBwdWJsaWM6CiAgICAgfQogICAgIFFfSU5WT0tBQkxFIFFMaXN0PGludD4gbXlJbnZv a2FibGVXaXRoTGlzdE9mSW50QXJnKGNvbnN0IFFMaXN0PGludD4gJmxzdCkgewogICAgICAgICBt X3F0RnVuY3Rpb25JbnZva2VkID0gMTc7Ci0gICAgICAgIG1fYWN0dWFscyA8PCBxVmFyaWFudEZy b21WYWx1ZShsc3QpOworICAgICAgICBtX2FjdHVhbHMgPDwgUVZhcmlhbnQ6OmZyb21WYWx1ZShs c3QpOwogICAgICAgICByZXR1cm4gbHN0OwogICAgIH0KICAgICBRX0lOVk9LQUJMRSBRT2JqZWN0 KiBteUludm9rYWJsZVdpdGhRT2JqZWN0U3RhckFyZyhRT2JqZWN0KiBvYmopIHsKICAgICAgICAg bV9xdEZ1bmN0aW9uSW52b2tlZCA9IDE4OwotICAgICAgICBtX2FjdHVhbHMgPDwgcVZhcmlhbnRG cm9tVmFsdWUob2JqKTsKKyAgICAgICAgbV9hY3R1YWxzIDw8IFFWYXJpYW50Ojpmcm9tVmFsdWUo b2JqKTsKICAgICAgICAgcmV0dXJuIG9iajsKICAgICB9CiAgICAgUV9JTlZPS0FCTEUgUUJydXNo IG15SW52b2thYmxlV2l0aFFCcnVzaEFyZyhjb25zdCBRQnJ1c2ggJmJydXNoKSB7CiAgICAgICAg IG1fcXRGdW5jdGlvbkludm9rZWQgPSAxOTsKLSAgICAgICAgbV9hY3R1YWxzIDw8IHFWYXJpYW50 RnJvbVZhbHVlKGJydXNoKTsKKyAgICAgICAgbV9hY3R1YWxzIDw8IFFWYXJpYW50Ojpmcm9tVmFs dWUoYnJ1c2gpOwogICAgICAgICByZXR1cm4gYnJ1c2g7CiAgICAgfQogICAgIFFfSU5WT0tBQkxF IHZvaWQgbXlJbnZva2FibGVXaXRoQnJ1c2hTdHlsZUFyZyhRdDo6QnJ1c2hTdHlsZSBzdHlsZSkg ewogICAgICAgICBtX3F0RnVuY3Rpb25JbnZva2VkID0gNDM7Ci0gICAgICAgIG1fYWN0dWFscyA8 PCBxVmFyaWFudEZyb21WYWx1ZShzdHlsZSk7CisgICAgICAgIG1fYWN0dWFscyA8PCBRVmFyaWFu dDo6ZnJvbVZhbHVlKHN0eWxlKTsKICAgICB9CiAgICAgUV9JTlZPS0FCTEUgdm9pZCBteUludm9r YWJsZVdpdGhWb2lkU3RhckFyZyh2b2lkKiBhcmcpIHsKICAgICAgICAgbV9xdEZ1bmN0aW9uSW52 b2tlZCA9IDQ0OwotICAgICAgICBtX2FjdHVhbHMgPDwgcVZhcmlhbnRGcm9tVmFsdWUoYXJnKTsK KyAgICAgICAgbV9hY3R1YWxzIDw8IFFWYXJpYW50Ojpmcm9tVmFsdWUoYXJnKTsKICAgICB9CiAg ICAgUV9JTlZPS0FCTEUgdm9pZCBteUludm9rYWJsZVdpdGhBbWJpZ3VvdXNBcmcoaW50IGFyZykg ewogICAgICAgICBtX3F0RnVuY3Rpb25JbnZva2VkID0gNDU7Ci0gICAgICAgIG1fYWN0dWFscyA8 PCBxVmFyaWFudEZyb21WYWx1ZShhcmcpOworICAgICAgICBtX2FjdHVhbHMgPDwgUVZhcmlhbnQ6 OmZyb21WYWx1ZShhcmcpOwogICAgIH0KICAgICBRX0lOVk9LQUJMRSB2b2lkIG15SW52b2thYmxl V2l0aEFtYmlndW91c0FyZyh1aW50IGFyZykgewogICAgICAgICBtX3F0RnVuY3Rpb25JbnZva2Vk ID0gNDY7Ci0gICAgICAgIG1fYWN0dWFscyA8PCBxVmFyaWFudEZyb21WYWx1ZShhcmcpOworICAg ICAgICBtX2FjdHVhbHMgPDwgUVZhcmlhbnQ6OmZyb21WYWx1ZShhcmcpOwogICAgIH0KICAgICBR X0lOVk9LQUJMRSB2b2lkIG15SW52b2thYmxlV2l0aERlZmF1bHRBcmdzKGludCBhcmcxLCBjb25z dCBRU3RyaW5nICZhcmcyID0gIiIpIHsKICAgICAgICAgbV9xdEZ1bmN0aW9uSW52b2tlZCA9IDQ3 OwotICAgICAgICBtX2FjdHVhbHMgPDwgcVZhcmlhbnRGcm9tVmFsdWUoYXJnMSkgPDwgcVZhcmlh bnRGcm9tVmFsdWUoYXJnMik7CisgICAgICAgIG1fYWN0dWFscyA8PCBRVmFyaWFudDo6ZnJvbVZh bHVlKGFyZzEpIDw8IHFWYXJpYW50RnJvbVZhbHVlKGFyZzIpOwogICAgIH0KICAgICBRX0lOVk9L QUJMRSBRT2JqZWN0JiBteUludm9rYWJsZVJldHVybmluZ1JlZigpIHsKICAgICAgICAgbV9xdEZ1 bmN0aW9uSW52b2tlZCA9IDQ4OwpAQCAtMzY2LDExICszNjYsMTEgQEAgcHVibGljOgogICAgIH0K ICAgICBRX0lOVk9LQUJMRSB2b2lkIG15SW52b2thYmxlV2l0aFBvaW50QXJnKGNvbnN0IFFQb2lu dCAmYXJnKSB7CiAgICAgICAgIGNvbnN0X2Nhc3Q8TXlRT2JqZWN0Kj4odGhpcyktPm1fcXRGdW5j dGlvbkludm9rZWQgPSA1MDsKLSAgICAgICAgbV9hY3R1YWxzIDw8IHFWYXJpYW50RnJvbVZhbHVl KGFyZyk7CisgICAgICAgIG1fYWN0dWFscyA8PCBRVmFyaWFudDo6ZnJvbVZhbHVlKGFyZyk7CiAg ICAgfQogICAgIFFfSU5WT0tBQkxFIHZvaWQgbXlJbnZva2FibGVXaXRoUG9pbnRBcmcoY29uc3Qg UVBvaW50RiAmYXJnKSB7CiAgICAgICAgIGNvbnN0X2Nhc3Q8TXlRT2JqZWN0Kj4odGhpcyktPm1f cXRGdW5jdGlvbkludm9rZWQgPSA1MTsKLSAgICAgICAgbV9hY3R1YWxzIDw8IHFWYXJpYW50RnJv bVZhbHVlKGFyZyk7CisgICAgICAgIG1fYWN0dWFscyA8PCBRVmFyaWFudDo6ZnJvbVZhbHVlKGFy Zyk7CiAgICAgfQogICAgIFFfSU5WT0tBQkxFIHZvaWQgbXlJbnZva2FibGVXaXRoQm9vbEFyZyhi b29sIGFyZykgewogICAgICAgICBtX3F0RnVuY3Rpb25JbnZva2VkID0gNTI7CkBAIC00MTgsNyAr NDE4LDcgQEAgcHVibGljIFFfU0xPVFM6CiAgICAgfQogICAgIHZvaWQgbXlPdmVybG9hZGVkU2xv dChRT2JqZWN0KiBhcmcpIHsKICAgICAgICAgbV9xdEZ1bmN0aW9uSW52b2tlZCA9IDQxOwotICAg ICAgICBtX2FjdHVhbHMgPDwgcVZhcmlhbnRGcm9tVmFsdWUoYXJnKTsKKyAgICAgICAgbV9hY3R1 YWxzIDw8IFFWYXJpYW50Ojpmcm9tVmFsdWUoYXJnKTsKICAgICB9CiAgICAgdm9pZCBteU92ZXJs b2FkZWRTbG90KGJvb2wgYXJnKSB7CiAgICAgICAgIG1fcXRGdW5jdGlvbkludm9rZWQgPSAyNTsK QEAgLTg0Myw3ICs4NDMsNyBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OmdldFNldFN0YXRpY1Byb3Bl cnR5KCkKICAgICBRQ09NUEFSRShldmFsSlMoIm15T2JqZWN0LnZhcmlhbnRQcm9wZXJ0eSA9PT0g J2JhciciKSwgc1RydWUpOwogICAgIG1fbXlPYmplY3QtPnNldFZhcmlhbnRQcm9wZXJ0eSg0Mik7 CiAgICAgUUNPTVBBUkUoZXZhbEpTKCJteU9iamVjdC52YXJpYW50UHJvcGVydHkgPT09IDQyIiks IHNUcnVlKTsKLSAgICBtX215T2JqZWN0LT5zZXRWYXJpYW50UHJvcGVydHkocVZhcmlhbnRGcm9t VmFsdWUoUUJydXNoKCkpKTsKKyAgICBtX215T2JqZWN0LT5zZXRWYXJpYW50UHJvcGVydHkoUVZh cmlhbnQ6OmZyb21WYWx1ZShRQnJ1c2goKSkpOwogLy9YRkFJTAogLy8gIFFDT01QQVJFKGV2YWxK UygidHlwZW9mIG15T2JqZWN0LnZhcmlhbnRQcm9wZXJ0eSIpLCBzVmFyaWFudCk7CiAKQEAgLTEy NjUsNyArMTI2NSw3IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6Y2FsbFF0SW52b2thYmxlKCkKICAg ICAvKiBYRkFJTCAtIHZhcmlhbnQgc3VwcG9ydAogICAgIG1fbXlPYmplY3QtPnJlc2V0UXRGdW5j dGlvbkludm9rZWQoKTsKICAgICB7Ci0gICAgICAgIG1fbXlPYmplY3QtPnNldFZhcmlhbnRQcm9w ZXJ0eShxVmFyaWFudEZyb21WYWx1ZShRQnJ1c2goKSkpOworICAgICAgICBtX215T2JqZWN0LT5z ZXRWYXJpYW50UHJvcGVydHkoUVZhcmlhbnQ6OmZyb21WYWx1ZShRQnJ1c2goKSkpOwogICAgICAg ICBRVmFyaWFudCByZXQgPSBldmFsSlMoIm15T2JqZWN0Lm15SW52b2thYmxlV2l0aFZhcmlhbnRB cmcobXlPYmplY3QudmFyaWFudFByb3BlcnR5KSIpOwogICAgICAgICBRVkVSSUZZKHJldC5pc1Zh cmlhbnQoKSk7CiAgICAgICAgIFFDT01QQVJFKG1fbXlPYmplY3QtPnF0RnVuY3Rpb25JbnZva2Vk KCksIDE1KTsKLS0gCjEuNy4zLjQKCg==