109143 2013-02-07 00:10:28 -0800 Drop ExceptionCode from IDB's directionToString and modeToString. 2013-02-09 07:16:01 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108180 1 mkwst mkwst alecflett dgrogan jochen jsbell webkit.review.bot oldest_to_newest 827096 0 mkwst 2013-02-07 00:10:28 -0800 jsbell notes: View in context: https://bugs.webkit.org/attachment.cgi?id=186862&action=review >> Source/WebCore/Modules/indexeddb/IDBCursor.cpp:99 >> return direction; > > No need for the local variable any more here. And FYI the directionToString method is only ever called from here now; it was used when we supported both legacy numeric enum and new string values when called from script. Now that the numeric enum values are not supported from script we can drop the ExceptionCode argument from this method. But that can be done in a separate patch. >> Source/WebCore/Modules/indexeddb/IDBTransaction.cpp:125 >> return mode; > > No need for the local variable any more here. And FYI, same as above. We can drop the ExceptionCode param from modeToStrng now. 827130 1 187010 mkwst 2013-02-07 00:57:06 -0800 Created attachment 187010 Patch 827153 2 mkwst 2013-02-07 01:14:29 -0800 Jochen, perhaps you can take a look at this patch? Joshua says it's the right thing to do, so I hope the details are trivially reviewable. :) It doesn't (yet) apply; I'll upload it again for the bots once https://bugs.webkit.org/show_bug.cgi?id=109044 lands. 827565 3 187010 jsbell 2013-02-07 08:43:16 -0800 Comment on attachment 187010 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187010&action=review > Source/WebCore/ChangeLog:9 > + make use of the ExceptionCode they accept. This patch drops the unused Nitpicking the description: the methods *did* use it, but all callsites ignored the result other than asserting because these methods are now only used with pre-validated data. > Source/WebCore/Modules/indexeddb/IDBCursor.cpp:-329 > - ec = TypeError; Please add ASSERT_NOT_REACHED() here. > Source/WebCore/Modules/indexeddb/IDBTransaction.cpp:-365 > - ec = TypeError; Please add ASSERT_NOT_REACHED() here. 827566 4 jsbell 2013-02-07 08:44:31 -0800 (In reply to comment #2) > Jochen, perhaps you can take a look at this patch? Joshua says it's the right thing to do, so I hope the details are trivially reviewable. :) I'm Joshua and I approve this patch (with those ASSERT_NOT_REACHED additions). Thanks, Jochen, and thanks Mike for putting it together! 828462 5 187296 mkwst 2013-02-08 05:21:24 -0800 Created attachment 187296 Patch 828464 6 mkwst 2013-02-08 05:23:32 -0800 This should address Joshua's comments. Jochen, if I haven't exhausted your patience yet today, would you mind taking a look at this patch as well? 828487 7 187296 jochen 2013-02-08 05:50:21 -0800 Comment on attachment 187296 Patch ok 829021 8 187296 webkit.review.bot 2013-02-09 07:15:57 -0800 Comment on attachment 187296 Patch Clearing flags on attachment: 187296 Committed r142356: <http://trac.webkit.org/changeset/142356> 829022 9 webkit.review.bot 2013-02-09 07:16:01 -0800 All reviewed patches have been landed. Closing bug. 187010 2013-02-07 00:57:06 -0800 2013-02-08 05:21:20 -0800 Patch bug-109143-20130207095341.patch text/plain 5312 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5M2I1MDQ4YWQxMjVm ZTM3YmNlZDM3OGU1Y2ZkNjk5M2I5NGM1Ni4uYzFmYjExZTNmZWMwYjc4ZTE1MTcxNzlkOTBmMzk0 YjdlZTFmYzA1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEzLTAyLTA3ICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgRHJvcCBFeGNlcHRpb25Db2Rl IGZyb20gSURCJ3MgZGlyZWN0aW9uVG9TdHJpbmcgYW5kIG1vZGVUb1N0cmluZy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTE0MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5laXRoZXIgSURCQ3Vyc29y OjpkaXJlY3Rpb25Ub1N0cmluZyBub3IgSURCVHJhbnNhY3Rpb246Om1vZGVUb1N0cmluZworICAg ICAgICBtYWtlIHVzZSBvZiB0aGUgRXhjZXB0aW9uQ29kZSB0aGV5IGFjY2VwdC4gVGhpcyBwYXRj aCBkcm9wcyB0aGUgdW51c2VkCisgICAgICAgIHBhcmFtZXRlciBlbnRpcmVseSwgYW5kIHJlbW92 ZXMgaXQgZnJvbSB0aGUgY2FsbHNpdGVzIHJhdGhlciB0aGFuIHBhc3NpbmcKKyAgICAgICAgQVNT RVJUX05PX0VYQ0VQVElPTi4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNv ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJDdXJzb3I6OmRpcmVjdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpJREJDdXJzb3I6OmRpcmVjdGlvblRvU3RyaW5nKToKKyAgICAgICAgKiBNb2R1 bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaDoKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9J REJUcmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJUcmFuc2FjdGlvbjo6bW9k ZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJUcmFuc2FjdGlvbjo6bW9kZVRvU3RyaW5nKToKKyAg ICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5oOgorICAgICAgICAgICAg RHJvcCB0aGUgJ0V4Y2VwdGlvbkNvZGUmJyBwYXJhbWV0ZXIgZnJvbSB0aGUgbWV0aG9kcyBhbmQg dGhlaXIgY2FsbHNpdGVzLgorCisyMDEzLTAyLTA3ICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1 bS5vcmc+CisKICAgICAgICAgUmVwbGFjZSBFeGNlcHRpb25Db2RlIGFzc2VydGlvbnMgd2l0aCBB U1NFUlRfTk9fRVhDRVBUSU9OIG1hY3JvLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA5MDQ0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJDdXJzb3IuY3BwCmluZGV4IDU5ZjYxMTJkMTkwODdiMjA4NjE1NmVlNGI1YmJm Mzc2NTFjMTc0ODYuLjBiYzQxNWQyYjk2ODhlN2M0OWZlZWIxMjY3NjJmNjg4YjNjOTFhNGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmNwcApAQCAt OTUsNyArOTUsNyBAQCBJREJDdXJzb3I6On5JREJDdXJzb3IoKQogY29uc3QgU3RyaW5nJiBJREJD dXJzb3I6OmRpcmVjdGlvbigpIGNvbnN0CiB7CiAgICAgSURCX1RSQUNFKCJJREJDdXJzb3I6OmRp cmVjdGlvbiIpOwotICAgIHJldHVybiBkaXJlY3Rpb25Ub1N0cmluZyhtX2RpcmVjdGlvbiwgQVNT RVJUX05PX0VYQ0VQVElPTik7CisgICAgcmV0dXJuIGRpcmVjdGlvblRvU3RyaW5nKG1fZGlyZWN0 aW9uKTsKIH0KIAogY29uc3QgU2NyaXB0VmFsdWUmIElEQkN1cnNvcjo6a2V5KCkgY29uc3QKQEAg LTMxMCw3ICszMTAsNyBAQCBJREJDdXJzb3I6OkRpcmVjdGlvbiBJREJDdXJzb3I6OnN0cmluZ1Rv RGlyZWN0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0aW9uU3RyaW5nLAogICAgIHJldHVybiBJREJD dXJzb3I6Ok5FWFQ7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgSURCQ3Vyc29yOjpkaXJlY3Rp b25Ub1N0cmluZyh1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIEV4Y2VwdGlvbkNvZGUmIGVjKQor Y29uc3QgQXRvbWljU3RyaW5nJiBJREJDdXJzb3I6OmRpcmVjdGlvblRvU3RyaW5nKHVuc2lnbmVk IHNob3J0IGRpcmVjdGlvbikKIHsKICAgICBzd2l0Y2ggKGRpcmVjdGlvbikgewogICAgIGNhc2Ug SURCQ3Vyc29yOjpORVhUOgpAQCAtMzI2LDcgKzMyNiw2IEBAIGNvbnN0IEF0b21pY1N0cmluZyYg SURCQ3Vyc29yOjpkaXJlY3Rpb25Ub1N0cmluZyh1bnNpZ25lZCBzaG9ydCBkaXJlY3Rpb24sIEV4 Y2VwCiAgICAgICAgIHJldHVybiBJREJDdXJzb3I6OmRpcmVjdGlvblByZXZVbmlxdWUoKTsKIAog ICAgIGRlZmF1bHQ6Ci0gICAgICAgIGVjID0gVHlwZUVycm9yOwogICAgICAgICByZXR1cm4gSURC Q3Vyc29yOjpkaXJlY3Rpb25OZXh0KCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaAppbmRleCBlOWY5Yjc0ZTM2NzMzNzQwZTFlMDhmNTY5 ZDdlOTg0NDcxYzdjNjBjLi4xYzgzMTY0MDI2ZGE0NGIzZjA4ZWY5M2ZmNDJlM2FiNDVmZmY1OTJj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3Iu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaApAQCAt NjIsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgZGly ZWN0aW9uUHJldlVuaXF1ZSgpOwogCiAgICAgc3RhdGljIElEQkN1cnNvcjo6RGlyZWN0aW9uIHN0 cmluZ1RvRGlyZWN0aW9uKGNvbnN0IFN0cmluZyYgbW9kZVN0cmluZywgU2NyaXB0RXhlY3V0aW9u Q29udGV4dCosIEV4Y2VwdGlvbkNvZGUmKTsKLSAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5n JiBkaXJlY3Rpb25Ub1N0cmluZyh1bnNpZ25lZCBzaG9ydCBtb2RlLCBFeGNlcHRpb25Db2RlJik7 CisgICAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgZGlyZWN0aW9uVG9TdHJpbmcodW5zaWdu ZWQgc2hvcnQgbW9kZSk7CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJREJDdXJzb3I+IGNyZWF0 ZShQYXNzUmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+LCBEaXJlY3Rpb24sIElEQlJl cXVlc3QqLCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24qKTsKICAgICB2aXJ0dWFsIH5J REJDdXJzb3IoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQlRyYW5zYWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE QlRyYW5zYWN0aW9uLmNwcAppbmRleCAwMmRmZTBmZTMyMmNkZGM2N2I3MzE5ODJmNGEyNzA5OGQy NWUzZDE2Li5jNzhlMWJmY2ViZTAwZjM4YTM2OTRkM2MwMTgwZjllZjk4MDFhNGM2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uY3Bw CkBAIC0xMjEsNyArMTIxLDcgQEAgSURCVHJhbnNhY3Rpb246On5JREJUcmFuc2FjdGlvbigpCiAK IGNvbnN0IFN0cmluZyYgSURCVHJhbnNhY3Rpb246Om1vZGUoKSBjb25zdAogewotICAgIHJldHVy biBtb2RlVG9TdHJpbmcobV9tb2RlLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICByZXR1cm4g bW9kZVRvU3RyaW5nKG1fbW9kZSk7CiB9CiAKIHZvaWQgSURCVHJhbnNhY3Rpb246OnNldEVycm9y KFBhc3NSZWZQdHI8RE9NRXJyb3I+IGVycm9yLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkK QEAgLTM0Niw3ICszNDYsNyBAQCBJREJUcmFuc2FjdGlvbjo6TW9kZSBJREJUcmFuc2FjdGlvbjo6 c3RyaW5nVG9Nb2RlKGNvbnN0IFN0cmluZyYgbW9kZVN0cmluZywgU2NyaQogICAgIHJldHVybiBJ REJUcmFuc2FjdGlvbjo6UkVBRF9PTkxZOwogfQogCi1jb25zdCBBdG9taWNTdHJpbmcmIElEQlRy YW5zYWN0aW9uOjptb2RlVG9TdHJpbmcoSURCVHJhbnNhY3Rpb246Ok1vZGUgbW9kZSwgRXhjZXB0 aW9uQ29kZSYgZWMpCitjb25zdCBBdG9taWNTdHJpbmcmIElEQlRyYW5zYWN0aW9uOjptb2RlVG9T dHJpbmcoSURCVHJhbnNhY3Rpb246Ok1vZGUgbW9kZSkKIHsKICAgICBzd2l0Y2ggKG1vZGUpIHsK ICAgICBjYXNlIElEQlRyYW5zYWN0aW9uOjpSRUFEX09OTFk6CkBAIC0zNjIsNyArMzYyLDYgQEAg Y29uc3QgQXRvbWljU3RyaW5nJiBJREJUcmFuc2FjdGlvbjo6bW9kZVRvU3RyaW5nKElEQlRyYW5z YWN0aW9uOjpNb2RlIG1vZGUsIEV4Y2UKICAgICAgICAgYnJlYWs7CiAKICAgICBkZWZhdWx0Ogot ICAgICAgICBlYyA9IFR5cGVFcnJvcjsKICAgICAgICAgcmV0dXJuIElEQlRyYW5zYWN0aW9uOjpt b2RlUmVhZE9ubHkoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCVHJhbnNhY3Rpb24uaAppbmRleCAyZDU5YjdmNTBkYmRmNGMzMDExNDIyYjk4 ZDE1ZGI1MmM1MTQ3NzVkLi42OTc1MGViNzM5ZTY4MDdkYjExODdkYzBlNmM4NDRmYzg1MDEyYjI3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2Fj dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0 aW9uLmgKQEAgLTY4LDcgKzY4LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBjb25zdCBBdG9taWNT dHJpbmcmIG1vZGVSZWFkV3JpdGVMZWdhY3koKTsKIAogICAgIHN0YXRpYyBNb2RlIHN0cmluZ1Rv TW9kZShjb25zdCBTdHJpbmcmLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgRXhjZXB0aW9uQ29k ZSYpOwotICAgIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIG1vZGVUb1N0cmluZyhNb2RlLCBF eGNlcHRpb25Db2RlJik7CisgICAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgbW9kZVRvU3Ry aW5nKE1vZGUpOwogCiAgICAgSURCRGF0YWJhc2VCYWNrZW5kSW50ZXJmYWNlKiBiYWNrZW5kREIo KSBjb25zdDsKIAo= 187296 2013-02-08 05:21:24 -0800 2013-02-09 07:15:57 -0800 Patch bug-109143-20130208141758.patch text/plain 5565 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTFiMmM3ZmVmMTcxYWM5 ZjAyZDUxMTNkN2I4NGMyYmYxNzY4YjQ3My4uYjlhNzExZGU5MDIxYzkyMjA1YmZkNTkyM2ZmYmFi ZTdkODU3MjAwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEzLTAyLTA4ICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgRHJvcCBFeGNlcHRpb25Db2Rl IGZyb20gSURCJ3MgZGlyZWN0aW9uVG9TdHJpbmcgYW5kIG1vZGVUb1N0cmluZy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTE0MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNhbGxlciBvZiBlaXRo ZXIgSURCQ3Vyc29yOjpkaXJlY3Rpb25Ub1N0cmluZyBvcgorICAgICAgICBJREJUcmFuc2FjdGlv bjo6bW9kZVRvU3RyaW5nIG1ha2VzIHVzZSBvZiB0aGUgRXhjZXB0aW9uQ29kZSB0aGVzZQorICAg ICAgICBtZXRob2RzIHJlcXVpcmUuIFRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGUgJ0V4Y2VwdGlvbkNv ZGUmJyBwYXJhbWV0ZXIgZnJvbQorICAgICAgICBib3RoIG1ldGhvZHMgYW5kIHRoZWlyIGNhbGxz aXRlcy4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJREJDdXJzb3I6OmRpcmVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpJ REJDdXJzb3I6OmRpcmVjdGlvblRvU3RyaW5nKToKKyAgICAgICAgICAgIERyb3AgdGhlICdFeGNl cHRpb25Db2RlJicgcGFyYW1ldGVyLCBhbmQgcmVwbGFjZSB0aGUgJ1R5cGVFcnJvcicKKyAgICAg ICAgICAgIGV4Y2VwdGlvbiBwcmV2aW91c2x5IGdlbmVyYXRlZCB3aXRoIEFTU0VSVF9OT1RfUkVB Q0hFRC4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaDoKKyAgICAgICAg KiBNb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJREJUcmFuc2FjdGlvbjo6bW9kZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJUcmFuc2FjdGlv bjo6bW9kZVRvU3RyaW5nKToKKyAgICAgICAgICAgIERyb3AgdGhlICdFeGNlcHRpb25Db2RlJicg cGFyYW1ldGVyLCBhbmQgcmVwbGFjZSB0aGUgJ1R5cGVFcnJvcicKKyAgICAgICAgICAgIGV4Y2Vw dGlvbiBwcmV2aW91c2x5IGdlbmVyYXRlZCB3aXRoIEFTU0VSVF9OT1RfUkVBQ0hFRC4KKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5oOgorCisyMDEzLTAyLTA4ICBN aWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgTWlncmF0ZSBFeGNlcHRp b25Db2RlIEFTU0VSVHMgaW4gSURCIHRvIEFTU0VSVF9OT19FWENFUFRJT04uCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDkyNjYKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkN1cnNvci5jcHAKaW5kZXggZmE5NjIxMjk1 NzQzMGIwMWIzNDc5Y2FiZmNiNzBiZjMyZDMwMzE5ZC4uNDY4ZWRiZWJhOTExMTY5YTA5M2EyZTdk MjM0OTA4OGZjYzI4MzZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCQ3Vyc29yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJDdXJzb3IuY3BwCkBAIC05NSw3ICs5NSw3IEBAIElEQkN1cnNvcjo6fklEQkN1cnNvcigp CiBjb25zdCBTdHJpbmcmIElEQkN1cnNvcjo6ZGlyZWN0aW9uKCkgY29uc3QKIHsKICAgICBJREJf VFJBQ0UoIklEQkN1cnNvcjo6ZGlyZWN0aW9uIik7Ci0gICAgcmV0dXJuIGRpcmVjdGlvblRvU3Ry aW5nKG1fZGlyZWN0aW9uLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICByZXR1cm4gZGlyZWN0 aW9uVG9TdHJpbmcobV9kaXJlY3Rpb24pOwogfQogCiBjb25zdCBTY3JpcHRWYWx1ZSYgSURCQ3Vy c29yOjprZXkoKSBjb25zdApAQCAtMzEzLDcgKzMxMyw3IEBAIElEQkN1cnNvcjo6RGlyZWN0aW9u IElEQkN1cnNvcjo6c3RyaW5nVG9EaXJlY3Rpb24oY29uc3QgU3RyaW5nJiBkaXJlY3Rpb25TdHJp bmcsCiAgICAgcmV0dXJuIElEQkN1cnNvcjo6TkVYVDsKIH0KIAotY29uc3QgQXRvbWljU3RyaW5n JiBJREJDdXJzb3I6OmRpcmVjdGlvblRvU3RyaW5nKHVuc2lnbmVkIHNob3J0IGRpcmVjdGlvbiwg RXhjZXB0aW9uQ29kZSYgZWMpCitjb25zdCBBdG9taWNTdHJpbmcmIElEQkN1cnNvcjo6ZGlyZWN0 aW9uVG9TdHJpbmcodW5zaWduZWQgc2hvcnQgZGlyZWN0aW9uKQogewogICAgIHN3aXRjaCAoZGly ZWN0aW9uKSB7CiAgICAgY2FzZSBJREJDdXJzb3I6Ok5FWFQ6CkBAIC0zMjksNyArMzI5LDcgQEAg Y29uc3QgQXRvbWljU3RyaW5nJiBJREJDdXJzb3I6OmRpcmVjdGlvblRvU3RyaW5nKHVuc2lnbmVk IHNob3J0IGRpcmVjdGlvbiwgRXhjZXAKICAgICAgICAgcmV0dXJuIElEQkN1cnNvcjo6ZGlyZWN0 aW9uUHJldlVuaXF1ZSgpOwogCiAgICAgZGVmYXVsdDoKLSAgICAgICAgZWMgPSBUeXBlRXJyb3I7 CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gSURCQ3Vyc29y OjpkaXJlY3Rpb25OZXh0KCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJDdXJzb3IuaAppbmRleCBlOWY5Yjc0ZTM2NzMzNzQwZTFlMDhmNTY5ZDdlOTg0 NDcxYzdjNjBjLi4xYzgzMTY0MDI2ZGE0NGIzZjA4ZWY5M2ZmNDJlM2FiNDVmZmY1OTJjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuaApAQCAtNjIsNyAr NjIsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgZGlyZWN0aW9u UHJldlVuaXF1ZSgpOwogCiAgICAgc3RhdGljIElEQkN1cnNvcjo6RGlyZWN0aW9uIHN0cmluZ1Rv RGlyZWN0aW9uKGNvbnN0IFN0cmluZyYgbW9kZVN0cmluZywgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCosIEV4Y2VwdGlvbkNvZGUmKTsKLSAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5nJiBkaXJl Y3Rpb25Ub1N0cmluZyh1bnNpZ25lZCBzaG9ydCBtb2RlLCBFeGNlcHRpb25Db2RlJik7CisgICAg c3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgZGlyZWN0aW9uVG9TdHJpbmcodW5zaWduZWQgc2hv cnQgbW9kZSk7CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJREJDdXJzb3I+IGNyZWF0ZShQYXNz UmVmUHRyPElEQkN1cnNvckJhY2tlbmRJbnRlcmZhY2U+LCBEaXJlY3Rpb24sIElEQlJlcXVlc3Qq LCBJREJBbnkqIHNvdXJjZSwgSURCVHJhbnNhY3Rpb24qKTsKICAgICB2aXJ0dWFsIH5JREJDdXJz b3IoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRy YW5zYWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5z YWN0aW9uLmNwcAppbmRleCAwMmRmZTBmZTMyMmNkZGM2N2I3MzE5ODJmNGEyNzA5OGQyNWUzZDE2 Li44NWUwODdhMjNlYzk2MmNjZjRkNzNkYjM5NzgyMDhkNzExZTU0N2E4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uY3BwCkBAIC0x MjEsNyArMTIxLDcgQEAgSURCVHJhbnNhY3Rpb246On5JREJUcmFuc2FjdGlvbigpCiAKIGNvbnN0 IFN0cmluZyYgSURCVHJhbnNhY3Rpb246Om1vZGUoKSBjb25zdAogewotICAgIHJldHVybiBtb2Rl VG9TdHJpbmcobV9tb2RlLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICByZXR1cm4gbW9kZVRv U3RyaW5nKG1fbW9kZSk7CiB9CiAKIHZvaWQgSURCVHJhbnNhY3Rpb246OnNldEVycm9yKFBhc3NS ZWZQdHI8RE9NRXJyb3I+IGVycm9yLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkKQEAgLTM0 Niw3ICszNDYsNyBAQCBJREJUcmFuc2FjdGlvbjo6TW9kZSBJREJUcmFuc2FjdGlvbjo6c3RyaW5n VG9Nb2RlKGNvbnN0IFN0cmluZyYgbW9kZVN0cmluZywgU2NyaQogICAgIHJldHVybiBJREJUcmFu c2FjdGlvbjo6UkVBRF9PTkxZOwogfQogCi1jb25zdCBBdG9taWNTdHJpbmcmIElEQlRyYW5zYWN0 aW9uOjptb2RlVG9TdHJpbmcoSURCVHJhbnNhY3Rpb246Ok1vZGUgbW9kZSwgRXhjZXB0aW9uQ29k ZSYgZWMpCitjb25zdCBBdG9taWNTdHJpbmcmIElEQlRyYW5zYWN0aW9uOjptb2RlVG9TdHJpbmco SURCVHJhbnNhY3Rpb246Ok1vZGUgbW9kZSkKIHsKICAgICBzd2l0Y2ggKG1vZGUpIHsKICAgICBj YXNlIElEQlRyYW5zYWN0aW9uOjpSRUFEX09OTFk6CkBAIC0zNjIsNyArMzYyLDcgQEAgY29uc3Qg QXRvbWljU3RyaW5nJiBJREJUcmFuc2FjdGlvbjo6bW9kZVRvU3RyaW5nKElEQlRyYW5zYWN0aW9u OjpNb2RlIG1vZGUsIEV4Y2UKICAgICAgICAgYnJlYWs7CiAKICAgICBkZWZhdWx0OgotICAgICAg ICBlYyA9IFR5cGVFcnJvcjsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAg IHJldHVybiBJREJUcmFuc2FjdGlvbjo6bW9kZVJlYWRPbmx5KCk7CiAgICAgfQogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uaCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uLmgKaW5kZXgg MmQ1OWI3ZjUwZGJkZjRjMzAxMTQyMmI5OGQxNWRiNTJjNTE0Nzc1ZC4uNjk3NTBlYjczOWU2ODA3 ZGIxMTg3ZGMwZTZjODQ0ZmM4NTAxMmIyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5oCkBAIC02OCw3ICs2OCw3IEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5nJiBtb2RlUmVhZFdyaXRlTGVnYWN5KCk7CiAK ICAgICBzdGF0aWMgTW9kZSBzdHJpbmdUb01vZGUoY29uc3QgU3RyaW5nJiwgU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCosIEV4Y2VwdGlvbkNvZGUmKTsKLSAgICBzdGF0aWMgY29uc3QgQXRvbWljU3Ry aW5nJiBtb2RlVG9TdHJpbmcoTW9kZSwgRXhjZXB0aW9uQ29kZSYpOworICAgIHN0YXRpYyBjb25z dCBBdG9taWNTdHJpbmcmIG1vZGVUb1N0cmluZyhNb2RlKTsKIAogICAgIElEQkRhdGFiYXNlQmFj a2VuZEludGVyZmFjZSogYmFja2VuZERCKCkgY29uc3Q7CiAK