150921 2015-11-04 20:15:16 -0800 Web Inspector: Clean up InjectedScript uses 2015-11-05 11:34:42 -0800 1 1 1 Unclassified WebKit Web Inspector Other All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1139538 0 joepeck 2015-11-04 20:15:16 -0800 * SUMMARY Clean up InjectedScript use - InjectedScripts can be passed as references instead of copied - Some dead InjectedScriptModule code cascades to find more dead code 1139539 1 264839 joepeck 2015-11-04 20:16:38 -0800 Created attachment 264839 [PATCH] Proposed Fix 1139681 2 264839 commit-queue 2015-11-05 11:32:29 -0800 Comment on attachment 264839 [PATCH] Proposed Fix Clearing flags on attachment: 264839 Committed r192064: <http://trac.webkit.org/changeset/192064> 1139682 3 commit-queue 2015-11-05 11:32:33 -0800 All reviewed patches have been landed. Closing bug. 1139684 4 bburg 2015-11-05 11:34:42 -0800 (In reply to comment #0) > * SUMMARY > Clean up InjectedScript use > > - InjectedScripts can be passed as references instead of copied > - Some dead InjectedScriptModule code cascades to find more dead code You should have included these points in the ChangeLog. 264839 2015-11-04 20:16:38 -0800 2015-11-05 11:32:29 -0800 [PATCH] Proposed Fix injected.patch text/plain 14220 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDBhMWU3NjkuLjU2N2E4YjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE1LTExLTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2xlYW4g dXAgSW5qZWN0ZWRTY3JpcHQgdXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTUwOTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwOgorICAgICAgICAo SW5zcGVjdG9yOjpJbmplY3RlZFNjcmlwdDo6d3JhcENhbGxGcmFtZXMpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNj cmlwdEJhc2UuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpJbmplY3RlZFNjcmlwdEJhc2U6Omlu aXRpYWxpemUpOiBEZWxldGVkLgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdEJh c2UuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKEluc3BlY3Rvcjo6SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjpkaWRDcmVhdGVJbmplY3Rl ZFNjcmlwdCk6CisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TWFuYWdlci5oOgor ICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1vZHVsZS5jcHA6CisgICAgICAgIChJ bnNwZWN0b3I6OkluamVjdGVkU2NyaXB0TW9kdWxlOjplbnN1cmVJbmplY3RlZCk6CisgICAgICAg ICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TW9kdWxlLmg6CisgICAgICAgICogaW5zcGVjdG9y L2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6 SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y3VycmVudENhbGxGcmFtZXMpOgorICAgICAgICAqIGlu c3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorCiAyMDE1LTExLTA0ICBY YWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAg UmVtb3ZlIGJvZ3VzIGdsb2JhbCBpbnRlcm5hbCBmdW5jdGlvbnMgZm9yIHByb3BlcnRpZXMgYW5k IHByb3RvdHlwZSByZXRyaWV2YWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKaW5kZXggNDkyMDYwZS4uNzJkMDc1OSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKQEAg LTE5NCw3ICsxOTQsNyBAQCB2b2lkIEluamVjdGVkU2NyaXB0OjpzYXZlUmVzdWx0KEVycm9yU3Ry aW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBjYWxsQXJndQogICAgICAgICAqc2F2ZWRS ZXN1bHRJbmRleCA9IHNhdmVkUmVzdWx0SW5kZXhJbnQ7CiB9CiAKLVJlZjxBcnJheTxJbnNwZWN0 b3I6OlByb3RvY29sOjpEZWJ1Z2dlcjo6Q2FsbEZyYW1lPj4gSW5qZWN0ZWRTY3JpcHQ6OndyYXBD YWxsRnJhbWVzKGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJiBjYWxsRnJhbWVzKQorUmVm PEFycmF5PEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRlYnVnZ2VyOjpDYWxsRnJhbWU+PiBJbmplY3Rl ZFNjcmlwdDo6d3JhcENhbGxGcmFtZXMoY29uc3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmIGNh bGxGcmFtZXMpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFoYXNOb1ZhbHVlKCkpOwogICAgIERlcHJl Y2F0ZWQ6OlNjcmlwdEZ1bmN0aW9uQ2FsbCBmdW5jdGlvbihpbmplY3RlZFNjcmlwdE9iamVjdCgp LCBBU0NJSUxpdGVyYWwoIndyYXBDYWxsRnJhbWVzIiksIGluc3BlY3RvckVudmlyb25tZW50KCkt PmZ1bmN0aW9uQ2FsbEhhbmRsZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0LmgKaW5kZXggYmQ0M2Y3Mi4uNTA5Y2Q1OCAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuaApAQCAtNjIs NyArNjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBnZXRDb2xsZWN0aW9uRW50cmllcyhFcnJvclN0 cmluZyYsIGNvbnN0IFN0cmluZyYgb2JqZWN0SWQsIGNvbnN0IFN0cmluZyYgb2JqZWN0R3JvdXAs IGludCBzdGFydEluZGV4LCBpbnQgbnVtYmVyVG9GZXRjaCwgUmVmUHRyPFByb3RvY29sOjpBcnJh eTxQcm90b2NvbDo6UnVudGltZTo6Q29sbGVjdGlvbkVudHJ5Pj4qIGVudHJpZXMpOwogICAgIHZv aWQgc2F2ZVJlc3VsdChFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgY2FsbEFyZ3VtZW50SlNP TiwgSW5zcGVjdG9yOjpQcm90b2NvbDo6T3B0T3V0cHV0PGludD4qIHNhdmVkUmVzdWx0SW5kZXgp OwogCi0gICAgUmVmPFByb3RvY29sOjpBcnJheTxQcm90b2NvbDo6RGVidWdnZXI6OkNhbGxGcmFt ZT4+IHdyYXBDYWxsRnJhbWVzKGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJik7CisgICAg UmVmPFByb3RvY29sOjpBcnJheTxQcm90b2NvbDo6RGVidWdnZXI6OkNhbGxGcmFtZT4+IHdyYXBD YWxsRnJhbWVzKGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJikgY29uc3Q7CiAgICAgUmVm UHRyPFByb3RvY29sOjpSdW50aW1lOjpSZW1vdGVPYmplY3Q+IHdyYXBPYmplY3QoY29uc3QgRGVw cmVjYXRlZDo6U2NyaXB0VmFsdWUmLCBjb25zdCBTdHJpbmcmIGdyb3VwTmFtZSwgYm9vbCBnZW5l cmF0ZVByZXZpZXcgPSBmYWxzZSkgY29uc3Q7CiAgICAgUmVmUHRyPFByb3RvY29sOjpSdW50aW1l OjpSZW1vdGVPYmplY3Q+IHdyYXBUYWJsZShjb25zdCBEZXByZWNhdGVkOjpTY3JpcHRWYWx1ZSYg dGFibGUsIGNvbnN0IERlcHJlY2F0ZWQ6OlNjcmlwdFZhbHVlJiBjb2x1bW5zKSBjb25zdDsKIApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dEJhc2UuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dEJhc2UuY3BwCmluZGV4IDJkZDU2NDMuLjkyODBhNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRCYXNlLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0QmFzZS5jcHAKQEAgLTU4LDEy ICs1OCw2IEBAIEluamVjdGVkU2NyaXB0QmFzZTo6fkluamVjdGVkU2NyaXB0QmFzZSgpCiB7CiB9 CiAKLXZvaWQgSW5qZWN0ZWRTY3JpcHRCYXNlOjppbml0aWFsaXplKERlcHJlY2F0ZWQ6OlNjcmlw dE9iamVjdCBpbmplY3RlZFNjcmlwdE9iamVjdCwgSW5zcGVjdG9yRW52aXJvbm1lbnQqIGVudmly b25tZW50KQotewotICAgIG1faW5qZWN0ZWRTY3JpcHRPYmplY3QgPSBpbmplY3RlZFNjcmlwdE9i amVjdDsKLSAgICBtX2Vudmlyb25tZW50ID0gZW52aXJvbm1lbnQ7Ci19Ci0KIGJvb2wgSW5qZWN0 ZWRTY3JpcHRCYXNlOjpoYXNBY2Nlc3NUb0luc3BlY3RlZFNjcmlwdFN0YXRlKCkgY29uc3QKIHsK ICAgICByZXR1cm4gbV9lbnZpcm9ubWVudCAmJiBtX2Vudmlyb25tZW50LT5jYW5BY2Nlc3NJbnNw ZWN0ZWRTY3JpcHRTdGF0ZShtX2luamVjdGVkU2NyaXB0T2JqZWN0LnNjcmlwdFN0YXRlKCkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dEJhc2UuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRC YXNlLmgKaW5kZXggMDZjM2Y1Ni4uZmQwMWZhYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdEJhc2UuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0QmFzZS5oCkBAIC02MCw3ICs2MCw2IEBA IHByb3RlY3RlZDoKIAogICAgIEluc3BlY3RvckVudmlyb25tZW50KiBpbnNwZWN0b3JFbnZpcm9u bWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZW52aXJvbm1lbnQ7IH0KIAotICAgIHZvaWQgaW5pdGlh bGl6ZShEZXByZWNhdGVkOjpTY3JpcHRPYmplY3QsIEluc3BlY3RvckVudmlyb25tZW50Kik7CiAg ICAgYm9vbCBoYXNBY2Nlc3NUb0luc3BlY3RlZFNjcmlwdFN0YXRlKCkgY29uc3Q7CiAKICAgICBj b25zdCBEZXByZWNhdGVkOjpTY3JpcHRPYmplY3QmIGluamVjdGVkU2NyaXB0T2JqZWN0KCkgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0TWFuYWdlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0TWFuYWdlci5jcHAKaW5kZXggMGE3NzM0OS4uZTI1ZjllMyAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyLmNwcApAQCAtMTg5LDcgKzE4OSw3IEBAIEluamVjdGVkU2NyaXB0IEluamVjdGVkU2NyaXB0 TWFuYWdlcjo6aW5qZWN0ZWRTY3JpcHRGb3IoRXhlY1N0YXRlKiBpbnNwZWN0ZWRFeGVjCiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KIAotdm9pZCBJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmRpZENyZWF0 ZUluamVjdGVkU2NyaXB0KEluamVjdGVkU2NyaXB0KQordm9pZCBJbmplY3RlZFNjcmlwdE1hbmFn ZXI6OmRpZENyZWF0ZUluamVjdGVkU2NyaXB0KGNvbnN0IEluamVjdGVkU2NyaXB0JikKIHsKICAg ICAvLyBJbnRlbnRpb25hbGx5IGVtcHR5LiBUaGlzIGFsbG93cyBmb3Igc3ViY2xhc3NlcyB0byBp bmplY3QgYWRkaXRpb25hbCBzY3JpcHRzLgogfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmgKaW5kZXggY2I2YzliMy4u NGEzOWRiMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdE1hbmFnZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L0luamVjdGVkU2NyaXB0TWFuYWdlci5oCkBAIC02Nyw3ICs2Nyw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIGNsZWFyRXhjZXB0aW9uVmFsdWUoKTsKIAogcHJvdGVjdGVkOgotICAgIHZpcnR1YWwgdm9p ZCBkaWRDcmVhdGVJbmplY3RlZFNjcmlwdChJbmplY3RlZFNjcmlwdCk7CisgICAgdmlydHVhbCB2 b2lkIGRpZENyZWF0ZUluamVjdGVkU2NyaXB0KGNvbnN0IEluamVjdGVkU2NyaXB0Jik7CiAKICAg ICBIYXNoTWFwPGludCwgSW5qZWN0ZWRTY3JpcHQ+IG1faWRUb0luamVjdGVkU2NyaXB0OwogICAg IEhhc2hNYXA8SlNDOjpFeGVjU3RhdGUqLCBpbnQ+IG1fc2NyaXB0U3RhdGVUb0lkOwpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1vZHVs ZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TW9k dWxlLmNwcAppbmRleCA1YmEyN2UwLi41MmJkYjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TW9kdWxlLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TW9kdWxlLmNwcApAQCAtNTQs NyArNTQsNyBAQCB2b2lkIEluamVjdGVkU2NyaXB0TW9kdWxlOjplbnN1cmVJbmplY3RlZChJbmpl Y3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TQogICAgIGVuc3VyZUluamVjdGVkKGlu amVjdGVkU2NyaXB0TWFuYWdlciwgaW5qZWN0ZWRTY3JpcHQpOwogfQogCi12b2lkIEluamVjdGVk U2NyaXB0TW9kdWxlOjplbnN1cmVJbmplY3RlZChJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVj dGVkU2NyaXB0TWFuYWdlciwgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRTY3JpcHQpCit2b2lkIElu amVjdGVkU2NyaXB0TW9kdWxlOjplbnN1cmVJbmplY3RlZChJbmplY3RlZFNjcmlwdE1hbmFnZXIq IGluamVjdGVkU2NyaXB0TWFuYWdlciwgY29uc3QgSW5qZWN0ZWRTY3JpcHQmIGluamVjdGVkU2Ny aXB0KQogewogICAgIEFTU0VSVCghaW5qZWN0ZWRTY3JpcHQuaGFzTm9WYWx1ZSgpKTsKICAgICBp ZiAoaW5qZWN0ZWRTY3JpcHQuaGFzTm9WYWx1ZSgpKQpAQCAtNzMsMTYgKzczLDExIEBAIHZvaWQg SW5qZWN0ZWRTY3JpcHRNb2R1bGU6OmVuc3VyZUluamVjdGVkKEluamVjdGVkU2NyaXB0TWFuYWdl ciogaW5qZWN0ZWRTY3JpcHRNCiAgICAgICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KHNvdXJj ZSgpKTsKICAgICAgICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoaG9zdChpbmplY3RlZFNjcmlw dE1hbmFnZXIsIGluamVjdGVkU2NyaXB0LnNjcmlwdFN0YXRlKCkpKTsKICAgICAgICAgcmVzdWx0 VmFsdWUgPSBpbmplY3RlZFNjcmlwdC5jYWxsRnVuY3Rpb25XaXRoRXZhbEVuYWJsZWQoZnVuY3Rp b24sIGhhZEV4Y2VwdGlvbik7Ci0gICAgICAgIGlmIChoYWRFeGNlcHRpb24gfHwgKHJldHVybnNP YmplY3QoKSAmJiAocmVzdWx0VmFsdWUuaGFzTm9WYWx1ZSgpIHx8ICFyZXN1bHRWYWx1ZS5pc09i amVjdCgpKSkpIHsKKyAgICAgICAgaWYgKGhhZEV4Y2VwdGlvbikgewogICAgICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9 Ci0KLSAgICBpZiAocmV0dXJuc09iamVjdCgpKSB7Ci0gICAgICAgIERlcHJlY2F0ZWQ6OlNjcmlw dE9iamVjdCBtb2R1bGVPYmplY3QoaW5qZWN0ZWRTY3JpcHQuc2NyaXB0U3RhdGUoKSwgcmVzdWx0 VmFsdWUpOwotICAgICAgICBpbml0aWFsaXplKG1vZHVsZU9iamVjdCwgJmluamVjdGVkU2NyaXB0 TWFuYWdlci0+aW5zcGVjdG9yRW52aXJvbm1lbnQoKSk7Ci0gICAgfQogfQogCiB9IC8vIG5hbWVz cGFjZSBJbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRNb2R1bGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRNb2R1bGUuaAppbmRleCBlODg4MWI5Li5hOTZlNjE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TW9kdWxl LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1v ZHVsZS5oCkBAIC00OSwxNSArNDksMTQgQEAgcHVibGljOgogICAgIHZpcnR1YWwgfkluamVjdGVk U2NyaXB0TW9kdWxlKCk7CiAgICAgdmlydHVhbCBTdHJpbmcgc291cmNlKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgSlNDOjpKU1ZhbHVlIGhvc3QoSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiwgSlND OjpFeGVjU3RhdGUqKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBib29sIHJldHVybnNPYmplY3Qo KSBjb25zdCA9IDA7CiAKIHByb3RlY3RlZDoKICAgICAvLyBEbyBub3QgZXhwb3NlIGNvbnN0cnVj dG9yIGluIHRoZSBjaGlsZCBjbGFzc2VzIGFzIHdlbGwuIEluc3RlYWQgcHJvdmlkZQogICAgIC8v IGEgc3RhdGljIGZhY3RvcnkgbWV0aG9kIHRoYXQgd291bGQgY3JlYXRlIGEgbmV3IGluc3RhbmNl IG9mIHRoZSBjbGFzcwogICAgIC8vIGFuZCBjYWxsIGl0cyBlbnN1cmVJbmplY3RlZCgpIG1ldGhv ZCBpbW1lZGlhdGVseS4KLSAgICBJbmplY3RlZFNjcmlwdE1vZHVsZShjb25zdCBTdHJpbmcmIG5h bWUpOworICAgIGV4cGxpY2l0IEluamVjdGVkU2NyaXB0TW9kdWxlKGNvbnN0IFN0cmluZyYgbmFt ZSk7CiAgICAgdm9pZCBlbnN1cmVJbmplY3RlZChJbmplY3RlZFNjcmlwdE1hbmFnZXIqLCBKU0M6 OkV4ZWNTdGF0ZSopOwotICAgIHZvaWQgZW5zdXJlSW5qZWN0ZWQoSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyKiwgSW5qZWN0ZWRTY3JpcHQpOworICAgIHZvaWQgZW5zdXJlSW5qZWN0ZWQoSW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyKiwgY29uc3QgSW5qZWN0ZWRTY3JpcHQmKTsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIEluc3BlY3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAppbmRleCAxYzA5 MTUyLi42ZjFkOTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtNTkz LDcgKzU5Myw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2NyaXB0RXhlY3V0aW9u QmxvY2tlZEJ5Q1NQKGNvbnN0IFN0cmluZyYgZGlyZWN0aXZlCiAgICAgICAgIGJyZWFrUHJvZ3Jh bShEZWJ1Z2dlckZyb250ZW5kRGlzcGF0Y2hlcjo6UmVhc29uOjpDU1BWaW9sYXRpb24sIGJ1aWxk Q1NQVmlvbGF0aW9uUGF1c2VSZWFzb24oZGlyZWN0aXZlVGV4dCkpOwogfQogCi1SZWY8SW5zcGVj dG9yOjpQcm90b2NvbDo6QXJyYXk8SW5zcGVjdG9yOjpQcm90b2NvbDo6RGVidWdnZXI6OkNhbGxG cmFtZT4+IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmN1cnJlbnRDYWxsRnJhbWVzKEluamVjdGVk U2NyaXB0IGluamVjdGVkU2NyaXB0KQorUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PElu c3BlY3Rvcjo6UHJvdG9jb2w6OkRlYnVnZ2VyOjpDYWxsRnJhbWU+PiBJbnNwZWN0b3JEZWJ1Z2dl ckFnZW50OjpjdXJyZW50Q2FsbEZyYW1lcyhjb25zdCBJbmplY3RlZFNjcmlwdCYgaW5qZWN0ZWRT Y3JpcHQpCiB7CiAgICAgQVNTRVJUKCFpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVlKCkpOwogICAg IGlmIChpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVlKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmggYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmgKaW5kZXggMWI4NmMzNy4uMjdmODZmYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuaApAQCAtMTI5LDcgKzEyOSw3IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIGRpZENsZWFyR2xv YmFsT2JqZWN0KCk7CiAKIHByaXZhdGU6Ci0gICAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFy cmF5PEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRlYnVnZ2VyOjpDYWxsRnJhbWU+PiBjdXJyZW50Q2Fs bEZyYW1lcyhJbmplY3RlZFNjcmlwdCk7CisgICAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFy cmF5PEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRlYnVnZ2VyOjpDYWxsRnJhbWU+PiBjdXJyZW50Q2Fs bEZyYW1lcyhjb25zdCBJbmplY3RlZFNjcmlwdCYpOwogCiAgICAgdmlydHVhbCB2b2lkIGRpZFBh cnNlU291cmNlKEpTQzo6U291cmNlSUQsIGNvbnN0IFNjcmlwdCYpIG92ZXJyaWRlIGZpbmFsOwog ICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBj b25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUsIGludCBlcnJvckxpbmUsIGNvbnN0IFN0 cmluZyYgZXJyb3JNZXNzYWdlKSBvdmVycmlkZSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmNTZiNDg4 Li5jYTNkN2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMTEtMDQgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBDbGVhbiB1cCBJbmplY3RlZFNjcmlwdCB1c2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA5MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9Db21tYW5kTGluZUFQSU1vZHVsZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDb21tYW5kTGluZUFQSU1vZHVsZTo6aW5qZWN0SWZOZWVk ZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q29tbWFuZExpbmVBUElNb2R1bGU6OkNvbW1hbmRMaW5l QVBJTW9kdWxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29tbWFuZExpbmVBUElNb2R1bGUuaDoK KyAgICAgICAgKiBpbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OldlYkluamVjdGVkU2NyaXB0TWFuYWdlcjo6ZGlkQ3JlYXRlSW5qZWN0ZWRT Y3JpcHQpOgorICAgICAgICAqIGluc3BlY3Rvci9XZWJJbmplY3RlZFNjcmlwdE1hbmFnZXIuaDoK KwogMjAxNS0xMS0wNCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTWVkaWFTdHJlYW1dIEEgUmVhbHRpbWVNZWRpYVNvdXJjZSBzaG91bGQgYmVnaW4g cHJvZHVjaW5nIGRhdGEgYXV0b21hdGljYWxseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJTW9kdWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db21tYW5kTGluZUFQSU1vZHVsZS5jcHAKaW5kZXggOWU1NjFkMS4uYTlkNjIxZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJTW9kdWxlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExpbmVBUElNb2R1bGUuY3Bw CkBAIC0zNywxNyArMzcsMTcgQEAgdXNpbmcgbmFtZXNwYWNlIEluc3BlY3RvcjsKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCi1Db21tYW5kTGluZUFQSU1vZHVsZTo6Q29tbWFuZExpbmVBUElNb2R1 bGUoKQotICAgIDogSW5qZWN0ZWRTY3JpcHRNb2R1bGUoQVNDSUlMaXRlcmFsKCJDb21tYW5kTGlu ZUFQSSIpKQotewotfQotCi12b2lkIENvbW1hbmRMaW5lQVBJTW9kdWxlOjppbmplY3RJZk5lZWRl ZChJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TWFuYWdlciwgSW5qZWN0ZWRT Y3JpcHQgaW5qZWN0ZWRTY3JpcHQpCit2b2lkIENvbW1hbmRMaW5lQVBJTW9kdWxlOjppbmplY3RJ Zk5lZWRlZChJbmplY3RlZFNjcmlwdE1hbmFnZXIqIGluamVjdGVkU2NyaXB0TWFuYWdlciwgY29u c3QgSW5qZWN0ZWRTY3JpcHQmIGluamVjdGVkU2NyaXB0KQogewogICAgIENvbW1hbmRMaW5lQVBJ TW9kdWxlIG1vZHVsZTsKICAgICBtb2R1bGUuZW5zdXJlSW5qZWN0ZWQoaW5qZWN0ZWRTY3JpcHRN YW5hZ2VyLCBpbmplY3RlZFNjcmlwdCk7CiB9CiAKK0NvbW1hbmRMaW5lQVBJTW9kdWxlOjpDb21t YW5kTGluZUFQSU1vZHVsZSgpCisgICAgOiBJbmplY3RlZFNjcmlwdE1vZHVsZShBU0NJSUxpdGVy YWwoIkNvbW1hbmRMaW5lQVBJIikpCit7Cit9CisKIFN0cmluZyBDb21tYW5kTGluZUFQSU1vZHVs ZTo6c291cmNlKCkgY29uc3QKIHsKICAgICByZXR1cm4gU3RyaW5nSW1wbDo6Y3JlYXRlV2l0aG91 dENvcHlpbmcoQ29tbWFuZExpbmVBUElNb2R1bGVTb3VyY2VfanMsIHNpemVvZihDb21tYW5kTGlu ZUFQSU1vZHVsZVNvdXJjZV9qcykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0NvbW1hbmRMaW5lQVBJTW9kdWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29t bWFuZExpbmVBUElNb2R1bGUuaAppbmRleCA2NWM5MjA5Li5jMjc1OTY4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExpbmVBUElNb2R1bGUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExpbmVBUElNb2R1bGUuaApAQCAtMzYsOSArMzYs OCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFN0cmluZyBzb3VyY2UoKSBjb25zdCBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIEpTQzo6SlNWYWx1ZSBob3N0KEluc3BlY3Rvcjo6SW5qZWN0ZWRTY3Jp cHRNYW5hZ2VyKiwgSlNDOjpFeGVjU3RhdGUqKSBjb25zdCBvdmVycmlkZTsKLSAgICB2aXJ0dWFs IGJvb2wgcmV0dXJuc09iamVjdCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAK LSAgICBzdGF0aWMgdm9pZCBpbmplY3RJZk5lZWRlZChJbnNwZWN0b3I6OkluamVjdGVkU2NyaXB0 TWFuYWdlciosIEluc3BlY3Rvcjo6SW5qZWN0ZWRTY3JpcHQpOworICAgIHN0YXRpYyB2b2lkIGlu amVjdElmTmVlZGVkKEluc3BlY3Rvcjo6SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiwgY29uc3QgSW5z cGVjdG9yOjpJbmplY3RlZFNjcmlwdCYpOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dlYkluamVjdGVkU2NyaXB0TWFu YWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyLmNwcAppbmRleCA4ZmIyNTJiLi4xODEzNzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcApAQCAtNDcsNyArNDcs NyBAQCB2b2lkIFdlYkluamVjdGVkU2NyaXB0TWFuYWdlcjo6ZGlzY29ubmVjdCgpCiAgICAgbV9j b21tYW5kTGluZUFQSUhvc3QgPSBudWxscHRyOwogfQogCi12b2lkIFdlYkluamVjdGVkU2NyaXB0 TWFuYWdlcjo6ZGlkQ3JlYXRlSW5qZWN0ZWRTY3JpcHQoSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRT Y3JpcHQpCit2b2lkIFdlYkluamVjdGVkU2NyaXB0TWFuYWdlcjo6ZGlkQ3JlYXRlSW5qZWN0ZWRT Y3JpcHQoY29uc3QgSW5zcGVjdG9yOjpJbmplY3RlZFNjcmlwdCYgaW5qZWN0ZWRTY3JpcHQpCiB7 CiAgICAgQ29tbWFuZExpbmVBUElNb2R1bGU6OmluamVjdElmTmVlZGVkKHRoaXMsIGluamVjdGVk U2NyaXB0KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmpl Y3RlZFNjcmlwdE1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9XZWJJbmplY3Rl ZFNjcmlwdE1hbmFnZXIuaAppbmRleCBmY2Q0NWQ3Li4yYjVmMDc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvV2ViSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dlYkluamVjdGVkU2NyaXB0TWFuYWdlci5oCkBAIC00Niw3 ICs0Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc2NhcmRJbmplY3RlZFNjcmlwdHNGb3IoRE9N V2luZG93Kik7CiAKIHByb3RlY3RlZDoKLSAgICB2aXJ0dWFsIHZvaWQgZGlkQ3JlYXRlSW5qZWN0 ZWRTY3JpcHQoSW5zcGVjdG9yOjpJbmplY3RlZFNjcmlwdCkgb3ZlcnJpZGU7CisgICAgdmlydHVh bCB2b2lkIGRpZENyZWF0ZUluamVjdGVkU2NyaXB0KGNvbnN0IEluc3BlY3Rvcjo6SW5qZWN0ZWRT Y3JpcHQmKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICBSZWZQdHI8Q29tbWFuZExpbmVBUElI b3N0PiBtX2NvbW1hbmRMaW5lQVBJSG9zdDsK