32897 2009-12-23 02:29:15 -0800 Web Inspector: [REGRESSION] console's clear command does not work. 2009-12-24 03:06:27 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy webkit.review.bot oldest_to_newest 174557 0 pfeldman 2009-12-23 02:29:15 -0800 It turned out that console's clear command should be in InjectedScriptHost, not InspectorBackend binding. 174558 1 45427 pfeldman 2009-12-23 02:32:50 -0800 Created attachment 45427 [PATCH] Proposed fix 174559 2 webkit.review.bot 2009-12-23 02:33:40 -0800 style-queue ran check-webkit-style on attachment 45427 without any errors. 174637 3 45427 timothy 2009-12-23 12:56:12 -0800 Comment on attachment 45427 [PATCH] Proposed fix > + requestClearConsoleMessages: function() > + clearConsoleMessages: function() Having "Console" in these function names is redundant when they are on the ConsoleView object and always referenced in context. 174750 4 pfeldman 2009-12-24 02:54:13 -0800 (In reply to comment #3) > (From update of attachment 45427 [details]) > > + requestClearConsoleMessages: function() > > + clearConsoleMessages: function() > > Having "Console" in these function names is redundant when they are on the > ConsoleView object and always referenced in context. Done. 174752 5 pfeldman 2009-12-24 03:06:27 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/console-tests.js M WebCore/ChangeLog M WebCore/inspector/InjectedScriptHost.cpp M WebCore/inspector/InjectedScriptHost.h M WebCore/inspector/InjectedScriptHost.idl M WebCore/inspector/InspectorBackend.cpp M WebCore/inspector/InspectorBackend.h M WebCore/inspector/InspectorBackend.idl M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/front-end/ConsoleView.js M WebCore/inspector/front-end/InjectedScript.js M WebCore/inspector/front-end/InjectedScriptAccess.js M WebCore/inspector/front-end/inspector.js Committed r52545 45427 2009-12-23 02:32:50 -0800 2009-12-23 12:56:12 -0800 [PATCH] Proposed fix console_clear text/plain 13575 pfeldman ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MDdjYjdkLi40NDQzMWY1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTIt MjMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1JFR1JF U1NJT05dIGNvbnNvbGUncyBjbGVhciBjb21tYW5kIGRvZXMgbm90IHdvcmsuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyODk3CisKKyAgICAgICAg KiBpbnNwZWN0b3IvY29uc29sZS1jbGVhci1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IGluc3BlY3Rvci9jb25zb2xlLWNsZWFyLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rv ci9jb25zb2xlLXRlc3RzLmpzOgorICAgICAgICAoZHVtcENvbnNvbGVNZXNzYWdlcy5jYWxsYmFj ayk6CisgICAgICAgIChkdW1wQ29uc29sZU1lc3NhZ2VzKToKKwogMjAwOS0xMi0yMSAgQ3NhYmEg T3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF0gU2tpcCBsYXlv dXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCkgcmVsYXRlZCB0ZXN0IHVudGlsIGZpeC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWNsZWFyLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWNsZWFyLWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jYTQ4ZTQzCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUtY2xlYXItZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsMTEgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSA5OiBvbmUKK0NPTlNPTEUgTUVTU0FH RTogbGluZSAxMDogdHdvCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMTE6IHRocmVlCitUZXN0cyB0 aGF0IGNvbnNvbGUgaXMgY2xlYXJlZCB1cG9uIHJlcXVlc3RDbGVhckNvbnNvbGVNZXNzYWdlcyBj YWxsLgorCis9PT0gQmVmb3JlIGNsZWFyID09PQorY29uc29sZS1jbGVhci5odG1sOjlvbmUKK2Nv bnNvbGUtY2xlYXIuaHRtbDoxMHR3bworY29uc29sZS1jbGVhci5odG1sOjExdGhyZWUKKz09PSBB ZnRlciBjbGVhciA9PT0KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNv bGUtY2xlYXIuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWNsZWFyLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uZmFkYmU3MwotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWNsZWFyLmh0bWwKQEAgLTAsMCAr MSwzMiBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSJpbnNwZWN0b3ItdGVzdC5qcyI+ PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iY29uc29sZS10ZXN0cy5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0PgorCitmdW5jdGlvbiBkb2l0KCkKK3sKKyAgICBjb25zb2xlLmxvZygib25lIik7CisgICAg Y29uc29sZS5sb2coInR3byIpOworICAgIGNvbnNvbGUubG9nKCJ0aHJlZSIpOworCisgICAgb3V0 cHV0KCI9PT0gQmVmb3JlIGNsZWFyID09PSIpOyAKKyAgICBkdW1wQ29uc29sZU1lc3NhZ2VzKHRy dWUpOworICAgIGZ1bmN0aW9uIGNhbGxiYWNrKCkKKyAgICB7CisgICAgICAgIG91dHB1dCgiPT09 IEFmdGVyIGNsZWFyID09PSIpOyAKKyAgICAgICAgZHVtcENvbnNvbGVNZXNzYWdlcygpOworICAg IH0KKyAgICBldmFsdWF0ZUluV2ViSW5zcGVjdG9yKCJXZWJJbnNwZWN0b3IuY29uc29sZS5yZXF1 ZXN0Q2xlYXJDb25zb2xlTWVzc2FnZXMoKSIsIGNhbGxiYWNrKTsKK30KKworPC9zY3JpcHQ+Cis8 L2hlYWQ+CisKKzxib2R5IG9ubG9hZD0ib25sb2FkKCkiPgorPHA+CitUZXN0cyB0aGF0IGNvbnNv bGUgaXMgY2xlYXJlZCB1cG9uIHJlcXVlc3RDbGVhckNvbnNvbGVNZXNzYWdlcyBjYWxsLgorPC9w PgorCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv Y29uc29sZS10ZXN0cy5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLXRlc3RzLmpz CmluZGV4IGJjNWQyZTkuLjY2NmZhOGIgMTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9jb25zb2xlLXRlc3RzLmpzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLXRl c3RzLmpzCkBAIC0xLDExICsxLDEyIEBACiAvLyBJbnNwZWN0ZWQgUGFnZSBmdW5jdGlvbnMuCiAK LWZ1bmN0aW9uIGR1bXBDb25zb2xlTWVzc2FnZXMoKSB7CitmdW5jdGlvbiBkdW1wQ29uc29sZU1l c3NhZ2VzKG5vTm90aWZ5RG9uZSkgewogICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHJlc3VsdCkKICAg ICB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzdWx0Lmxlbmd0aDsgKytpKQogICAg ICAgICAgICAgb3V0cHV0KHJlc3VsdFtpXS50ZXh0KTsKLSAgICAgICAgbm90aWZ5RG9uZSgpOwor ICAgICAgICBpZiAoIW5vTm90aWZ5RG9uZSkKKyAgICAgICAgICAgIG5vdGlmeURvbmUoKTsKICAg ICB9CiAgICAgZXZhbHVhdGVJbldlYkluc3BlY3RvcigiZnJvbnRlbmRfZHVtcENvbnNvbGVNZXNz YWdlcyIsIGNhbGxiYWNrKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggZTIzYWIyOS4uNjkwZGIwMiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAw OS0xMi0yMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBb UkVHUkVTU0lPTl0gY29uc29sZSdzIGNsZWFyIGNvbW1hbmQgZG9lcyBub3Qgd29yay4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI4OTcKKworICAg ICAgICBUZXN0OiBpbnNwZWN0b3IvY29uc29sZS1jbGVhci5odG1sCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVk U2NyaXB0SG9zdDo6Y2xlYXJDb25zb2xlTWVzc2FnZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9J bmplY3RlZFNjcmlwdEhvc3QuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRI b3N0LmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHA6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yQmFja2VuZC5pZGw6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xlYXJD b25zb2xlTWVzc2FnZXMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu aDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25z b2xlVmlldy5wcm90b3R5cGUucmVxdWVzdENsZWFyQ29uc29sZU1lc3NhZ2VzKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuY2xlYXJDb25zb2xlTWVzc2FnZXMp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fY2xlYXJCdXR0 b25DbGlja2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0 LmpzOgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHQuY2xlYXJDb25zb2xlTWVzc2FnZXMpOgorICAg ICAgICAoSW5qZWN0ZWRTY3JpcHQuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0QWNjZXNzLmpzOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLmNsZWFyQ29uc29sZU1lc3NhZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5yZXNl dCk6CisKIDIwMDktMTItMjEgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9Jbmpl Y3RlZFNjcmlwdEhvc3QuY3BwCmluZGV4IGYzMjZmNTIuLmEzM2ExYWEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5jcHAKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcApAQCAtNzksNiArNzksMTIgQEAgSW5qZWN0ZWRT Y3JpcHRIb3N0Ojp+SW5qZWN0ZWRTY3JpcHRIb3N0KCkKIHsKIH0KIAordm9pZCBJbmplY3RlZFNj cmlwdEhvc3Q6OmNsZWFyQ29uc29sZU1lc3NhZ2VzKCkKK3sKKyAgICBpZiAobV9pbnNwZWN0b3JD b250cm9sbGVyKQorICAgICAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPmNsZWFyQ29uc29sZU1l c3NhZ2VzKCk7Cit9CisKIHZvaWQgSW5qZWN0ZWRTY3JpcHRIb3N0Ojpjb3B5VGV4dChjb25zdCBT dHJpbmcmIHRleHQpCiB7CiAgICAgUGFzdGVib2FyZDo6Z2VuZXJhbFBhc3RlYm9hcmQoKS0+d3Jp dGVQbGFpblRleHQodGV4dCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdEhvc3QuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5oCmlu ZGV4IGFhMmZkNzYuLjQ5YjVkMjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0SG9zdC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9z dC5oCkBAIC01OCw2ICs1OCw4IEBAIHB1YmxpYzoKICAgICBJbnNwZWN0b3JDb250cm9sbGVyKiBp bnNwZWN0b3JDb250cm9sbGVyKCkgeyByZXR1cm4gbV9pbnNwZWN0b3JDb250cm9sbGVyOyB9CiAg ICAgdm9pZCBkaXNjb25uZWN0Q29udHJvbGxlcigpIHsgbV9pbnNwZWN0b3JDb250cm9sbGVyID0g MDsgfQogCisgICAgdm9pZCBjbGVhckNvbnNvbGVNZXNzYWdlcygpOworCiAgICAgdm9pZCBjb3B5 VGV4dChjb25zdCBTdHJpbmcmIHRleHQpOwogICAgIE5vZGUqIG5vZGVGb3JJZChsb25nIG5vZGVJ ZCk7CiAgICAgU2NyaXB0VmFsdWUgd3JhcE9iamVjdChjb25zdCBTY3JpcHRWYWx1ZSYgb2JqZWN0 LCBjb25zdCBTdHJpbmcmIG9iamVjdEdyb3VwKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL0luamVjdGVkU2NyaXB0SG9zdC5pZGwgYi9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdEhvc3QuaWRsCmluZGV4IGJlNjI3ZWMuLjJhNTlmOGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5qZWN0ZWRTY3JpcHRIb3N0LmlkbApAQCAtMzQsNiArMzQsOCBAQCBtb2R1bGUgY29yZSB7CiAg ICAgaW50ZXJmYWNlIFsKICAgICAgICAgR2VuZXJhdGVDb25zdHJ1Y3RvcgogICAgIF0gSW5qZWN0 ZWRTY3JpcHRIb3N0IHsKKyAgICAgICAgdm9pZCBjbGVhckNvbnNvbGVNZXNzYWdlcygpOworCiAg ICAgICAgIFtDdXN0b21dIERPTVdpbmRvdyBpbnNwZWN0ZWRXaW5kb3coKTsKICAgICAgICAgW0N1 c3RvbV0gRE9NT2JqZWN0IHdyYXBDYWxsYmFjayhpbiBET01PYmplY3QgY2FsbGJhY2spOwogICAg ICAgICB2b2lkIGNvcHlUZXh0KGluIERPTVN0cmluZyB0ZXh0KTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQmFja2VuZC5jcHAKaW5kZXggMTFmNThjNy4uNDdjM2EwMyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKQEAgLTc3LDEyICs3Nyw2IEBAIEluc3BlY3RvckJhY2tl bmQ6On5JbnNwZWN0b3JCYWNrZW5kKCkKIHsKIH0KIAotdm9pZCBJbnNwZWN0b3JCYWNrZW5kOjpj bGVhck1lc3NhZ2VzKGJvb2wgY2xlYXJVSSkKLXsKLSAgICBpZiAobV9pbnNwZWN0b3JDb250cm9s bGVyKQotICAgICAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPmNsZWFyQ29uc29sZU1lc3NhZ2Vz KGNsZWFyVUkpOwotfQotCiB2b2lkIEluc3BlY3RvckJhY2tlbmQ6OnN0b3JlTGFzdEFjdGl2ZVBh bmVsKGNvbnN0IFN0cmluZyYgcGFuZWxOYW1lKQogewogICAgIGlmIChtX2luc3BlY3RvckNvbnRy b2xsZXIpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmgg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmgKaW5kZXggZDZlODlmYS4uOTM3 YzAyNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5oCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaApAQCAtNTgsNyArNTgsNiBA QCBwdWJsaWM6CiAgICAgSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxlcigp IHsgcmV0dXJuIG1faW5zcGVjdG9yQ29udHJvbGxlcjsgfQogICAgIHZvaWQgZGlzY29ubmVjdENv bnRyb2xsZXIoKSB7IG1faW5zcGVjdG9yQ29udHJvbGxlciA9IDA7IH0KIAotICAgIHZvaWQgY2xl YXJNZXNzYWdlcyhib29sIGNsZWFyVUkpOwogICAgIHZvaWQgc3RvcmVMYXN0QWN0aXZlUGFuZWwo Y29uc3QgU3RyaW5nJiBwYW5lbE5hbWUpOwogCiAgICAgdm9pZCB0b2dnbGVOb2RlU2VhcmNoKCk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmlkbCBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaWRsCmluZGV4IDYxYzc2ZDYuLjZhOTI2 MzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaWRsCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuaWRsCkBAIC0zNCw3ICszNCw2 IEBAIG1vZHVsZSBjb3JlIHsKICAgICBpbnRlcmZhY2UgWwogICAgICAgICBHZW5lcmF0ZUNvbnN0 cnVjdG9yCiAgICAgXSBJbnNwZWN0b3JCYWNrZW5kIHsKLSAgICAgICAgdm9pZCBjbGVhck1lc3Nh Z2VzKGluIGJvb2xlYW4gY2xlYXJVSSk7CiAgICAgICAgIHZvaWQgc3RvcmVMYXN0QWN0aXZlUGFu ZWwoaW4gRE9NU3RyaW5nIHBhbmVsTmFtZSk7CiAKICAgICAgICAgdm9pZCB0b2dnbGVOb2RlU2Vh cmNoKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IDQ0 NDk0NzIuLjQyZWE0ODcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCkBAIC0zNjcsNyArMzY3LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjphZGRDb25z b2xlTWVzc2FnZShTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUsIENvbnNvbGVNZXMKICAgICB9CiB9 CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y2xlYXJDb25zb2xlTWVzc2FnZXMoYm9vbCBj bGVhclVJKQordm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjbGVhckNvbnNvbGVNZXNzYWdlcygp CiB7CiAgICAgZGVsZXRlQWxsVmFsdWVzKG1fY29uc29sZU1lc3NhZ2VzKTsKICAgICBtX2NvbnNv bGVNZXNzYWdlcy5jbGVhcigpOwpAQCAtMzc3LDcgKzM3Nyw3IEBAIHZvaWQgSW5zcGVjdG9yQ29u dHJvbGxlcjo6Y2xlYXJDb25zb2xlTWVzc2FnZXMoYm9vbCBjbGVhclVJKQogICAgIHJlbGVhc2VX cmFwcGVyT2JqZWN0R3JvdXAoImNvbnNvbGUiKTsKICAgICBpZiAobV9kb21BZ2VudCkKICAgICAg ICAgbV9kb21BZ2VudC0+cmVsZWFzZURhbmdsaW5nTm9kZXMoKTsKLSAgICBpZiAoY2xlYXJVSSAm JiBtX2Zyb250ZW5kKQorICAgIGlmIChtX2Zyb250ZW5kKQogICAgICAgICBtX2Zyb250ZW5kLT5j bGVhckNvbnNvbGVNZXNzYWdlcygpOwogfQogCkBAIC03NDYsNyArNzQ2LDcgQEAgdm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpkaWRDb21taXRMb2FkKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiAg ICAgaWYgKGxvYWRlci0+ZnJhbWUoKSA9PSBtX2luc3BlY3RlZFBhZ2UtPm1haW5GcmFtZSgpKSB7 CiAgICAgICAgIG1fY2xpZW50LT5pbnNwZWN0ZWRVUkxDaGFuZ2VkKGxvYWRlci0+dXJsKCkuc3Ry aW5nKCkpOwogCi0gICAgICAgIGNsZWFyQ29uc29sZU1lc3NhZ2VzKGZhbHNlKTsKKyAgICAgICAg Y2xlYXJDb25zb2xlTWVzc2FnZXMoKTsKIAogICAgICAgICBtX3RpbWVzLmNsZWFyKCk7CiAgICAg ICAgIG1fY291bnRzLmNsZWFyKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb250cm9sbGVyLmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVy LmgKaW5kZXggY2YyNDE1YS4uMWFiZDkzMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuaApAQCAtMTQyLDcgKzE0Miw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWRkTWVz c2FnZVRvQ29uc29sZShNZXNzYWdlU291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2FnZUxldmVsLCBT Y3JpcHRDYWxsU3RhY2sqKTsKICAgICB2b2lkIGFkZE1lc3NhZ2VUb0NvbnNvbGUoTWVzc2FnZVNv dXJjZSwgTWVzc2FnZVR5cGUsIE1lc3NhZ2VMZXZlbCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1 bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlEKTsKLSAgICB2b2lkIGNs ZWFyQ29uc29sZU1lc3NhZ2VzKGJvb2wgY2xlYXJVSSk7CisgICAgdm9pZCBjbGVhckNvbnNvbGVN ZXNzYWdlcygpOwogICAgIGNvbnN0IFZlY3RvcjxDb25zb2xlTWVzc2FnZSo+JiBjb25zb2xlTWVz c2FnZXMoKSBjb25zdCB7IHJldHVybiBtX2NvbnNvbGVNZXNzYWdlczsgfQogCiAgICAgdm9pZCBh dHRhY2hXaW5kb3coKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5q cwppbmRleCAwY2Y0YTc1Li44ZDVhZThiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NvbnNvbGVWaWV3LmpzCkBAIC05Miw3ICs5Miw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmll dyA9IGZ1bmN0aW9uKGRyYXdlcikKICAgICB0aGlzLl9zaG9ydGN1dHMgPSB7fTsKIAogICAgIHZh ciBzaG9ydGN1dDsKLSAgICB2YXIgY2xlYXJDb25zb2xlSGFuZGxlciA9IHRoaXMuY2xlYXJNZXNz YWdlcy5iaW5kKHRoaXMsIHRydWUpOworICAgIHZhciBjbGVhckNvbnNvbGVIYW5kbGVyID0gdGhp cy5yZXF1ZXN0Q2xlYXJDb25zb2xlTWVzc2FnZXMuYmluZCh0aGlzKTsKIAogICAgIHNob3J0Y3V0 ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleSgiayIsIFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5NZXRhKTsKICAgICB0aGlzLl9zaG9ydGN1dHNb c2hvcnRjdXRdID0gY2xlYXJDb25zb2xlSGFuZGxlcjsKQEAgLTI4OSwxMCArMjg5LDEzIEBAIFdl Ykluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAog Ci0gICAgY2xlYXJNZXNzYWdlczogZnVuY3Rpb24oY2xlYXJJbnNwZWN0b3JDb250cm9sbGVyKQor ICAgIHJlcXVlc3RDbGVhckNvbnNvbGVNZXNzYWdlczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuY2xlYXJDb25zb2xlTWVzc2FnZXMoZnVuY3Rpb24oKSB7 fSk7CisgICAgfSwKKworICAgIGNsZWFyQ29uc29sZU1lc3NhZ2VzOiBmdW5jdGlvbigpCiAgICAg ewotICAgICAgICBpZiAoY2xlYXJJbnNwZWN0b3JDb250cm9sbGVyKQotICAgICAgICAgICAgSW5z cGVjdG9yQmFja2VuZC5jbGVhck1lc3NhZ2VzKGZhbHNlKTsKICAgICAgICAgaWYgKFdlYkluc3Bl Y3Rvci5wYW5lbHMucmVzb3VyY2VzKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5y ZXNvdXJjZXMuY2xlYXJNZXNzYWdlcygpOwogCkBAIC0zNzUsOSArMzc4LDkgQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9jbGVhckJ1dHRvbkNsaWNrZWQ6 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuY2xlYXJNZXNzYWdlcyh0cnVlKTsKKyAg ICAgICAgdGhpcy5yZXF1ZXN0Q2xlYXJDb25zb2xlTWVzc2FnZXMoKTsKICAgICB9LAotICAgIAor CiAgICAgX2hhbmRsZUNvbnRleHRNZW51RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAg ICAgICAgaWYgKCF3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuaXNDb2xsYXBzZWQpIHsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwppbmRleCA0ZjQxNjhiLi4y NTY0ZTdhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRT Y3JpcHQuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0 LmpzCkBAIC04NzcsOSArODc3LDEwIEBAIEluamVjdGVkU2NyaXB0Ll9jYWxsRnJhbWVGb3JJZCA9 IGZ1bmN0aW9uKGlkKQogICAgIHJldHVybiBjYWxsRnJhbWU7CiB9CiAKLUluamVjdGVkU2NyaXB0 Ll9jbGVhckNvbnNvbGVNZXNzYWdlcyA9IGZ1bmN0aW9uKCkKK0luamVjdGVkU2NyaXB0LmNsZWFy Q29uc29sZU1lc3NhZ2VzID0gZnVuY3Rpb24oKQogewotICAgIEluamVjdGVkU2NyaXB0SG9zdC5j bGVhck1lc3NhZ2VzKHRydWUpOworICAgIEluamVjdGVkU2NyaXB0SG9zdC5jbGVhckNvbnNvbGVN ZXNzYWdlcygpOworICAgIHJldHVybiB0cnVlOwogfQogCiBJbmplY3RlZFNjcmlwdC5faW5zcGVj dE9iamVjdCA9IGZ1bmN0aW9uKG8pCkBAIC05ODYsNyArOTg3LDcgQEAgSW5qZWN0ZWRTY3JpcHQu X2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkID0gZnVuY3Rpb24oZXZhbEZ1bmN0aW9uLCBl dmFsT2JqZWMKICAgICAgICAgZ2V0ICQ0KCkgeyByZXR1cm4gY29uc29sZS5faW5zcGVjdG9yQ29t bWFuZExpbmVBUEkuX2luc3BlY3RlZE5vZGVzWzRdIH0sIFxuXAogICAgIH07Iik7CiAKLSAgICBp bnNwZWN0b3JDb21tYW5kTGluZUFQSS5jbGVhciA9IEluamVjdGVkU2NyaXB0SG9zdC53cmFwQ2Fs bGJhY2soSW5qZWN0ZWRTY3JpcHQuX2NsZWFyQ29uc29sZU1lc3NhZ2VzKTsKKyAgICBpbnNwZWN0 b3JDb21tYW5kTGluZUFQSS5jbGVhciA9IEluamVjdGVkU2NyaXB0SG9zdC53cmFwQ2FsbGJhY2so SW5qZWN0ZWRTY3JpcHQuY2xlYXJDb25zb2xlTWVzc2FnZXMpOwogICAgIGluc3BlY3RvckNvbW1h bmRMaW5lQVBJLmluc3BlY3QgPSBJbmplY3RlZFNjcmlwdEhvc3Qud3JhcENhbGxiYWNrKEluamVj dGVkU2NyaXB0Ll9pbnNwZWN0T2JqZWN0KTsKICAgICBpbnNwZWN0b3JDb21tYW5kTGluZUFQSS5j b3B5ID0gSW5qZWN0ZWRTY3JpcHRIb3N0LndyYXBDYWxsYmFjayhJbmplY3RlZFNjcmlwdC5fY29w eSk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRT Y3JpcHRBY2Nlc3MuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3Jp cHRBY2Nlc3MuanMKaW5kZXggZTFmMmEzNi4uNGMwNGZiOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0QWNjZXNzLmpzCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdEFjY2Vzcy5qcwpAQCAtNTksNiArNTks NyBAQCBJbmplY3RlZFNjcmlwdEFjY2Vzcy5faW5zdGFsbEhhbmRsZXIoImFkZEluc3BlY3RlZE5v ZGUiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxsSGFuZGxlcigiYWRkU3R5bGVTZWxl Y3RvciIpOwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3RhbGxIYW5kbGVyKCJhcHBseVN0eWxl UnVsZVRleHQiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxsSGFuZGxlcigiYXBwbHlT dHlsZVRleHQiKTsKK0luamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxsSGFuZGxlcigiY2xlYXJD b25zb2xlTWVzc2FnZXMiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxsSGFuZGxlcigi ZXZhbHVhdGUiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxsSGFuZGxlcigiZXZhbHVh dGVJbkNhbGxGcmFtZSIpOwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3RhbGxIYW5kbGVyKCJn ZXRDb21wbGV0aW9ucyIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMK aW5kZXggZDc1YWZmZC4uNTQ3NGUxZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzCkBAIC0xMDAzLDcgKzEwMDMsNyBAQCBXZWJJbnNwZWN0b3IuX2FkZFJlc291cmNl ID0gZnVuY3Rpb24oaWRlbnRpZmllciwgcGF5bG9hZCkKIAogV2ViSW5zcGVjdG9yLmNsZWFyQ29u c29sZU1lc3NhZ2VzID0gZnVuY3Rpb24oKQogewotICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmNs ZWFyTWVzc2FnZXMoZmFsc2UpOworICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmNsZWFyQ29uc29s ZU1lc3NhZ2VzKCk7CiB9CiAKIFdlYkluc3BlY3Rvci5zZWxlY3REYXRhYmFzZSA9IGZ1bmN0aW9u KG8pCkBAIC0xMjIzLDcgKzEyMjMsNyBAQCBXZWJJbnNwZWN0b3IucmVzZXQgPSBmdW5jdGlvbigp CiAKICAgICBkZWxldGUgdGhpcy5tYWluUmVzb3VyY2U7CiAKLSAgICB0aGlzLmNvbnNvbGUuY2xl YXJNZXNzYWdlcygpOworICAgIHRoaXMuY29uc29sZS5jbGVhckNvbnNvbGVNZXNzYWdlcygpOwog fQogCiBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxDaGFuZ2VkID0gZnVuY3Rpb24ocmVzb3VyY2Us IG9sZFVSTCkK