201193 2019-08-27 12:33:56 -0700 Web Inspector: don't attach properties to `injectedScript` for the CommandLineAPI 2019-08-27 14:41:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 200971 1 hi hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1565467 0 hi 2019-08-27 12:33:56 -0700 For some reason, specifying `injectedScript._inspectObject` inside CommandLineAPIModuleSource.js causes inspector/debugger/tail-deleted-frames-this-value.html to fail. We should have a similar approach to adding command line api getters/functions, in that the CommandLineAPIModuleSource.js calls a function with a callback. 1565469 1 377367 hi 2019-08-27 12:36:24 -0700 Created attachment 377367 Patch 1565471 2 377367 joepeck 2019-08-27 12:37:44 -0700 Comment on attachment 377367 Patch r=me 1565511 3 377380 hi 2019-08-27 14:07:19 -0700 Created attachment 377380 Patch 1565530 4 377380 commit-queue 2019-08-27 14:40:17 -0700 Comment on attachment 377380 Patch Clearing flags on attachment: 377380 Committed r249173: <https://trac.webkit.org/changeset/249173> 1565531 5 commit-queue 2019-08-27 14:40:19 -0700 All reviewed patches have been landed. Closing bug. 1565533 6 webkit-bug-importer 2019-08-27 14:41:17 -0700 <rdar://problem/54764148> 377367 2019-08-27 12:36:24 -0700 2019-08-27 14:07:18 -0700 Patch bug-201193-20190827123623.patch text/plain 5319 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDlhMDQ1Yjg4ZDVmNjMwOTE0NDFjN2RmNDk3NzQ1 MTdiYjJjNDIzZDAuLjdkYTEyMzA3M2I0NTQ2NGJjZTQ2ZGVlOTdkZjFhZDMwMmM3MzhmMDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA4LTI3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBk b24ndCBhdHRhY2ggcHJvcGVydGllcyB0byBgaW5qZWN0ZWRTY3JpcHRgIGZvciB0aGUgQ29tbWFu ZExpbmVBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMTE5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZvciBzb21lIHJlYXNvbiwgYWRkaW5nIGBpbmplY3RlZFNjcmlwdC5faW5zcGVjdE9iamVjdGAg aW5zaWRlIENvbW1hbmRMaW5lQVBJTW9kdWxlU291cmNlLmpzCisgICAgICAgIGNhdXNlcyBpbnNw ZWN0b3IvZGVidWdnZXIvdGFpbC1kZWxldGVkLWZyYW1lcy10aGlzLXZhbHVlLmh0bWwgdG8gZmFp bC4KKworICAgICAgICBXZSBzaG91bGQgaGF2ZSBhIHNpbWlsYXIgYXBwcm9hY2ggdG8gYWRkaW5n IGNvbW1hbmQgbGluZSBhcGkgZ2V0dGVycyBhbmQgZnVuY3Rpb25zLCBpbiB0aGF0CisgICAgICAg IHRoZSBDb21tYW5kTGluZUFQSU1vZHVsZVNvdXJjZS5qcyBjYWxscyBhIGZ1bmN0aW9uIHdpdGgg YSBjYWxsYmFjay4KKworICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5q czoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0LnByb3RvdHlwZS5pbnNwZWN0T2JqZWN0KToKKyAg ICAgICAgKEluamVjdGVkU2NyaXB0LnByb3RvdHlwZS5zZXRJbnNwZWN0T2JqZWN0KTogQWRkZWQu CisgICAgICAgIChJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUuX2V2YWx1YXRlT24pOgorCiAyMDE5 LTA4LTI2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiB1c2UgbW9yZSBDKysga2V5d29yZHMgZm9yIGRlZmluaW5nIGFnZW50cwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGRhNjAyNzZhM2RjZGU5NTExYTU2YWFhOTFhOTNhZmY4ODg1ODJjODMuLjQ4NWYw MGYwMWY1MWRlMzA1NTIzMTI0MmRhNzc2YmNjODYyNDM1NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOSBAQAorMjAxOS0wOC0yNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogZG9uJ3QgYXR0YWNoIHByb3BlcnRpZXMgdG8gYGluamVj dGVkU2NyaXB0YCBmb3IgdGhlIENvbW1hbmRMaW5lQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDExOTMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3Igc29tZSByZWFzb24sIGFkZGluZyBgaW5qZWN0 ZWRTY3JpcHQuX2luc3BlY3RPYmplY3RgIGluc2lkZSBDb21tYW5kTGluZUFQSU1vZHVsZVNvdXJj ZS5qcworICAgICAgICBjYXVzZXMgaW5zcGVjdG9yL2RlYnVnZ2VyL3RhaWwtZGVsZXRlZC1mcmFt ZXMtdGhpcy12YWx1ZS5odG1sIHRvIGZhaWwuCisKKyAgICAgICAgV2Ugc2hvdWxkIGhhdmUgYSBz aW1pbGFyIGFwcHJvYWNoIHRvIGFkZGluZyBjb21tYW5kIGxpbmUgYXBpIGdldHRlcnMgYW5kIGZ1 bmN0aW9ucywgaW4gdGhhdAorICAgICAgICB0aGUgQ29tbWFuZExpbmVBUElNb2R1bGVTb3VyY2Uu anMgY2FsbHMgYSBmdW5jdGlvbiB3aXRoIGEgY2FsbGJhY2suCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvQ29tbWFuZExpbmVBUElNb2R1bGVTb3VyY2UuanM6CisgICAgICAgIChpbmplY3RlZFNjcmlw dC5faW5zcGVjdE9iamVjdCk6IERlbGV0ZWQuCisKIDIwMTktMDgtMjYgIERldmluIFJvdXNzbyAg PGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSBtb3JlIEMr KyBrZXl3b3JkcyBmb3IgZGVmaW5pbmcgYWdlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwppbmRleCA3YjM4Yzk4 ZDZmODFkOTc3NjA3MTAzMGI0M2Q4ZjRmMDA1NGNkMmIwLi5kMmMwMmU5MzZiYTcyYjljNTE4MTE1 NTlmOTEyYzRjNzE1MDA1NTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAgLTM4NywxMiArMzg3LDYgQEAg bGV0IEluamVjdGVkU2NyaXB0ID0gY2xhc3MgSW5qZWN0ZWRTY3JpcHQKICAgICAgICAgcmV0dXJu IHRoaXMuX29iamVjdEZvcklkKHBhcnNlZE9iamVjdElkKTsKICAgICB9CiAKLSAgICBpbnNwZWN0 T2JqZWN0KG9iamVjdCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9pbnNwZWN0T2JqZWN0KQot ICAgICAgICAgICAgdGhpcy5faW5zcGVjdE9iamVjdChvYmplY3QpOwotICAgIH0KLQogICAgIHJl bGVhc2VPYmplY3Qob2JqZWN0SWQpCiAgICAgewogICAgICAgICBsZXQgcGFyc2VkT2JqZWN0SWQg PSB0aGlzLl9wYXJzZU9iamVjdElkKG9iamVjdElkKTsKQEAgLTQxOSw2ICs0MTMsMTcgQEAgbGV0 IEluamVjdGVkU2NyaXB0ID0gY2xhc3MgSW5qZWN0ZWRTY3JpcHQKIAogICAgIC8vIENvbW1hbmRM aW5lQVBJCiAKKyAgICBpbnNwZWN0T2JqZWN0KG9iamVjdCkKKyAgICB7CisgICAgICAgIGlmICh0 aGlzLl9pbnNwZWN0T2JqZWN0KQorICAgICAgICAgICAgdGhpcy5faW5zcGVjdE9iamVjdChvYmpl Y3QpOworICAgIH0KKworICAgIHNldEluc3BlY3RPYmplY3QoY2FsbGJhY2spCisgICAgeworICAg ICAgICB0aGlzLl9pbnNwZWN0T2JqZWN0ID0gY2FsbGJhY2s7CisgICAgfQorCiAgICAgYWRkQ29t bWFuZExpbmVBUElHZXR0ZXIobmFtZSwgZnVuYykKICAgICB7CiAgICAgICAgIEluamVjdGVkU2Ny aXB0LkNvbW1hbmRMaW5lQVBJLl9nZXR0ZXJzLnB1c2goe25hbWUsIGZ1bmN9KTsKQEAgLTU3OCw3 ICs1ODMsNyBAQCBsZXQgSW5qZWN0ZWRTY3JpcHQgPSBjbGFzcyBJbmplY3RlZFNjcmlwdAogICAg IHsKICAgICAgICAgbGV0IGNvbW1hbmRMaW5lQVBJID0gbnVsbDsKICAgICAgICAgaWYgKGluY2x1 ZGVDb21tYW5kTGluZUFQSSkKLSAgICAgICAgICAgIGNvbW1hbmRMaW5lQVBJID0gbmV3IEluamVj dGVkU2NyaXB0LkNvbW1hbmRMaW5lQVBJKGlzRXZhbE9uQ2FsbEZyYW1lID8gb2JqZWN0IDogbnVs bCkKKyAgICAgICAgICAgIGNvbW1hbmRMaW5lQVBJID0gbmV3IEluamVjdGVkU2NyaXB0LkNvbW1h bmRMaW5lQVBJKGlzRXZhbE9uQ2FsbEZyYW1lID8gb2JqZWN0IDogbnVsbCk7CiAgICAgICAgIHJl dHVybiBldmFsRnVuY3Rpb24uY2FsbChvYmplY3QsIGV4cHJlc3Npb24sIGNvbW1hbmRMaW5lQVBJ KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db21tYW5k TGluZUFQSU1vZHVsZVNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db21tYW5k TGluZUFQSU1vZHVsZVNvdXJjZS5qcwppbmRleCA4ZTU1YzZmYTc1NzRkMmY4NDE0NDg4NDllMjA3 YzU1NjIyMDgxYmQ3Li42NTIwMWE1ZWE5MzhkYWViYTkxMDAxYWYwMTk0OTYwMmFiZDJiMWFkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExpbmVBUElNb2R1bGVT b3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJTW9k dWxlU291cmNlLmpzCkBAIC0zMiwyOSArMzIsMjggQEAKIAogLy8gRklYTUU6IDxodHRwczovL3dl YmtpdC5vcmcvYi8xNTIyOTQ+IFdlYiBJbnNwZWN0b3I6IFBhcnNlIEluamVjdGVkU2NyaXB0U291 cmNlIGFzIGEgYnVpbHQtaW4gdG8gZ2V0IGd1YXJhbnRlZWQgbm9uLXVzZXItb3ZlcnJpZGRlbiBi dWlsdC1pbnMKIAotaW5qZWN0ZWRTY3JpcHQuX2luc3BlY3RPYmplY3QgPSBmdW5jdGlvbihvYmpl Y3QpIHsKK2luamVjdGVkU2NyaXB0LnNldEluc3BlY3RPYmplY3QoZnVuY3Rpb24ob2JqZWN0KSB7 CiAgICAgaWYgKGFyZ3VtZW50cy5sZW5ndGggPT09IDApCiAgICAgICAgIHJldHVybjsKIAotICAg IGxldCBvYmplY3RJZCA9IFJlbW90ZU9iamVjdC5jcmVhdGUob2JqZWN0LCAiIik7CisgICAgbGV0 IG9iamVjdElkID0gUmVtb3RlT2JqZWN0LmNyZWF0ZShvYmplY3QpOwogICAgIGxldCBoaW50cyA9 IHt9OwogCiAgICAgc3dpdGNoIChSZW1vdGVPYmplY3QuZGVzY3JpYmUob2JqZWN0KSkgewogICAg IGNhc2UgIkRhdGFiYXNlIjoKLSAgICAgICAgbGV0IGRhdGFiYXNlSWQgPSBDb21tYW5kTGluZUFQ SUhvc3QuZGF0YWJhc2VJZChvYmplY3QpCisgICAgICAgIHZhciBkYXRhYmFzZUlkID0gQ29tbWFu ZExpbmVBUElIb3N0LmRhdGFiYXNlSWQob2JqZWN0KTsKICAgICAgICAgaWYgKGRhdGFiYXNlSWQp CiAgICAgICAgICAgICBoaW50cy5kYXRhYmFzZUlkID0gZGF0YWJhc2VJZDsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSAiU3RvcmFnZSI6Ci0gICAgICAgIGxldCBzdG9yYWdlSWQgPSBDb21tYW5k TGluZUFQSUhvc3Quc3RvcmFnZUlkKG9iamVjdCkKKyAgICAgICAgdmFyIHN0b3JhZ2VJZCA9IENv bW1hbmRMaW5lQVBJSG9zdC5zdG9yYWdlSWQob2JqZWN0KTsKICAgICAgICAgaWYgKHN0b3JhZ2VJ ZCkKICAgICAgICAgICAgIGhpbnRzLmRvbVN0b3JhZ2VJZCA9IEluamVjdGVkU2NyaXB0SG9zdC5l dmFsdWF0ZSgiKCIgKyBzdG9yYWdlSWQgKyAiKSIpOwogICAgICAgICBicmVhazsKICAgICB9CiAK ICAgICBDb21tYW5kTGluZUFQSUhvc3QuaW5zcGVjdChvYmplY3RJZCwgaGludHMpOwotICAgIHJl dHVybiBvYmplY3Q7Ci19OworfSk7CiAKIGluamVjdGVkU2NyaXB0LmFkZENvbW1hbmRMaW5lQVBJ R2V0dGVyKCIwIiwgZnVuY3Rpb24oKSB7CiAgICAgcmV0dXJuIENvbW1hbmRMaW5lQVBJSG9zdC5p bnNwZWN0ZWRPYmplY3QoKTsK 377380 2019-08-27 14:07:19 -0700 2019-08-27 14:40:17 -0700 Patch bug-201193-20190827140718.patch text/plain 8194 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDQxMzQ0NGMyY2YyMmU0ODI0OWU5NjA3YjE0Mjhl NzE0NmQ5ZDFjMGMuLmJhN2I5NWVmYjQ1ODdlOGQ4ZGQxYmI3YjYwY2FiYWJhNjc0Zjg2OWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA4LTI3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBk b24ndCBhdHRhY2ggcHJvcGVydGllcyB0byBgaW5qZWN0ZWRTY3JpcHRgIGZvciB0aGUgQ29tbWFu ZExpbmVBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMTE5MworCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAg ICBGb3Igc29tZSByZWFzb24sIGFkZGluZyBgaW5qZWN0ZWRTY3JpcHQuX2luc3BlY3RPYmplY3Rg IGluc2lkZSBDb21tYW5kTGluZUFQSU1vZHVsZVNvdXJjZS5qcworICAgICAgICBjYXVzZXMgaW5z cGVjdG9yL2RlYnVnZ2VyL3RhaWwtZGVsZXRlZC1mcmFtZXMtdGhpcy12YWx1ZS5odG1sIHRvIGZh aWwuCisKKyAgICAgICAgV2Ugc2hvdWxkIGhhdmUgYSBzaW1pbGFyIGFwcHJvYWNoIHRvIGFkZGlu ZyBjb21tYW5kIGxpbmUgYXBpIGdldHRlcnMgYW5kIGZ1bmN0aW9ucywgaW4gdGhhdAorICAgICAg ICB0aGUgQ29tbWFuZExpbmVBUElNb2R1bGVTb3VyY2UuanMgY2FsbHMgYSBmdW5jdGlvbiB3aXRo IGEgY2FsbGJhY2suCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2Uu anM6CisgICAgICAgIChJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUuaW5zcGVjdE9iamVjdCk6Cisg ICAgICAgIChJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUuc2V0SW5zcGVjdE9iamVjdCk6IEFkZGVk LgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlLl9ldmFsdWF0ZU9uKToKKwogMjAx OS0wOC0yNyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgY29uc3Ry dWN0RnVuY3Rpb25Ta2lwcGluZ0V2YWxFbmFibGVkQ2hlY2soKSBzaG91bGQgdXNlIHRyeU1ha2VT dHJpbmcoKSBhbmQgY2hlY2sgZm9yIE9PTS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NDJlODg1ZmU0NmIyOThi NTU4MjM4Y2EyOTUxZWFhZGIwYzU2NjJhLi4xYmMzNDAwN2U1ZWZjNzgxNTNlNmJlNzQ3NWM5MjBk NDY1YzNmMjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDgtMjcgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRv bid0IGF0dGFjaCBwcm9wZXJ0aWVzIHRvIGBpbmplY3RlZFNjcmlwdGAgZm9yIHRoZSBDb21tYW5k TGluZUFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAxMTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAg IEZvciBzb21lIHJlYXNvbiwgYWRkaW5nIGBpbmplY3RlZFNjcmlwdC5faW5zcGVjdE9iamVjdGAg aW5zaWRlIENvbW1hbmRMaW5lQVBJTW9kdWxlU291cmNlLmpzCisgICAgICAgIGNhdXNlcyBpbnNw ZWN0b3IvZGVidWdnZXIvdGFpbC1kZWxldGVkLWZyYW1lcy10aGlzLXZhbHVlLmh0bWwgdG8gZmFp bC4KKworICAgICAgICBXZSBzaG91bGQgaGF2ZSBhIHNpbWlsYXIgYXBwcm9hY2ggdG8gYWRkaW5n IGNvbW1hbmQgbGluZSBhcGkgZ2V0dGVycyBhbmQgZnVuY3Rpb25zLCBpbiB0aGF0CisgICAgICAg IHRoZSBDb21tYW5kTGluZUFQSU1vZHVsZVNvdXJjZS5qcyBjYWxscyBhIGZ1bmN0aW9uIHdpdGgg YSBjYWxsYmFjay4KKworICAgICAgICAqIGluc3BlY3Rvci9Db21tYW5kTGluZUFQSU1vZHVsZVNv dXJjZS5qczoKKyAgICAgICAgKGluamVjdGVkU2NyaXB0Ll9pbnNwZWN0T2JqZWN0KTogRGVsZXRl ZC4KKwogMjAxOS0wOC0yNyAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdh bGlhLmNvbT4KIAogICAgICAgICBEcmF3aW5nIGFuIGFuaW1hdGVkIGltYWdlIHRvIGEgY2FudmFz IHZpYSBkcmF3SW1hZ2Ugc2hvdWxkIGRyYXcgdGhlIGZpcnN0IGZyYW1lCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpp bmRleCA3YjM4Yzk4ZDZmODFkOTc3NjA3MTAzMGI0M2Q4ZjRmMDA1NGNkMmIwLi5kMmMwMmU5MzZi YTcyYjljNTE4MTE1NTlmOTEyYzRjNzE1MDA1NTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAgLTM4Nywx MiArMzg3LDYgQEAgbGV0IEluamVjdGVkU2NyaXB0ID0gY2xhc3MgSW5qZWN0ZWRTY3JpcHQKICAg ICAgICAgcmV0dXJuIHRoaXMuX29iamVjdEZvcklkKHBhcnNlZE9iamVjdElkKTsKICAgICB9CiAK LSAgICBpbnNwZWN0T2JqZWN0KG9iamVjdCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9pbnNw ZWN0T2JqZWN0KQotICAgICAgICAgICAgdGhpcy5faW5zcGVjdE9iamVjdChvYmplY3QpOwotICAg IH0KLQogICAgIHJlbGVhc2VPYmplY3Qob2JqZWN0SWQpCiAgICAgewogICAgICAgICBsZXQgcGFy c2VkT2JqZWN0SWQgPSB0aGlzLl9wYXJzZU9iamVjdElkKG9iamVjdElkKTsKQEAgLTQxOSw2ICs0 MTMsMTcgQEAgbGV0IEluamVjdGVkU2NyaXB0ID0gY2xhc3MgSW5qZWN0ZWRTY3JpcHQKIAogICAg IC8vIENvbW1hbmRMaW5lQVBJCiAKKyAgICBpbnNwZWN0T2JqZWN0KG9iamVjdCkKKyAgICB7Cisg ICAgICAgIGlmICh0aGlzLl9pbnNwZWN0T2JqZWN0KQorICAgICAgICAgICAgdGhpcy5faW5zcGVj dE9iamVjdChvYmplY3QpOworICAgIH0KKworICAgIHNldEluc3BlY3RPYmplY3QoY2FsbGJhY2sp CisgICAgeworICAgICAgICB0aGlzLl9pbnNwZWN0T2JqZWN0ID0gY2FsbGJhY2s7CisgICAgfQor CiAgICAgYWRkQ29tbWFuZExpbmVBUElHZXR0ZXIobmFtZSwgZnVuYykKICAgICB7CiAgICAgICAg IEluamVjdGVkU2NyaXB0LkNvbW1hbmRMaW5lQVBJLl9nZXR0ZXJzLnB1c2goe25hbWUsIGZ1bmN9 KTsKQEAgLTU3OCw3ICs1ODMsNyBAQCBsZXQgSW5qZWN0ZWRTY3JpcHQgPSBjbGFzcyBJbmplY3Rl ZFNjcmlwdAogICAgIHsKICAgICAgICAgbGV0IGNvbW1hbmRMaW5lQVBJID0gbnVsbDsKICAgICAg ICAgaWYgKGluY2x1ZGVDb21tYW5kTGluZUFQSSkKLSAgICAgICAgICAgIGNvbW1hbmRMaW5lQVBJ ID0gbmV3IEluamVjdGVkU2NyaXB0LkNvbW1hbmRMaW5lQVBJKGlzRXZhbE9uQ2FsbEZyYW1lID8g b2JqZWN0IDogbnVsbCkKKyAgICAgICAgICAgIGNvbW1hbmRMaW5lQVBJID0gbmV3IEluamVjdGVk U2NyaXB0LkNvbW1hbmRMaW5lQVBJKGlzRXZhbE9uQ2FsbEZyYW1lID8gb2JqZWN0IDogbnVsbCk7 CiAgICAgICAgIHJldHVybiBldmFsRnVuY3Rpb24uY2FsbChvYmplY3QsIGV4cHJlc3Npb24sIGNv bW1hbmRMaW5lQVBJKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db21tYW5kTGluZUFQSU1vZHVsZVNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db21tYW5kTGluZUFQSU1vZHVsZVNvdXJjZS5qcwppbmRleCA4ZTU1YzZmYTc1NzRkMmY4 NDE0NDg4NDllMjA3YzU1NjIyMDgxYmQ3Li42NTIwMWE1ZWE5MzhkYWViYTkxMDAxYWYwMTk0OTYw MmFiZDJiMWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExp bmVBUElNb2R1bGVTb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1h bmRMaW5lQVBJTW9kdWxlU291cmNlLmpzCkBAIC0zMiwyOSArMzIsMjggQEAKIAogLy8gRklYTUU6 IDxodHRwczovL3dlYmtpdC5vcmcvYi8xNTIyOTQ+IFdlYiBJbnNwZWN0b3I6IFBhcnNlIEluamVj dGVkU2NyaXB0U291cmNlIGFzIGEgYnVpbHQtaW4gdG8gZ2V0IGd1YXJhbnRlZWQgbm9uLXVzZXIt b3ZlcnJpZGRlbiBidWlsdC1pbnMKIAotaW5qZWN0ZWRTY3JpcHQuX2luc3BlY3RPYmplY3QgPSBm dW5jdGlvbihvYmplY3QpIHsKK2luamVjdGVkU2NyaXB0LnNldEluc3BlY3RPYmplY3QoZnVuY3Rp b24ob2JqZWN0KSB7CiAgICAgaWYgKGFyZ3VtZW50cy5sZW5ndGggPT09IDApCiAgICAgICAgIHJl dHVybjsKIAotICAgIGxldCBvYmplY3RJZCA9IFJlbW90ZU9iamVjdC5jcmVhdGUob2JqZWN0LCAi Iik7CisgICAgbGV0IG9iamVjdElkID0gUmVtb3RlT2JqZWN0LmNyZWF0ZShvYmplY3QpOwogICAg IGxldCBoaW50cyA9IHt9OwogCiAgICAgc3dpdGNoIChSZW1vdGVPYmplY3QuZGVzY3JpYmUob2Jq ZWN0KSkgewogICAgIGNhc2UgIkRhdGFiYXNlIjoKLSAgICAgICAgbGV0IGRhdGFiYXNlSWQgPSBD b21tYW5kTGluZUFQSUhvc3QuZGF0YWJhc2VJZChvYmplY3QpCisgICAgICAgIHZhciBkYXRhYmFz ZUlkID0gQ29tbWFuZExpbmVBUElIb3N0LmRhdGFiYXNlSWQob2JqZWN0KTsKICAgICAgICAgaWYg KGRhdGFiYXNlSWQpCiAgICAgICAgICAgICBoaW50cy5kYXRhYmFzZUlkID0gZGF0YWJhc2VJZDsK ICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSAiU3RvcmFnZSI6Ci0gICAgICAgIGxldCBzdG9yYWdl SWQgPSBDb21tYW5kTGluZUFQSUhvc3Quc3RvcmFnZUlkKG9iamVjdCkKKyAgICAgICAgdmFyIHN0 b3JhZ2VJZCA9IENvbW1hbmRMaW5lQVBJSG9zdC5zdG9yYWdlSWQob2JqZWN0KTsKICAgICAgICAg aWYgKHN0b3JhZ2VJZCkKICAgICAgICAgICAgIGhpbnRzLmRvbVN0b3JhZ2VJZCA9IEluamVjdGVk U2NyaXB0SG9zdC5ldmFsdWF0ZSgiKCIgKyBzdG9yYWdlSWQgKyAiKSIpOwogICAgICAgICBicmVh azsKICAgICB9CiAKICAgICBDb21tYW5kTGluZUFQSUhvc3QuaW5zcGVjdChvYmplY3RJZCwgaGlu dHMpOwotICAgIHJldHVybiBvYmplY3Q7Ci19OworfSk7CiAKIGluamVjdGVkU2NyaXB0LmFkZENv bW1hbmRMaW5lQVBJR2V0dGVyKCIwIiwgZnVuY3Rpb24oKSB7CiAgICAgcmV0dXJuIENvbW1hbmRM aW5lQVBJSG9zdC5pbnNwZWN0ZWRPYmplY3QoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjZTBlNGNkYjc5MjZlYzkyYjIy YzhkMGFkZTA0N2U5ZGUyZmFkODQ3Li43OGUzYzAzZjRlOGU3ZGQwZmVkMTlhNjBlM2E0ZmEyY2Y2 N2U2NDJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDgtMjcgIERldmluIFJvdXNzbyAg PGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGRvbid0IGF0dGFj aCBwcm9wZXJ0aWVzIHRvIGBpbmplY3RlZFNjcmlwdGAgZm9yIHRoZSBDb21tYW5kTGluZUFQSQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMTkzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgICogaHR0cC90 ZXN0cy9pbnNwZWN0b3IvZG9tL2Nyb3NzLWRvbWFpbi1pbnNwZWN0ZWQtbm9kZS1hY2Nlc3MtZXhw ZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL2NvbW1hbmQtbGluZS1hcGkt ZXhwZWN0ZWQudHh0OgorCiAyMDE5LTA4LTI3ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAg PGNsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIERyYXdpbmcgYW4gYW5pbWF0ZWQgaW1hZ2Ug dG8gYSBjYW52YXMgdmlhIGRyYXdJbWFnZSBzaG91bGQgZHJhdyB0aGUgZmlyc3QgZnJhbWUKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RvbS9jcm9zcy1kb21h aW4taW5zcGVjdGVkLW5vZGUtYWNjZXNzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvaW5zcGVjdG9yL2RvbS9jcm9zcy1kb21haW4taW5zcGVjdGVkLW5vZGUtYWNjZXNzLWV4 cGVjdGVkLnR4dAppbmRleCA1YjA4YjQxY2VjYTM3ZmNhOGUyYWM1MDcxMjBmN2FlMTViY2RjYzVl Li4xMmRjZTk4ZWY0MDVmZGE1NzZmMmVmY2FhZDhiNDViOGQxNTdlZjNhIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kb20vY3Jvc3MtZG9tYWluLWluc3BlY3Rl ZC1ub2RlLWFjY2Vzcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvZG9tL2Nyb3NzLWRvbWFpbi1pbnNwZWN0ZWQtbm9kZS1hY2Nlc3MtZXhwZWN0ZWQu dHh0CkBAIC0xLDUgKzEsNSBAQAotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDg6IEJsb2NrZWQgYSBm cmFtZSB3aXRoIG9yaWdpbiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiBmcm9tIGFjY2Vzc2luZyBh IGZyYW1lIHdpdGggb3JpZ2luICJodHRwOi8vbG9jYWxob3N0OjgwMDAiLiBQcm90b2NvbHMsIGRv bWFpbnMsIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDg6IEJs b2NrZWQgYSBmcmFtZSB3aXRoIG9yaWdpbiAiaHR0cDovL2xvY2FsaG9zdDo4MDAwIiBmcm9tIGFj Y2Vzc2luZyBhIGZyYW1lIHdpdGggb3JpZ2luICJodHRwOi8vMTI3LjAuMC4xOjgwMDAiLiBQcm90 b2NvbHMsIGRvbWFpbnMsIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgorQ09OU09MRSBNRVNTQUdFOiBs aW5lIDY6IEJsb2NrZWQgYSBmcmFtZSB3aXRoIG9yaWdpbiAiaHR0cDovLzEyNy4wLjAuMTo4MDAw IiBmcm9tIGFjY2Vzc2luZyBhIGZyYW1lIHdpdGggb3JpZ2luICJodHRwOi8vbG9jYWxob3N0Ojgw MDAiLiBQcm90b2NvbHMsIGRvbWFpbnMsIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgorQ09OU09MRSBN RVNTQUdFOiBsaW5lIDY6IEJsb2NrZWQgYSBmcmFtZSB3aXRoIG9yaWdpbiAiaHR0cDovL2xvY2Fs aG9zdDo4MDAwIiBmcm9tIGFjY2Vzc2luZyBhIGZyYW1lIHdpdGggb3JpZ2luICJodHRwOi8vMTI3 LjAuMC4xOjgwMDAiLiBQcm90b2NvbHMsIGRvbWFpbnMsIGFuZCBwb3J0cyBtdXN0IG1hdGNoLgog VGVzdCB0aGF0IGNvZGUgZXZhbHVhdGVkIGluIHRoZSBtYWluIGZyYW1lIGNhbm5vdCBhY2Nlc3Mg JDAgdGhhdCByZXNvbHZlcyB0byBhIG5vZGUgaW4gYSBmcmFtZSBmcm9tIGEgZGlmZmVyZW50IGRv bWFpbi4gQnVnIDEwNTQyMy4KIAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv Y29uc29sZS9jb21tYW5kLWxpbmUtYXBpLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jb25zb2xlL2NvbW1hbmQtbGluZS1hcGktZXhwZWN0ZWQudHh0CmluZGV4IDZjZjY4Yjg3 OWRhZjUxNTE0NjExMzM5ZGJmNWJlYjVkMzE3YmMwNjcuLmZkYmJlNTliMWY0ODA1Yzc4YWYxYjll NWQyNDlhM2Q4NWY4YzAxMmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25z b2xlL2NvbW1hbmQtbGluZS1hcGktZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jb25zb2xlL2NvbW1hbmQtbGluZS1hcGktZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNCBA QAotQ09OU09MRSBNRVNTQUdFOiBsaW5lIDMxOiBUaGUgY29uc29sZSBmdW5jdGlvbiAkKCkgaGFz IGNoYW5nZWQgZnJvbSAkPWdldEVsZW1lbnRCeUlkKGlkKSB0byAkPXF1ZXJ5U2VsZWN0b3Ioc2Vs ZWN0b3IpLiBZb3UgbWlnaHQgdHJ5ICQoIiMlcyIpCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMjk6 IFRoZSBjb25zb2xlIGZ1bmN0aW9uICQoKSBoYXMgY2hhbmdlZCBmcm9tICQ9Z2V0RWxlbWVudEJ5 SWQoaWQpIHRvICQ9cXVlcnlTZWxlY3RvcihzZWxlY3RvcikuIFlvdSBtaWdodCB0cnkgJCgiIyVz IikKIFRlc3RzIHRoYXQgY29tbWFuZCBsaW5lIGFwaSB3b3Jrcy4KIAogCg==