56806 2011-03-22 00:31:20 -0700 Web Inspector: protocol cleanup. ConsoleAgent. 2011-03-22 02:22:15 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 54856 1 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 371253 0 loislo 2011-03-22 00:31:20 -0700 see protocol metabug: - All events should use notification wording, not command wording: addConsoleMessage->consoleMessage, updateConsoleMessageRepeatCount->consoleMessageRepeatCountUpdates, etc. rename: void setConsoleMessagesEnabled(in boolean enabled, out boolean newState); => void enable(out long expiredMessagesCount); new method: disable() deleted method: [event] void consoleMessageExpiredCountUpdate(out unsigned long count); delete it. The counter will be transfered as out argument of enable command. 371255 1 86435 loislo 2011-03-22 00:36:58 -0700 Created attachment 86435 [patch] initial version 371294 2 86435 yurys 2011-03-22 02:13:08 -0700 Comment on attachment 86435 [patch] initial version View in context: https://bugs.webkit.org/attachment.cgi?id=86435&action=review > Source/WebCore/inspector/InspectorConsoleAgent.cpp:88 > + unsigned messageCount = m_consoleMessages.size(); unsigned -> size_t ? 371298 3 loislo 2011-03-22 02:22:15 -0700 Committed r81650: <http://trac.webkit.org/changeset/81650> 86435 2011-03-22 00:36:58 -0700 2011-03-22 02:13:08 -0700 [patch] initial version patch text/plain 12561 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3NDU0YjhmLi5iZDBiZmUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMt MjIgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHByb3Rv Y29sIGNsZWFudXAuIENvbnNvbGVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU2ODA2CisKKyAgICAgICAgcmVuYW1lZCBtZXRob2Q6IHZvaWQg c2V0Q29uc29sZU1lc3NhZ2VzRW5hYmxlZChpbiBib29sZWFuIGVuYWJsZWQsIG91dCBib29sZWFu IG5ld1N0YXRlKTsgPT4gdm9pZCBlbmFibGUob3V0IGxvbmcgZXhwaXJlZE1lc3NhZ2VzQ291bnQp OworICAgICAgICBuZXcgbWV0aG9kOiBkaXNhYmxlKCkKKyAgICAgICAgZGVsZXRlZCBtZXRob2Q6 IFtldmVudF0gdm9pZCBjb25zb2xlTWVzc2FnZUV4cGlyZWRDb3VudFVwZGF0ZShvdXQgdW5zaWdu ZWQgbG9uZyBjb3VudCk7IGRlbGV0ZSBpdC4gVGhlIGNvdW50ZXIgd2lsbCBiZSB0cmFuc2ZlcmVk IGFzIG91dCBhcmd1bWVudCBvZiBlbmFibGUgY29tbWFuZC4KKworICAgICAgICAqIGluc3BlY3Rv ci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0 b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC5odG1sOgorCiAyMDExLTAzLTIxICBBYmhpc2hlayBB cnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29s ZS1hZ2VudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29u c29sZS1hZ2VudC1leHBlY3RlZC50eHQKaW5kZXggZWU1MzU2Yi4uMWZiODNmMiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4 cGVjdGVkLnR4dApAQCAtMywzNiArMywzMSBAQCBDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTogdGVz dAogUHJvdG9jb2wgc3RhYmlsaXR5IHRlc3QuIEl0IGlzIGR1bXBpbmcgcmVxdWVzdC9yZXNwb25z ZSBwYWlycyBvZiBDb25zb2xlQWdlbnQgZnVuY3Rpb25zLgogCiAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotQ29uc29sZUFnZW50LnNl dENvbnNvbGVNZXNzYWdlc0VuYWJsZWQoZmFsc2UpCitDb25zb2xlQWdlbnQuZGlzYWJsZSgpCiAK IHJlcXVlc3Q6CiB7CiAgICAgaWQgOiA8bnVtYmVyPgogICAgIGRvbWFpbiA6ICJDb25zb2xlIgot ICAgIGNvbW1hbmQgOiAic2V0Q29uc29sZU1lc3NhZ2VzRW5hYmxlZCIKKyAgICBjb21tYW5kIDog ImRpc2FibGUiCiAgICAgYXJndW1lbnRzIDogewotICAgICAgICBlbmFibGVkIDogZmFsc2UKICAg ICB9CiB9CiAKIHJlc3BvbnNlOgogewogICAgIHJlcXVlc3RJZCA6IDxudW1iZXI+Ci0gICAgYm9k eSA6IHsKLSAgICAgICAgbmV3U3RhdGUgOiBmYWxzZQotICAgIH0KIH0KIAogLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KLUNvbnNvbGVB Z2VudC5zZXRDb25zb2xlTWVzc2FnZXNFbmFibGVkKHRydWUpCitDb25zb2xlQWdlbnQuZW5hYmxl KCkKIAogcmVxdWVzdDoKIHsKICAgICBpZCA6IDxudW1iZXI+CiAgICAgZG9tYWluIDogIkNvbnNv bGUiCi0gICAgY29tbWFuZCA6ICJzZXRDb25zb2xlTWVzc2FnZXNFbmFibGVkIgorICAgIGNvbW1h bmQgOiAiZW5hYmxlIgogICAgIGFyZ3VtZW50cyA6IHsKLSAgICAgICAgZW5hYmxlZCA6IHRydWUK ICAgICB9CiB9CiAKQEAgLTQwLDcgKzM1LDcgQEAgcmVzcG9uc2U6CiB7CiAgICAgcmVxdWVzdElk IDogPG51bWJlcj4KICAgICBib2R5IDogewotICAgICAgICBuZXdTdGF0ZSA6IHRydWUKKyAgICAg ICAgZXhwaXJlZE1lc3NhZ2VzQ291bnQgOiAwCiAgICAgfQogfQogCkBAIC04NCwxMSArNzksMTEg QEAgZXZlbnQgQ29uc29sZUFnZW50LmNvbnNvbGVNZXNzYWdlCiAgICAgfQogfQogCi1ldmVudCBD b25zb2xlQWdlbnQuY29uc29sZU1lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZQorZXZlbnQgQ29uc29s ZUFnZW50LmNvbnNvbGVNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkCiB7CiAgICAgdHlwZSA6ICJl dmVudCIKICAgICBkb21haW4gOiAiQ29uc29sZSIKLSAgICBldmVudCA6ICJjb25zb2xlTWVzc2Fn ZVJlcGVhdENvdW50VXBkYXRlIgorICAgIGV2ZW50IDogImNvbnNvbGVNZXNzYWdlUmVwZWF0Q291 bnRVcGRhdGVkIgogICAgIGJvZHkgOiB7CiAgICAgICAgIGNvdW50IDogMgogICAgIH0KQEAgLTE4 OCwxMyArMTgzLDEzIEBAIHJlc3BvbnNlOgogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIENvdmVyYWdlIGZvciBDb25zb2xlQWdlbnQK IHsKLSAgICBzZXRDb25zb2xlTWVzc2FnZXNFbmFibGVkIDogImNoZWNrZWQiCisgICAgZW5hYmxl IDogImNoZWNrZWQiCisgICAgZGlzYWJsZSA6ICJjaGVja2VkIgogICAgIGNsZWFyQ29uc29sZU1l c3NhZ2VzIDogImNoZWNrZWQiCiAgICAgc2V0TW9uaXRvcmluZ1hIUkVuYWJsZWQgOiAiY2hlY2tl ZCIKICAgICBhZGRJbnNwZWN0ZWROb2RlIDogImNoZWNrZWQiCiAgICAgY29uc29sZU1lc3NhZ2Ug OiAiY2hlY2tlZCIKLSAgICBjb25zb2xlTWVzc2FnZUV4cGlyZWRDb3VudFVwZGF0ZSA6ICJub3Qg Y2hlY2tlZCIKLSAgICBjb25zb2xlTWVzc2FnZVJlcGVhdENvdW50VXBkYXRlIDogImNoZWNrZWQi CisgICAgY29uc29sZU1lc3NhZ2VSZXBlYXRDb3VudFVwZGF0ZWQgOiAiY2hlY2tlZCIKICAgICBj b25zb2xlTWVzc2FnZXNDbGVhcmVkIDogImNoZWNrZWQiCiB9CiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50Lmh0bWwgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC5odG1sCmluZGV4IDAzMjkyOTQuLmRh MWUzMWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9jb25zb2xl LWFnZW50Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUt YWdlbnQuaHRtbApAQCAtNyw4ICs3LDggQEAKIGZ1bmN0aW9uIHRlc3QoKQogewogICAgIHZhciB0 ZXN0U3VpdGUgPSBbCi0gICAgICAgIFsiQ29uc29sZUFnZW50IiwgInNldENvbnNvbGVNZXNzYWdl c0VuYWJsZWQiLCBmYWxzZV0sCi0gICAgICAgIFsiQ29uc29sZUFnZW50IiwgInNldENvbnNvbGVN ZXNzYWdlc0VuYWJsZWQiLCB0cnVlXSwKKyAgICAgICAgWyJDb25zb2xlQWdlbnQiLCAiZGlzYWJs ZSJdLAorICAgICAgICBbIkNvbnNvbGVBZ2VudCIsICJlbmFibGUiXSwKICAgICAgICAgWyJSdW50 aW1lQWdlbnQiLCAiZXZhbHVhdGUiLCAiY29uc29sZS5pbmZvKCd0ZXN0Jyk7IGNvbnNvbGUuaW5m bygndGVzdCcpIiwgInRlc3QtZ3JvdXAiLCBmYWxzZV0sCiAgICAgICAgIFsiQ29uc29sZUFnZW50 IiwgImNsZWFyQ29uc29sZU1lc3NhZ2VzIl0sCiAgICAgICAgIFsiQ29uc29sZUFnZW50IiwgInNl dE1vbml0b3JpbmdYSFJFbmFibGVkIiwgdHJ1ZV0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjhjNDc5YS4uNzM5 ZDU2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDExLTAzLTIyICBJbHlhIFRpa2hv bm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBwcm90b2NvbCBjbGVhbnVwLiBD b25zb2xlQWdlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NjgwNgorCisgICAgICAgIHJlbmFtZWQgbWV0aG9kOiB2b2lkIHNldENvbnNvbGVNZXNz YWdlc0VuYWJsZWQoaW4gYm9vbGVhbiBlbmFibGVkLCBvdXQgYm9vbGVhbiBuZXdTdGF0ZSk7ID0+ IHZvaWQgZW5hYmxlKG91dCBsb25nIGV4cGlyZWRNZXNzYWdlc0NvdW50KTsKKyAgICAgICAgbmV3 IG1ldGhvZDogZGlzYWJsZSgpCisgICAgICAgIGRlbGV0ZWQgbWV0aG9kOiBbZXZlbnRdIHZvaWQg Y29uc29sZU1lc3NhZ2VFeHBpcmVkQ291bnRVcGRhdGUob3V0IHVuc2lnbmVkIGxvbmcgY291bnQp OyBkZWxldGUgaXQuIFRoZSBjb3VudGVyIHdpbGwgYmUgdHJhbnNmZXJlZCBhcyBvdXQgYXJndW1l bnQgb2YgZW5hYmxlIGNvbW1hbmQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29uc29sZU1lc3Nh Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29uc29sZU1lc3NhZ2U6OnVwZGF0ZVJlcGVhdENv dW50SW5Db25zb2xlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OmVuYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JDb25zb2xlQWdlbnQ6OmRpc2FibGUpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JDb25zb2xlQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNv bGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5f cmVnaXN0ZXJDb25zb2xlRG9tYWluRGlzcGF0Y2hlci5kaXNwYXRjaGVyLmNvbnNvbGVNZXNzYWdl UmVwZWF0Q291bnRVcGRhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5w cm90b3R5cGUuc2V0Q29uc29sZU1lc3NhZ2VFeHBpcmVkQ291bnQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorCiAyMDExLTAzLTIxICBBYmhpc2hlayBBcnlh ICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlk ZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29uc29sZU1lc3NhZ2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbnNvbGVNZXNzYWdlLmNwcAppbmRleCA1 ZjViNGZiLi5kZTYxZWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29u c29sZU1lc3NhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db25zb2xlTWVz c2FnZS5jcHAKQEAgLTEyMCw3ICsxMjAsNyBAQCB2b2lkIENvbnNvbGVNZXNzYWdlOjphZGRUb0Zy b250ZW5kKEluc3BlY3RvckZyb250ZW5kOjpDb25zb2xlKiBmcm9udGVuZCwgSW5qZWN0ZQogCiB2 b2lkIENvbnNvbGVNZXNzYWdlOjp1cGRhdGVSZXBlYXRDb3VudEluQ29uc29sZShJbnNwZWN0b3JG cm9udGVuZDo6Q29uc29sZSogZnJvbnRlbmQpCiB7Ci0gICAgZnJvbnRlbmQtPmNvbnNvbGVNZXNz YWdlUmVwZWF0Q291bnRVcGRhdGUobV9yZXBlYXRDb3VudCk7CisgICAgZnJvbnRlbmQtPmNvbnNv bGVNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkKG1fcmVwZWF0Q291bnQpOwogfQogCiBib29sIENv bnNvbGVNZXNzYWdlOjppc0VxdWFsKENvbnNvbGVNZXNzYWdlKiBtc2cpIGNvbnN0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggOWQzMzY0Zi4uNzczYTNiOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTk4LDE1ICsxOTgsMTUg QEAKICAgICAgICAgInR5cGVzIjogW10sCiAgICAgICAgICJjb21tYW5kcyI6IFsKICAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJzZXRDb25zb2xlTWVzc2FnZXNFbmFibGVk IiwKLSAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJlbmFibGVkIiwgInR5cGUiOiAiYm9vbGVhbiIgfQotICAgICAgICAgICAgICAg IF0sCisgICAgICAgICAgICAgICAgIm5hbWUiOiAiZW5hYmxlIiwKICAgICAgICAgICAgICAgICAi cmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJuZXdTdGF0ZSIsICJ0 eXBlIjogImJvb2xlYW4iIH0KKyAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImV4cGlyZWRN ZXNzYWdlc0NvdW50IiwgInR5cGUiOiAiaW50ZWdlciIgfQogICAgICAgICAgICAgICAgIF0KICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAiZGlz YWJsZSIKKyAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFt ZSI6ICJjbGVhckNvbnNvbGVNZXNzYWdlcyIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7 CkBAIC0yMjksMTQgKzIyOSw4IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibWVz c2FnZU9iaiIsICIkcmVmIjogIkNvbnNvbGVNZXNzYWdlIiB9CiAgICAgICAgICAgICAgICAgXQog ICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJj b25zb2xlTWVzc2FnZUV4cGlyZWRDb3VudFVwZGF0ZSIsCi0gICAgICAgICAgICAgICAgInBhcmFt ZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY291bnQiLCAidHlwZSI6 ICJpbnRlZ2VyIiB9Ci0gICAgICAgICAgICAgICAgXQotICAgICAgICAgICAgfSwKLSAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICAibmFtZSI6ICJjb25zb2xlTWVzc2FnZVJlcGVhdENvdW50 VXBkYXRlIiwKKyAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogImNvbnNvbGVN ZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkIiwKICAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJjb3VudCIsICJ0eXBlIjogImludGVn ZXIiIH0KICAgICAgICAgICAgICAgICBdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuY3BwCmluZGV4IDJlNjcxYjcuLjExYWNiODYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuY3Bw CkBAIC03OSwxMCArNzksMjAgQEAgSW5zcGVjdG9yQ29uc29sZUFnZW50Ojp+SW5zcGVjdG9yQ29u c29sZUFnZW50KCkKICAgICBtX2luc3BlY3RvckRPTUFnZW50ID0gMDsKIH0KIAotdm9pZCBJbnNw ZWN0b3JDb25zb2xlQWdlbnQ6OnNldENvbnNvbGVNZXNzYWdlc0VuYWJsZWQoRXJyb3JTdHJpbmcq LCBib29sIGVuYWJsZWQsIGJvb2wqIG5ld1N0YXRlKQordm9pZCBJbnNwZWN0b3JDb25zb2xlQWdl bnQ6OmVuYWJsZShFcnJvclN0cmluZyosIGludCogY29uc29sZU1lc3NhZ2VFeHBpcmVDb3VudCkK IHsKLSAgICAqbmV3U3RhdGUgPSBlbmFibGVkOwotICAgIHNldENvbnNvbGVNZXNzYWdlc0VuYWJs ZWQoZW5hYmxlZCk7CisgICAgKmNvbnNvbGVNZXNzYWdlRXhwaXJlQ291bnQgPSBtX2V4cGlyZWRD b25zb2xlTWVzc2FnZUNvdW50OworCisgICAgbV9pbnNwZWN0b3JTdGF0ZS0+c2V0Qm9vbGVhbihD b25zb2xlQWdlbnRTdGF0ZTo6Y29uc29sZU1lc3NhZ2VzRW5hYmxlZCwgdHJ1ZSk7CisKKyAgICB1 bnNpZ25lZCBtZXNzYWdlQ291bnQgPSBtX2NvbnNvbGVNZXNzYWdlcy5zaXplKCk7CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IG1lc3NhZ2VDb3VudDsgKytpKQorICAgICAgICBtX2NvbnNv bGVNZXNzYWdlc1tpXS0+YWRkVG9Gcm9udGVuZChtX2Zyb250ZW5kLCBtX2luamVjdGVkU2NyaXB0 TWFuYWdlcik7Cit9CisKK3ZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpkaXNhYmxlKEVycm9y U3RyaW5nKikKK3sKKyAgICBtX2luc3BlY3RvclN0YXRlLT5zZXRCb29sZWFuKENvbnNvbGVBZ2Vu dFN0YXRlOjpjb25zb2xlTWVzc2FnZXNFbmFibGVkLCBmYWxzZSk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yQ29uc29sZUFnZW50OjpjbGVhckNvbnNvbGVNZXNzYWdlcyhFcnJvclN0cmluZyopCkBAIC0y MjYsMTkgKzIzNiw2IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjphZGRJbnNwZWN0ZWRO b2RlKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCkKICAgICBtX2luamVjdGVkU2NyaXB0TWFuYWdl ci0+aW5qZWN0ZWRTY3JpcHRIb3N0KCktPmFkZEluc3BlY3RlZE5vZGUobm9kZSk7CiB9CiAKLXZv aWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpzZXRDb25zb2xlTWVzc2FnZXNFbmFibGVkKGJvb2wg ZW5hYmxlZCkKLXsKLSAgICBtX2luc3BlY3RvclN0YXRlLT5zZXRCb29sZWFuKENvbnNvbGVBZ2Vu dFN0YXRlOjpjb25zb2xlTWVzc2FnZXNFbmFibGVkLCBlbmFibGVkKTsKLSAgICBpZiAoIWVuYWJs ZWQgfHwgIW1fZnJvbnRlbmQpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmIChtX2V4cGlyZWRD b25zb2xlTWVzc2FnZUNvdW50KQotICAgICAgICBtX2Zyb250ZW5kLT5jb25zb2xlTWVzc2FnZUV4 cGlyZWRDb3VudFVwZGF0ZShtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50KTsKLSAgICB1bnNp Z25lZCBtZXNzYWdlQ291bnQgPSBtX2NvbnNvbGVNZXNzYWdlcy5zaXplKCk7Ci0gICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IG1lc3NhZ2VDb3VudDsgKytpKQotICAgICAgICBtX2NvbnNvbGVN ZXNzYWdlc1tpXS0+YWRkVG9Gcm9udGVuZChtX2Zyb250ZW5kLCBtX2luamVjdGVkU2NyaXB0TWFu YWdlcik7Ci19Ci0KIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjphZGRDb25zb2xlTWVzc2Fn ZShQYXNzT3duUHRyPENvbnNvbGVNZXNzYWdlPiBjb25zb2xlTWVzc2FnZSkKIHsKICAgICBBU1NF UlQobV9pbnNwZWN0b3JBZ2VudC0+ZW5hYmxlZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuaAppbmRleCA3OTg5NDU3Li4yYjc1M2I1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5o CkBAIC01OCw3ICs1OCw4IEBAIHB1YmxpYzoKICAgICBJbnNwZWN0b3JDb25zb2xlQWdlbnQoSW5z dHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvckFnZW50KiwgSW5zcGVjdG9yU3RhdGUqLCBJbmpl Y3RlZFNjcmlwdE1hbmFnZXIqLCBJbnNwZWN0b3JET01BZ2VudCopOwogICAgIH5JbnNwZWN0b3JD b25zb2xlQWdlbnQoKTsKIAotICAgIHZvaWQgc2V0Q29uc29sZU1lc3NhZ2VzRW5hYmxlZChFcnJv clN0cmluZyogZXJyb3IsIGJvb2wgZW5hYmxlZCwgYm9vbCogbmV3U3RhdGUpOworICAgIHZvaWQg ZW5hYmxlKEVycm9yU3RyaW5nKiwgaW50KiBjb25zb2xlTWVzc2FnZUV4cGlyZUNvdW50KTsKKyAg ICB2b2lkIGRpc2FibGUoRXJyb3JTdHJpbmcqKTsKICAgICB2b2lkIGNsZWFyQ29uc29sZU1lc3Nh Z2VzKEVycm9yU3RyaW5nKiBlcnJvcik7CiAgICAgdm9pZCByZXNldCgpOwogICAgIHZvaWQgc2V0 RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqKTsKQEAgLTgyLDcgKzgzLDYgQEAgcHVibGljOgog ICAgIHZvaWQgYWRkSW5zcGVjdGVkTm9kZShFcnJvclN0cmluZyosIGludCBub2RlSWQpOwogCiBw cml2YXRlOgotICAgIHZvaWQgc2V0Q29uc29sZU1lc3NhZ2VzRW5hYmxlZChib29sKTsKICAgICB2 b2lkIGFkZENvbnNvbGVNZXNzYWdlKFBhc3NPd25QdHI8Q29uc29sZU1lc3NhZ2U+KTsKIAogICAg IEluc3RydW1lbnRpbmdBZ2VudHMqIG1faW5zdHJ1bWVudGluZ0FnZW50czsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IGQ0ZWUy YjEuLmYzZTM0MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Db25zb2xlVmlldy5qcwpAQCAtMTIxLDEzICsxMjEsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29s ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGNvbnNvbGUuYWRkTWVzc2FnZShj b25zb2xlTWVzc2FnZSk7CiAgICAgICAgICAgICB9LAogCi0gICAgICAgICAgICBjb25zb2xlTWVz c2FnZUV4cGlyZWRDb3VudFVwZGF0ZTogZnVuY3Rpb24oY291bnQpCi0gICAgICAgICAgICB7Ci0g ICAgICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSBTdHJpbmcuc3ByaW50ZihXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIiVkIGNvbnNvbGUgbWVzc2FnZXMgYXJlIG5vdCBzaG93bi4iKSwgY291bnQpOwot ICAgICAgICAgICAgICAgIGNvbnNvbGUuYWRkTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuY3JlYXRlVGV4dE1lc3NhZ2UobWVzc2FnZSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VMZXZlbC5XYXJuaW5nKSk7Ci0gICAgICAgICAgICB9LAotCi0gICAgICAgICAg ICBjb25zb2xlTWVzc2FnZVJlcGVhdENvdW50VXBkYXRlOiBmdW5jdGlvbihjb3VudCkKKyAgICAg ICAgICAgIGNvbnNvbGVNZXNzYWdlUmVwZWF0Q291bnRVcGRhdGVkOiBmdW5jdGlvbihjb3VudCkK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICB2YXIgbXNnID0gY29uc29sZS5wcmV2aW91 c01lc3NhZ2U7CiAgICAgICAgICAgICAgICAgdmFyIHByZXZSZXBlYXRDb3VudCA9IG1zZy50b3Rh bFJlcGVhdENvdW50OwpAQCAtMTU0LDYgKzE0OCwxNCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlID0gewogICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyRG9tYWlu RGlzcGF0Y2hlcigiQ29uc29sZSIsIGRpc3BhdGNoZXIpOwogICAgIH0sCiAKKyAgICBzZXRDb25z b2xlTWVzc2FnZUV4cGlyZWRDb3VudDogZnVuY3Rpb24oY291bnQpCisgICAgeworICAgICAgICBp ZiAoY291bnQpIHsKKyAgICAgICAgICAgIHZhciBtZXNzYWdlID0gU3RyaW5nLnNwcmludGYoV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCIlZCBjb25zb2xlIG1lc3NhZ2VzIGFyZSBub3Qgc2hvd24uIiks IGNvdW50KTsKKyAgICAgICAgICAgIHRoaXMuYWRkTWVzc2FnZShXZWJJbnNwZWN0b3IuQ29uc29s ZU1lc3NhZ2UuY3JlYXRlVGV4dE1lc3NhZ2UobWVzc2FnZSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlLk1lc3NhZ2VMZXZlbC5XYXJuaW5nKSk7CisgICAgICAgIH0KKyAgICB9LAorCiAgICAg X3VwZGF0ZUZpbHRlcjogZnVuY3Rpb24oZSkKICAgICB7CiAgICAgICAgIHZhciBpc01hYyA9IFdl Ykluc3BlY3Rvci5pc01hYygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcwppbmRleCBkMjc2ODVjLi44ZmJkNzI3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNTA1LDcgKzUwNSw3 IEBAIFdlYkluc3BlY3Rvci5kb0xvYWRlZERvbmUgPSBmdW5jdGlvbigpCiAKICAgICBpZiAoV2Vi SW5zcGVjdG9yLnNldHRpbmdzLm1vbml0b3JpbmdYSFJFbmFibGVkKQogICAgICAgICBDb25zb2xl QWdlbnQuc2V0TW9uaXRvcmluZ1hIUkVuYWJsZWQodHJ1ZSk7Ci0gICAgQ29uc29sZUFnZW50LnNl dENvbnNvbGVNZXNzYWdlc0VuYWJsZWQodHJ1ZSk7CisgICAgQ29uc29sZUFnZW50LmVuYWJsZSh0 aGlzLmNvbnNvbGUuc2V0Q29uc29sZU1lc3NhZ2VFeHBpcmVkQ291bnQuYmluZCh0aGlzLmNvbnNv bGUpKTsKIAogICAgIFdlYkluc3BlY3Rvci5zaG93UGFuZWwoV2ViSW5zcGVjdG9yLnNldHRpbmdz Lmxhc3RBY3RpdmVQYW5lbCk7CiAK