28047 2009-08-06 08:53:19 -0700 add utility method to enable logging messages for inspector development 2009-09-01 17:38:19 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Enhancement --- 0 pmuellr webkit-unassigned eric rik oldest_to_newest 137580 0 pmuellr 2009-08-06 08:53:19 -0700 It's handy to have somewhere to dump messages while doing Web Inspector development. The existing console seems like a handy place. Unfortunately, the code to get a message added to the console is non-trivial, as it requires building a ConsoleMessage object first. Suggestion is to add a utility method to ConsoleView called "log" which can be called from within Web Inspector code to easily log messages to the console. Code can then just use something like the following to dump a message: WebInspector.console.log("Hello, world!"); Additional suggestion that the message be styled somehow to differentiate it from other messages in the console. 137581 1 34211 pmuellr 2009-08-06 08:55:42 -0700 Created attachment 34211 patch to ConsoleView to add a log() function Uploading patch to see if this seems appropriate. the "log" method on ConsoleView instances will append a message of a new message level "Debug". These messages are styled with the "search" icon to distinguish them from other messages in the console. 138311 2 rik 2009-08-08 05:03:50 -0700 You can already log messages with the traditional console api. Messages will appear in the inspector's inspector. Open it with the Inspect Element contextual option on any part o thé inspector. This is far more useful since you can use the whole console api. 138432 3 pmuellr 2009-08-08 15:19:58 -0700 Yes, I understand. But if all I need is a "printf" capability, bringing up inspector gets in the way. It's also not clear that all environments support "inspecting the inspector". Since doing the patch, I figured it would be even easier to have a log function directly off of "WebInspector" instead of having to traverse through the console object. 138730 4 pmuellr 2009-08-10 11:06:07 -0700 changed title to remove specific implementation detail 138734 5 34485 pmuellr 2009-08-10 11:11:23 -0700 Created attachment 34485 proposed patch New patch adds a method "log" to the WebInspector global which takes a string and prints it to the existing console, using a "magnifying glass" icon to distinguish it from other console messages. Intended to be used while developing Web Inspector code, so you can easily print a message to the console that's already available. 143119 6 34485 timothy 2009-08-27 08:32:35 -0700 Comment on attachment 34485 proposed patch WebCore/page/Console.h needs updated to match the MessageLevel change. (Even if there is no C++ use of Debug.) Otherwise this seems fine. 143746 7 38841 pmuellr 2009-08-31 15:54:48 -0700 Created attachment 38841 proposed patch - 2009/08/31 Per previous review, updated WebCore/page/Console.h with the new level. Also added corresponding change in the .cpp file (to print the level name). I also attempted to get the "repeatCount" bit right with the message. As it is, if you repeat a message, as in the supplied manual test case, you get neither a new message nor a repeat count badge. I'm going to chalk this up to wonkiness introduced by bug 28856, but I don't think the bad behaviour is a show-stopper, since the new behaviour is only relevant to WebKit developers. I've tested the repeatCount code by manually maintaining a repeatCount myself, just to make sure the CSS bits work, and they do. What I don't know is if I have to actually maintain the repeatCount, or if the ConsoleView.addMessage() is supposed to be doing that for me. Looks like the latter. 144071 8 38841 eric 2009-09-01 17:38:16 -0700 Comment on attachment 38841 proposed patch - 2009/08/31 Clearing flags on attachment: 38841 Committed r47952: <http://trac.webkit.org/changeset/47952> 144072 9 eric 2009-09-01 17:38:19 -0700 All reviewed patches have been landed. Closing bug. 34211 2009-08-06 08:55:42 -0700 2009-08-10 11:11:23 -0700 patch to ConsoleView to add a log() function console.patch text/plain 2647 pmuellr SW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMJKHJldmlz aW9uIDQ2ODA5KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3Lmpz CSh3b3JraW5nIGNvcHkpCkBAIC02Niw2ICs2NiwyMyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmRyYXdlci52aXNpYmxlVmlldyA9IHRoaXM7 CiAgICAgfSwKIAorICAgIC8vIGNvbnZlbmllbmNlIHRvIGxvZyBtZXNzYWdlcyB3aGlsZSBkZWJ1 Z2dpbmcgaW5zcGVjdG9yCisgICAgbG9nOiBmdW5jdGlvbihtZXNzYWdlKQorICAgIHsKKyAgICAg ICAgdmFyIG1zZyA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UoCisgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5PdGhlciwgCisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuTG9nLCAKKyAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRGVidWcs IAorICAgICAgICAgICAgMCwKKyAgICAgICAgICAgIG51bGwsCisgICAgICAgICAgICAwLAorICAg ICAgICAgICAgMCwKKyAgICAgICAgICAgIG1lc3NhZ2UKKyAgICAgICAgICAgICk7CisgICAgICAg ICAgICAKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuYWRkTWVzc2FnZShtc2cpOworICAg IH0sCisgICAgCiAgICAgYXR0YWNoOiBmdW5jdGlvbihtYWluRWxlbWVudCwgc3RhdHVzQmFyRWxl bWVudCkKICAgICB7CiAgICAgICAgIG1haW5FbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuZWxlbWVu dCk7CkBAIC02NzcsNiArNjk0LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3Rv dHlwZSA9IAogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVz c2FnZUxldmVsLkxvZzoKICAgICAgICAgICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNv bnNvbGUtbG9nLWxldmVsIik7CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRGVidWc6CisgICAg ICAgICAgICAgICAgZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJjb25zb2xlLWRlYnVnLWxldmVsIik7 CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5D b25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuV2FybmluZzoKICAgICAgICAgICAgICAgICBlbGVt ZW50LmFkZFN0eWxlQ2xhc3MoImNvbnNvbGUtd2FybmluZy1sZXZlbCIpOwogICAgICAgICAgICAg ICAgIGJyZWFrOwpAQCAtNzgzLDYgKzgwMyw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5wcm90b3R5cGUgPSAKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VMZXZlbC5XYXJuaW5nOgogICAgICAgICAgICAgICAgIGxldmVsU3RyaW5nID0g Ildhcm5pbmciOwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkRlYnVnOgorICAgICAgICAgICAg ICAgIGxldmVsU3RyaW5nID0gIkRlYnVnIjsKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJv cjoKICAgICAgICAgICAgICAgICBsZXZlbFN0cmluZyA9ICJFcnJvciI7CiAgICAgICAgICAgICAg ICAgYnJlYWs7CkBAIC04MjksNyArODUyLDggQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl Lk1lc3NhZ2VMZXZlbAogICAgIFRpcDogMCwKICAgICBMb2c6IDEsCiAgICAgV2FybmluZzogMiwK LSAgICBFcnJvcjogMworICAgIEVycm9yOiAzLAorICAgIERlYnVnOiA0CiB9CiAKIFdlYkluc3Bl Y3Rvci5Db25zb2xlQ29tbWFuZCA9IGZ1bmN0aW9uKGNvbW1hbmQpCkluZGV4OiBXZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwkocmV2aXNpb24gNDY4MDkpCisrKyBXZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwkod29ya2luZyBjb3B5KQpAQCAt NTg4LDYgKzU4OCwxMCBAQCBib2R5LmRyYXdlci12aXNpYmxlICNkcmF3ZXIgewogICAgIGNvbG9y OiByZWQ7CiB9CiAKKy5jb25zb2xlLWRlYnVnLWxldmVsOjpiZWZvcmUgeworICAgIGJhY2tncm91 bmQtaW1hZ2U6IHVybChJbWFnZXMvc2VhcmNoU21hbGxCcmlnaHRCbHVlLnBuZyk7Cit9CisKIC5j b25zb2xlLWVycm9yLWxldmVsOjpiZWZvcmUgewogICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybChJ bWFnZXMvZXJyb3JJY29uLnBuZyk7CiB9Cg== 34485 2009-08-10 11:11:23 -0700 2009-08-31 15:54:48 -0700 proposed patch 28047.patch text/plain 3601 pmuellr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Njk4NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDgtMTAgIFBhdHJpY2sgTXVlbGxlciAgPFBhdHJpY2tfTXVl bGxlckB1cy5pYm0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCB1dGlsaXR5IG1ldGhvZCB0byBlbmFibGUgbG9nZ2luZyBtZXNzYWdlcyBm b3IgaW5zcGVjdG9yIGRldmVsb3BtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yODA0NworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5wcm90 b3R5cGUudG9NZXNzYWdlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UucHJvdG90eXBlLnRvU3RyaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5jc3M6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IubG9nKToKKwogMjAwOS0wOC0xMCAgRGFuIEJlcm5z dGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJs c3Nvbi4KSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMJ KHJldmlzaW9uIDQ2OTY5KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzCSh3b3JraW5nIGNvcHkpCkBAIC02ODMsNiArNjgzLDkgQEAgV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IAogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkxvZzoKICAgICAgICAgICAgICAgICBlbGVtZW50 LmFkZFN0eWxlQ2xhc3MoImNvbnNvbGUtbG9nLWxldmVsIik7CiAgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdl TGV2ZWwuRGVidWc6CisgICAgICAgICAgICAgICAgZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJjb25z b2xlLWRlYnVnLWxldmVsIik7CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuV2FybmluZzoKICAg ICAgICAgICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNvbnNvbGUtd2FybmluZy1sZXZl bCIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtNzg5LDYgKzc5Miw5IEBAIFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5wcm90b3R5cGUgPSAKICAgICAgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5XYXJuaW5nOgogICAgICAgICAgICAg ICAgIGxldmVsU3RyaW5nID0gIldhcm5pbmciOwogICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkRl YnVnOgorICAgICAgICAgICAgICAgIGxldmVsU3RyaW5nID0gIkRlYnVnIjsKKyAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl Lk1lc3NhZ2VMZXZlbC5FcnJvcjoKICAgICAgICAgICAgICAgICBsZXZlbFN0cmluZyA9ICJFcnJv ciI7CiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC04MzUsNyArODQxLDggQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbAogICAgIFRpcDogMCwKICAgICBMb2c6IDEs CiAgICAgV2FybmluZzogMiwKLSAgICBFcnJvcjogMworICAgIEVycm9yOiAzLAorICAgIERlYnVn OiA0CiB9CiAKIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZCA9IGZ1bmN0aW9uKGNvbW1hbmQp CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwkocmV2aXNp b24gNDY5NjkpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwko d29ya2luZyBjb3B5KQpAQCAtNTg4LDYgKzU4OCwxMCBAQCBib2R5LmRyYXdlci12aXNpYmxlICNk cmF3ZXIgewogICAgIGNvbG9yOiByZWQ7CiB9CiAKKy5jb25zb2xlLWRlYnVnLWxldmVsOjpiZWZv cmUgeworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybChJbWFnZXMvc2VhcmNoU21hbGxCcmlnaHRC bHVlLnBuZyk7Cit9CisKIC5jb25zb2xlLWVycm9yLWxldmVsOjpiZWZvcmUgewogICAgIGJhY2tn cm91bmQtaW1hZ2U6IHVybChJbWFnZXMvZXJyb3JJY29uLnBuZyk7CiB9CkluZGV4OiBXZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMJKHJldmlzaW9uIDQ2OTY5KQorKysgV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwkod29ya2luZyBjb3B5KQpAQCAt MTA5OCw2ICsxMDk4LDIwIEBAIFdlYkluc3BlY3Rvci5hZGRNZXNzYWdlVG9Db25zb2xlID0gZnVu Y3QKICAgICB0aGlzLmNvbnNvbGUuYWRkTWVzc2FnZShjb25zb2xlTWVzc2FnZSk7CiB9CiAKK1dl Ykluc3BlY3Rvci5sb2cgPSBmdW5jdGlvbihtZXNzYWdlKSB7CisgICAgdmFyIG1lc3NhZ2VQcm9w ZXJ0aWVzID0geworICAgICAgICBzb3VyY2U6IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5N ZXNzYWdlU291cmNlLk90aGVyLAorICAgICAgICB0eXBlOiBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVR5cGUuTG9nLCAKKyAgICAgICAgbGV2ZWw6IFdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRGVidWcsIAorICAgICAgICBsaW5lOiAwLAorICAgICAg ICB1cmw6IG51bGwsCisgICAgICAgIGdyb3VwTGV2ZWw6IDAsCisgICAgICAgIHJlcGVhdENvdW50 OiAwCisgICAgfTsKKworICAgIFdlYkluc3BlY3Rvci5hZGRNZXNzYWdlVG9Db25zb2xlKG1lc3Nh Z2VQcm9wZXJ0aWVzLCBtZXNzYWdlKTsKK30KKwogV2ViSW5zcGVjdG9yLmFkZFByb2ZpbGUgPSBm dW5jdGlvbihwcm9maWxlKQogewogICAgIHRoaXMucGFuZWxzLnByb2ZpbGVzLmFkZFByb2ZpbGUo cHJvZmlsZSk7Cg== 38841 2009-08-31 15:54:48 -0700 2009-09-01 17:38:16 -0700 proposed patch - 2009/08/31 28047.patch text/plain 6566 pmuellr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzkwOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDktMDgtMzEgIFBhdHJpY2sgTXVlbGxlciAgPFBhdHJpY2tfTXVl bGxlckB1cy5pYm0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODA0Nwor ICAgICAgICBhZGQgdXRpbGl0eSBtZXRob2QgdG8gZW5hYmxlIGxvZ2dpbmcgbWVzc2FnZXMgZm9y IGluc3BlY3RvciBkZXZlbG9wbWVudAorCisgICAgICAgIG1hbnVhbCB0ZXN0IGNhc2UgYWRkZWQg KHNlZSBiZWxvdykKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLnRvTWVz c2FnZUVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3Rv dHlwZS50b1N0cmluZyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu Y3NzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLmxvZyk6CisgICAgICAgICogbWFudWFsLXRlc3RzL2luc3BlY3Rvci93 ZWJpbnNwZWN0b3ItbG9nLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBhZ2UvQ29uc29sZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpwcmludE1lc3NhZ2VTb3VyY2VBbmRMZXZlbFByZWZpeCk6Cisg ICAgICAgICogcGFnZS9Db25zb2xlLmg6CisgICAgICAgIChXZWJDb3JlOjopOgorCiAyMDA5LTA4 LTMxICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2ZXJ0aW5nIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQ3OTA0LCBiZWNhdXNl IGl0IGNhdXNlZApJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3 LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmll dy5qcwkocmV2aXNpb24gNDc4ODMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanMJKHdvcmtpbmcgY29weSkKQEAgLTY1NSw2ICs2NTUsOSBAQCBXZWJJbnNwZWN0 b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlID0gCiAgICAgICAgICAgICBjYXNlIFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuTG9nOgogICAgICAgICAgICAgICAgIGVs ZW1lbnQuYWRkU3R5bGVDbGFzcygiY29uc29sZS1sb2ctbGV2ZWwiKTsKICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1l c3NhZ2VMZXZlbC5EZWJ1ZzoKKyAgICAgICAgICAgICAgICBlbGVtZW50LmFkZFN0eWxlQ2xhc3Mo ImNvbnNvbGUtZGVidWctbGV2ZWwiKTsKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIGNhc2UgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5XYXJuaW5n OgogICAgICAgICAgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVDbGFzcygiY29uc29sZS13YXJuaW5n LWxldmVsIik7CiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC03NjEsNiArNzY0LDkgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3RvdHlwZSA9IAogICAgICAgICAgICAgY2FzZSBX ZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLldhcm5pbmc6CiAgICAgICAg ICAgICAgICAgbGV2ZWxTdHJpbmcgPSAiV2FybmluZyI7CiAgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2 ZWwuRGVidWc6CisgICAgICAgICAgICAgICAgbGV2ZWxTdHJpbmcgPSAiRGVidWciOworICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yOgogICAgICAgICAgICAgICAgIGxldmVsU3RyaW5nID0g IkVycm9yIjsKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTgwNyw3ICs4MTMsOCBAQCBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsCiAgICAgVGlwOiAwLAogICAgIExv ZzogMSwKICAgICBXYXJuaW5nOiAyLAotICAgIEVycm9yOiAzCisgICAgRXJyb3I6IDMsCisgICAg RGVidWc6IDQKIH0KIAogV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kID0gZnVuY3Rpb24oY29t bWFuZCkKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCShy ZXZpc2lvbiA0Nzg4MykKKysrIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu Y3NzCSh3b3JraW5nIGNvcHkpCkBAIC01NDMsNyArNTQzLDcgQEAgYm9keS5kcmF3ZXItdmlzaWJs ZSAjZHJhd2VyIHsKICAgICBwYWRkaW5nLWxlZnQ6IDZweDsKIH0KIAotLnJlcGVhdGVkLW1lc3Nh Z2UuY29uc29sZS1lcnJvci1sZXZlbDo6YmVmb3JlLCAucmVwZWF0ZWQtbWVzc2FnZS5jb25zb2xl LXdhcm5pbmctbGV2ZWw6YmVmb3JlIHsKKy5yZXBlYXRlZC1tZXNzYWdlLmNvbnNvbGUtZXJyb3It bGV2ZWw6OmJlZm9yZSwgLnJlcGVhdGVkLW1lc3NhZ2UuY29uc29sZS13YXJuaW5nLWxldmVsOmJl Zm9yZSwgLnJlcGVhdGVkLW1lc3NhZ2UuY29uc29sZS1kZWJ1Zy1sZXZlbDpiZWZvcmUgewogICAg IHZpc2liaWxpdHk6IGhpZGRlbjsKIH0KIApAQCAtNTc0LDYgKzU3NCwxNCBAQCBib2R5LmRyYXdl ci12aXNpYmxlICNkcmF3ZXIgewogICAgIGNvbG9yOiByZWQ7CiB9CiAKKy5jb25zb2xlLWRlYnVn LWxldmVsIC5jb25zb2xlLW1lc3NhZ2UtdGV4dCB7CisgICAgY29sb3I6IGJsdWU7Cit9CisKKy5j b25zb2xlLWRlYnVnLWxldmVsOjpiZWZvcmUgeworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybChJ bWFnZXMvc2VhcmNoU21hbGxCcmlnaHRCbHVlLnBuZyk7Cit9CisKIC5jb25zb2xlLWVycm9yLWxl dmVsOjpiZWZvcmUgewogICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybChJbWFnZXMvZXJyb3JJY29u LnBuZyk7CiB9CkBAIC0yOTg2LDYgKzI5OTQsMTAgQEAgYm9keS5pbmFjdGl2ZSAuc2lkZWJhci10 cmVlLWl0ZW0uc2VsZWN0ZQogICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvcmVzb3VyY2VEb2N1bWVu dEljb25TbWFsbC5wbmcpOwogfQogCisuYnViYmxlLmRlYnVnLCAuY29uc29sZS1kZWJ1Zy1sZXZl bCAuYnViYmxlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMCwgMCwgMjU1KSAhaW1wb3J0 YW50OworfQorCiAuYnViYmxlLndhcm5pbmcsIC5jb25zb2xlLXdhcm5pbmctbGV2ZWwgLmJ1YmJs ZSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIzMiwgMTY0LCAwKSAhaW1wb3J0YW50Owog fQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCShyZXZpc2lv biA0Nzg4MykKKysrIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMJKHdv cmtpbmcgY29weSkKQEAgLTExMDgsNiArMTEwOCwyMCBAQCBXZWJJbnNwZWN0b3IuYWRkTWVzc2Fn ZVRvQ29uc29sZSA9IGZ1bmN0CiAgICAgdGhpcy5jb25zb2xlLmFkZE1lc3NhZ2UoY29uc29sZU1l c3NhZ2UpOwogfQogCitXZWJJbnNwZWN0b3IubG9nID0gZnVuY3Rpb24obWVzc2FnZSkKK3sKKyAg ICB2YXIgbXNnID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZSgKKyAgICAgICAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXIsCisgICAgICAgIFdl Ykluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5Mb2csCisgICAgICAgIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRGVidWcsCisgICAgICAgIC0xLAor ICAgICAgICBudWxsLAorICAgICAgICBudWxsLAorICAgICAgICAxLAorICAgICAgICBtZXNzYWdl KTsKKyAgICB0aGlzLmNvbnNvbGUuYWRkTWVzc2FnZShtc2cpOworfQorCiBXZWJJbnNwZWN0b3Iu YWRkUHJvZmlsZSA9IGZ1bmN0aW9uKHByb2ZpbGUpCiB7CiAgICAgdGhpcy5wYW5lbHMucHJvZmls ZXMuYWRkUHJvZmlsZShwcm9maWxlKTsKSW5kZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL2luc3Bl Y3Rvci93ZWJpbnNwZWN0b3ItbG9nLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9tYW51YWwt dGVzdHMvaW5zcGVjdG9yL3dlYmluc3BlY3Rvci1sb2cuaHRtbAkocmV2aXNpb24gMCkKKysrIFdl YkNvcmUvbWFudWFsLXRlc3RzL2luc3BlY3Rvci93ZWJpbnNwZWN0b3ItbG9nLmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsMjIgQEAKKzxwPlRlc3QgZm9yIDxhIGhyZWY9Imh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODA0NyI+QnVnIDI4MDQ3OiBhZGQgdXRpbGl0 eSBtZXRob2QgdG8gZW5hYmxlIGxvZ2dpbmcgbWVzc2FnZXMgZm9yIGluc3BlY3RvciBkZXZlbG9w bWVudDwvYT4uPC9wPgorCis8dWw+Cis8bGk+T3BlbiBhIGJyb3dzZXIsIGdvIHRvIGFueSB3ZWIg cGFnZS4KKzxsaT5PcGVuIHdlYiBpbnNwZWN0b3IKKzxsaT5PcGVuIHRoZSBjb25zb2xlIHBhbmVs Cis8bGk+T3BlbiBhIHdlYiBpbnNwZWN0b3Igb24gdGhlIHdlYiBpbnNwZWN0b3IKKzxsaT5PcGVu IHRoYXQgaW5zcGVjdG9yJ3MgY29uc29sZSBwYW5lbAorPGxpPkluIHRoYXQgcGFuZWwsIHJ1biB0 aGUgY29kZToKKzxwcmU+CisgICBXZWJJbnNwZWN0b3IubG9nKCJoZWxsbywgd29ybGQiKQorPC9w cmU+Cis8L3VsPgorCis8cD5SZXN1bHRzOgorPGJyPkluIHRoZSBvcmlnaW5hbCBpbnNwZWN0b3Ig d2luZG93LCB0aGVyZSBzaG91bGQgbm93IGJlIGEgbWVzc2FnZQoraW4gdGhlIGNvbnNvbGUgd2l0 aCB0aGUgdGV4dCAiaGVsbG8sIHdvcmxkIi4gIFRoZXJlIHdpbGwgYmUgYSBibHVlCittYWdpbmlm eWluZyBnbGFzcyBpY29uIHRvIHRoZSBsZWZ0IG9mIHRoZSBtZXNzYWdlLiAgUnVuIHRoZSBzYW1l IAorY29tbWFuZCBhZ2FpbiwgYW5kIHlvdSBzaG91bGQgc2VlIHRoZSByZXBlYXQgY291bnQgZ28g dG8gMi4KK1RoZSBtZXNzYWdlIGFuZCByZXBlYXQgY291bnQgYXJlIGJsdWUuCisKKwpJbmRleDog V2ViQ29yZS9wYWdlL0NvbnNvbGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9Db25z b2xlLmNwcAkocmV2aXNpb24gNDc4ODMpCisrKyBXZWJDb3JlL3BhZ2UvQ29uc29sZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEyOSw2ICsxMjksOSBAQCBzdGF0aWMgdm9pZCBwcmludE1lc3NhZ2VT b3VyY2VBbmRMZXZlbFByCiAgICAgY2FzZSBFcnJvck1lc3NhZ2VMZXZlbDoKICAgICAgICAgbGV2 ZWxTdHJpbmcgPSAiRVJST1IiOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIERlYnVnTWVzc2Fn ZUxldmVsOgorICAgICAgICBsZXZlbFN0cmluZyA9ICJERUJVRyI7CisgICAgICAgIGJyZWFrOwog ICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICBsZXZl bFN0cmluZyA9ICJVTktOT1dOIjsKSW5kZXg6IFdlYkNvcmUvcGFnZS9Db25zb2xlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wYWdlL0NvbnNvbGUuaAkocmV2aXNpb24gNDc4ODMpCisrKyBXZWJD b3JlL3BhZ2UvQ29uc29sZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03MSw3ICs3MSw4IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgVGlwTWVzc2FnZUxldmVsLAogICAgICAgICBMb2dNZXNz YWdlTGV2ZWwsCiAgICAgICAgIFdhcm5pbmdNZXNzYWdlTGV2ZWwsCi0gICAgICAgIEVycm9yTWVz c2FnZUxldmVsCisgICAgICAgIEVycm9yTWVzc2FnZUxldmVsLAorICAgICAgICBEZWJ1Z01lc3Nh Z2VMZXZlbAogICAgIH07CiAKICAgICBjbGFzcyBDb25zb2xlIDogcHVibGljIFJlZkNvdW50ZWQ8 Q29uc29sZT4gewo=