62801 2011-06-16 09:52:27 -0700 Web Inspector: return description of the changes applied in response to editScriptSource command 2011-06-17 01:20:00 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo peter.rybin pfeldman pmuellr rik timothy yurys oldest_to_newest 422004 0 yurys 2011-06-16 09:52:27 -0700 Debugger.editScriptSource command should return detailed description of the changes applied to the script. 422476 1 97558 yurys 2011-06-17 01:02:59 -0700 Created attachment 97558 Patch 422482 2 yurys 2011-06-17 01:20:00 -0700 Committed r89127: <http://trac.webkit.org/changeset/89127> 97558 2011-06-17 01:02:59 -0700 2011-06-17 01:07:15 -0700 Patch bug-62801-20110617120257.patch text/plain 9987 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogODkwMjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2MjdlZDRhMzQzNTI5Nzg0 NTY0MTNmMTM3ZjMxMDFmNDk2OTY5YzhmLi5mYjcwMjg5ZDhkMjY1Y2JlODgyNzdiYmJiZmVkZjBl NjRmNGY1NjIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDYtMTYgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmV0dXJuIGRlc2NyaXB0 aW9uIG9mIHRoZSBjaGFuZ2VzIGFwcGxpZWQgaW4gcmVzcG9uc2UgdG8gZWRpdFNjcmlwdFNvdXJj ZSBjb21tYW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MjgwMQorCisgICAgICAgIFJldHVybiBkZXNjcmlwdGlvbiBvZiB0aGUgY2hhbmdlcyBtYWRl IGluIHJlc3BvbnNlIHRvIERlYnVnZ2VyLmVkaXRTY3JpcHRTb3VyY2UgY29tbWFuZC4KKworICAg ICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlNjcmlwdERlYnVnU2VydmVyOjplZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5oOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L0RlYnVn Z2VyU2NyaXB0LmpzOgorICAgICAgICAoKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRE ZWJ1Z1NlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHREZWJ1Z1NlcnZlcjo6ZWRp dFNjcmlwdFNvdXJjZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIu aDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisKIDIwMTEtMDYtMTYgIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHI4OTAyNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAppbmRleCBmMDNmYzYyZTA0YmY4Zjk0ODQxMjlkOGY1 MGQzMzRmZWYzYWUwNjYyLi4yYjk3OThiNjhiMGZiNzNhNDNhM2RjMTI4ZDc4NjdjOGI1NzFhZjkz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIu Y3BwCkBAIC0xOTAsNyArMTkwLDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6c3RlcE91dE9m RnVuY3Rpb24oKQogICAgIG1fZG9uZVByb2Nlc3NpbmdEZWJ1Z2dlckV2ZW50cyA9IHRydWU7CiB9 CiAKLWJvb2wgU2NyaXB0RGVidWdTZXJ2ZXI6OmVkaXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5n JiwgY29uc3QgU3RyaW5nJiwgU3RyaW5nKiwgU2NyaXB0VmFsdWUqKQorYm9vbCBTY3JpcHREZWJ1 Z1NlcnZlcjo6ZWRpdFNjcmlwdFNvdXJjZShjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBT dHJpbmcqLCBTY3JpcHRWYWx1ZSosIFNjcmlwdFZhbHVlKikKIHsKICAgICAvLyBGSVhNRSg0MDMw MCk6IGltcGxlbWVudCB0aGlzLgogICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5oCmluZGV4IGFjMDE3NDIwMDRlMDYxOGYz ZWRhNzJmZTdjNTM0MmZmM2Y1MTliYTQuLmZhOGQ1MDlkMDg3YmFjOGJmNjIzNzVjZTY5MTZkZmE4 MTkyYzg2NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdT ZXJ2ZXIuaApAQCAtNzksNyArNzksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGVwT3ZlclN0YXRl bWVudCgpOwogICAgIHZvaWQgc3RlcE91dE9mRnVuY3Rpb24oKTsKIAotICAgIGJvb2wgZWRpdFNj cmlwdFNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIG5ld0NvbnRl bnQsIFN0cmluZyogZXJyb3IsIFNjcmlwdFZhbHVlKiBuZXdDYWxsRnJhbWVzKTsKKyAgICBib29s IGVkaXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiBu ZXdDb250ZW50LCBTdHJpbmcqIGVycm9yLCBTY3JpcHRWYWx1ZSogbmV3Q2FsbEZyYW1lcywgU2Ny aXB0VmFsdWUqIHJlc3VsdCk7CiAKICAgICB2b2lkIHJlY29tcGlsZUFsbEpTRnVuY3Rpb25zU29v bigpOwogICAgIHZpcnR1YWwgdm9pZCByZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucyhUaW1lcjxTY3Jp cHREZWJ1Z1NlcnZlcj4qID0gMCkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvRGVidWdnZXJTY3JpcHQuanMgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9E ZWJ1Z2dlclNjcmlwdC5qcwppbmRleCAwNDZjOTExNTNiZDcyZjkxYzAxNTg4ZTI5NmIxNTJlZTU4 YmU0ZTJhLi5lMzE1M2M5ODdmMGFlOTQ4YWVjOGY5NTZhMjM1YTJiNGM0NzY1NGEyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlwdC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EZWJ1Z2dlclNjcmlwdC5qcwpAQCAtMTg3LDggKzE4 Nyw3IEBAIERlYnVnZ2VyU2NyaXB0LmVkaXRTY3JpcHRTb3VyY2UgPSBmdW5jdGlvbihzY3JpcHRJ ZCwgbmV3U291cmNlKQogICAgICAgICB0aHJvdygiU2NyaXB0IG5vdCBmb3VuZCIpOwogCiAgICAg dmFyIGNoYW5nZUxvZyA9IFtdOwotICAgIERlYnVnLkxpdmVFZGl0LlNldFNjcmlwdFNvdXJjZShz Y3JpcHRUb0VkaXQsIG5ld1NvdXJjZSwgZmFsc2UsIGNoYW5nZUxvZyk7Ci0gICAgcmV0dXJuIHNj cmlwdFRvRWRpdC5zb3VyY2U7CisgICAgcmV0dXJuIERlYnVnLkxpdmVFZGl0LlNldFNjcmlwdFNv dXJjZShzY3JpcHRUb0VkaXQsIG5ld1NvdXJjZSwgZmFsc2UsIGNoYW5nZUxvZyk7CiB9CiAKIERl YnVnZ2VyU2NyaXB0LmNsZWFyQnJlYWtwb2ludHMgPSBmdW5jdGlvbihleGVjU3RhdGUsIGFyZ3Mp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAK aW5kZXggOWI2MjM0NjA5ZGJjNjk0NmMyMmExZjZiZDg3NWRhNDgyMzg1NjA3My4uMzc5YmZjZmI0 M2JmZTVlOWVhY2I4MDBhZTNiZThkYjQxMDZhNDE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcApAQCAtMzYsNiArMzYsNyBAQAogI2lu Y2x1ZGUgIkRlYnVnZ2VyU2NyaXB0U291cmNlLmgiCiAjaW5jbHVkZSAiSmF2YVNjcmlwdENhbGxG cmFtZS5oIgogI2luY2x1ZGUgIlNjcmlwdERlYnVnTGlzdGVuZXIuaCIKKyNpbmNsdWRlICJTY3Jp cHRPYmplY3QuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKICNpbmNsdWRlICJWOEphdmFTY3Jp cHRDYWxsRnJhbWUuaCIKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CkBAIC0yMTEsNyAr MjEyLDcgQEAgdm9pZCBTY3JpcHREZWJ1Z1NlcnZlcjo6c3RlcE91dE9mRnVuY3Rpb24oKQogICAg IGNvbnRpbnVlUHJvZ3JhbSgpOwogfQogCi1ib29sIFNjcmlwdERlYnVnU2VydmVyOjplZGl0U2Ny aXB0U291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVu dCwgU3RyaW5nKiBlcnJvciwgU2NyaXB0VmFsdWUqIG5ld0NhbGxGcmFtZXMpCitib29sIFNjcmlw dERlYnVnU2VydmVyOjplZGl0U2NyaXB0U291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNv bnN0IFN0cmluZyYgbmV3Q29udGVudCwgU3RyaW5nKiBlcnJvciwgU2NyaXB0VmFsdWUqIG5ld0Nh bGxGcmFtZXMsIFNjcmlwdE9iamVjdCogcmVzdWx0KQogewogICAgIGVuc3VyZURlYnVnZ2VyU2Ny aXB0Q29tcGlsZWQoKTsKICAgICB2ODo6SGFuZGxlU2NvcGUgc2NvcGU7CkBAIC0yMjUsNyArMjI2 LDcgQEAgYm9vbCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZWRpdFNjcmlwdFNvdXJjZShjb25zdCBTdHJp bmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIG4KIAogICAgIHY4OjpUcnlDYXRjaCB0cnlDYXRj aDsKICAgICB0cnlDYXRjaC5TZXRWZXJib3NlKGZhbHNlKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gcmVzdWx0ID0gZnVuY3Rpb24tPkNhbGwobV9kZWJ1Z2dlclNjcmlwdC5nZXQoKSwgMiwg YXJndik7CisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4cmVzdWx0ID0gZnVuY3Rpb24tPkNh bGwobV9kZWJ1Z2dlclNjcmlwdC5nZXQoKSwgMiwgYXJndik7CiAgICAgaWYgKHRyeUNhdGNoLkhh c0NhdWdodCgpKSB7CiAgICAgICAgIHY4OjpMb2NhbDx2ODo6TWVzc2FnZT4gbWVzc2FnZSA9IHRy eUNhdGNoLk1lc3NhZ2UoKTsKICAgICAgICAgaWYgKCFtZXNzYWdlLklzRW1wdHkoKSkKQEAgLTIz NCw3ICsyMzUsOSBAQCBib29sIFNjcmlwdERlYnVnU2VydmVyOjplZGl0U2NyaXB0U291cmNlKGNv bnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgbgogICAgICAgICAgICAgKmVycm9y ID0gIlVua25vd24gZXJyb3IuIjsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLSAgICBB U1NFUlQoIXJlc3VsdC5Jc0VtcHR5KCkpOworICAgIEFTU0VSVCghdjhyZXN1bHQuSXNFbXB0eSgp KTsKKyAgICBpZiAodjhyZXN1bHQtPklzT2JqZWN0KCkpCisgICAgICAgICpyZXN1bHQgPSBTY3Jp cHRPYmplY3QoU2NyaXB0U3RhdGU6OmN1cnJlbnQoKSwgdjhyZXN1bHQtPlRvT2JqZWN0KCkpOwog CiAgICAgLy8gQ2FsbCBzdGFjayBtYXkgaGF2ZSBjaGFuZ2VkIGFmdGVyIGlmIHRoZSBlZGl0ZWQg ZnVuY3Rpb24gd2FzIG9uIHRoZSBzdGFjay4KICAgICBpZiAoaXNQYXVzZWQoKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5oCmluZGV4IGIyOWVjMDQz NTZlMjc1YzRjYzRhNTA1ZmQyMWExNDFhZTkyYWM0ZGYuLjRlODQ1MjA1NzM3NzllN2MxZDU0YmQx ZTFmNWMzMTkwMDZkOThmNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NjcmlwdERlYnVnU2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0RGVidWdTZXJ2ZXIuaApAQCAtNDYsNiArNDYsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewog CiBjbGFzcyBTY3JpcHREZWJ1Z0xpc3RlbmVyOworY2xhc3MgU2NyaXB0T2JqZWN0OwogY2xhc3Mg U2NyaXB0VmFsdWU7CiAKIGNsYXNzIFNjcmlwdERlYnVnU2VydmVyIHsKQEAgLTczLDcgKzc0LDcg QEAgcHVibGljOgogICAgIHZvaWQgc3RlcE92ZXJTdGF0ZW1lbnQoKTsKICAgICB2b2lkIHN0ZXBP dXRPZkZ1bmN0aW9uKCk7CiAKLSAgICBib29sIGVkaXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5n JiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiBuZXdDb250ZW50LCBTdHJpbmcqIGVycm9yLCBTY3Jp cHRWYWx1ZSogbmV3Q2FsbEZyYW1lcyk7CisgICAgYm9vbCBlZGl0U2NyaXB0U291cmNlKGNvbnN0 IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVudCwgU3RyaW5nKiBlcnJv ciwgU2NyaXB0VmFsdWUqIG5ld0NhbGxGcmFtZXMsIFNjcmlwdE9iamVjdCogcmVzdWx0KTsKIAog ICAgIHZvaWQgcmVjb21waWxlQWxsSlNGdW5jdGlvbnNTb29uKCkgeyB9CiAgICAgdm9pZCByZWNv bXBpbGVBbGxKU0Z1bmN0aW9ucyhUaW1lcjxTY3JpcHREZWJ1Z1NlcnZlcj4qID0gMCkgeyB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggNzNhMGY5Njg5MTVlMmIx YmY3MzI5ZWQzZTVkM2I1ZjY4M2I2MDg2OC4uMzQyZmI2MDFiMDU4MWUxMWU2NWM1MTZiYTFlN2Vh ZmUzYmVlOGUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAt MTQ4Myw3ICsxNDgzLDggQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzY3JpcHRT b3VyY2UiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTmV3IGNvbnRlbnQgb2Yg dGhlIHNjcmlwdC4iIH0KICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICJyZXR1 cm5zIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNhbGxGcmFtZXMiLCAidHlw ZSI6ICJhcnJheSIsICJvcHRpb25hbCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiQ2FsbEZy YW1lIn0sICJkZXNjcmlwdGlvbiI6ICJOZXcgc3RhY2sgdHJhY2UgaW4gY2FzZSBlZGl0aW5nIGhh cyBoYXBwZW5lZCB3aGlsZSBWTSB3YXMgc3RvcHBlZC4iIH0KKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJjYWxsRnJhbWVzIiwgInR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVl LCAiaXRlbXMiOiB7ICIkcmVmIjogIkNhbGxGcmFtZSJ9LCAiZGVzY3JpcHRpb24iOiAiTmV3IHN0 YWNrIHRyYWNlIGluIGNhc2UgZWRpdGluZyBoYXMgaGFwcGVuZWQgd2hpbGUgVk0gd2FzIHN0b3Bw ZWQuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIsICJ0eXBlIjog Im9iamVjdCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJWTS1zcGVjaWZpYyBk ZXNjcmlwdGlvbiBvZiB0aGUgY2hhbmdlcyBhcHBsaWVkLiIgfQogICAgICAgICAgICAgICAgIF0s CiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkVkaXRzIEphdmFTY3JpcHQgc2NyaXB0 IGxpdmUuIgogICAgICAgICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAppbmRleCAwMDFkODhlNWQ3Mzc0ODBjYjkzYTQ0 YzM4OTM2MjJjZmI3YWQ5YzYxLi5lMTJiYTdjZmM3ZmJiZTI3MzQwNjUwYjE4ZDBjNzg1ZjFlNzI0 ZGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdn ZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuY3BwCkBAIC0yODUsMTAgKzI4NSwyNSBAQCBQYXNzUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6cmVzb2x2ZUJyZWFrcG9pbnQoY29uc3QgU3Ry aQogICAgIHJldHVybiBsb2NhdGlvbjsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjplZGl0U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiBzb3Vy Y2VJZCwgY29uc3QgU3RyaW5nJiBuZXdDb250ZW50LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBu ZXdDYWxsRnJhbWVzKQorc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBzY3JpcHRU b0luc3BlY3Rvck9iamVjdChTY3JpcHRPYmplY3Qgc2NyaXB0T2JqZWN0KQogewotICAgIGlmIChz Y3JpcHREZWJ1Z1NlcnZlcigpLmVkaXRTY3JpcHRTb3VyY2Uoc291cmNlSWQsIG5ld0NvbnRlbnQs IGVycm9yLCAmbV9jdXJyZW50Q2FsbFN0YWNrKSkKLSAgICAgICAgKm5ld0NhbGxGcmFtZXMgPSBj dXJyZW50Q2FsbEZyYW1lcygpOworICAgIGlmIChzY3JpcHRPYmplY3QuaGFzTm9WYWx1ZSgpKQor ICAgICAgICByZXR1cm4gMDsKKyAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IHZhbHVlID0gc2Ny aXB0T2JqZWN0LnRvSW5zcGVjdG9yVmFsdWUoc2NyaXB0T2JqZWN0LnNjcmlwdFN0YXRlKCkpOwor ICAgIGlmICghdmFsdWUpCisgICAgICAgIHJldHVybiAwOworICAgIHJldHVybiB2YWx1ZS0+YXNP YmplY3QoKTsKK30KKwordm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjplZGl0U2NyaXB0U291 cmNlKEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgY29uc3QgU3Ry aW5nJiBuZXdDb250ZW50LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBuZXdDYWxsRnJhbWVzLCBS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogcmVzdWx0KQoreworICAgIFNjcmlwdE9iamVjdCByZXN1 bHRPYmplY3Q7CisgICAgaWYgKCFzY3JpcHREZWJ1Z1NlcnZlcigpLmVkaXRTY3JpcHRTb3VyY2Uo c291cmNlSWQsIG5ld0NvbnRlbnQsIGVycm9yLCAmbV9jdXJyZW50Q2FsbFN0YWNrLCAmcmVzdWx0 T2JqZWN0KSkKKyAgICAgICAgcmV0dXJuOworICAgICpuZXdDYWxsRnJhbWVzID0gY3VycmVudENh bGxGcmFtZXMoKTsKKyAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3QgPSBzY3JpcHRU b0luc3BlY3Rvck9iamVjdChyZXN1bHRPYmplY3QpOworICAgIGlmIChvYmplY3QpCisgICAgICAg ICpyZXN1bHQgPSBvYmplY3Q7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Z2V0 U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzb3VyY2VJZCwgU3RyaW5n KiBzY3JpcHRTb3VyY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRlYnVnZ2VyQWdlbnQuaAppbmRleCA5YzFiOWM3ZmJjNGM2YjM5MWZjZWUzNWQyMmY5YjY3ZjZk YmRhOWRmLi4yNjg1ZjUwZGMxMjNmZDg2MWQzODBiNWRhNWY1NzhlN2JiN2U5NDIzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKQEAg LTg1LDcgKzg1LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlQnJlYWtwb2ludChFcnJvclN0 cmluZyosIGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkKTsKICAgICB2b2lkIGNvbnRpbnVlVG9M b2NhdGlvbihFcnJvclN0cmluZyosIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBsb2NhdGlv bik7CiAKLSAgICB2b2lkIGVkaXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJp bmcmIHNvdXJjZUlkLCBjb25zdCBTdHJpbmcmIG5ld0NvbnRlbnQsIFJlZlB0cjxJbnNwZWN0b3JB cnJheT4qIG5ld0NhbGxGcmFtZXMpOworICAgIHZvaWQgZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0 cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlSWQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVudCwg UmVmUHRyPEluc3BlY3RvckFycmF5PiogbmV3Q2FsbEZyYW1lcywgUmVmUHRyPEluc3BlY3Rvck9i amVjdD4qIHJlc3VsdCk7CiAgICAgdm9pZCBnZXRTY3JpcHRTb3VyY2UoRXJyb3JTdHJpbmcqLCBj b25zdCBTdHJpbmcmIHNvdXJjZUlkLCBTdHJpbmcqIHNjcmlwdFNvdXJjZSk7CiAgICAgdm9pZCBz Y2hlZHVsZVBhdXNlT25OZXh0U3RhdGVtZW50KERlYnVnZ2VyRXZlbnRUeXBlIHR5cGUsIFBhc3NS ZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGRhdGEpOwogICAgIHZvaWQgY2FuY2VsUGF1c2VPbk5leHRT dGF0ZW1lbnQoKTsK