103944 2012-12-03 16:15:38 -0800 Web Inspector: Persist Audit selections across sessions 2012-12-17 06:15:49 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 aboxhall caseq apavlov caseq keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 782008 0 aboxhall 2012-12-03 16:15:38 -0800 In the Audits UI, remember which audits the user has selected in future sessions. 792615 1 179712 caseq 2012-12-17 04:00:05 -0800 Created attachment 179712 Patch 792641 2 179712 apavlov 2012-12-17 05:13:40 -0800 Comment on attachment 179712 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179712&action=review > Source/WebCore/inspector/front-end/AuditLauncherView.js:69 > +WebInspector.AuditLauncherView.AllCategoriesKey = "__AllCategories"; This can be a computed setting (will slightly break when more categories from new extensions are added, though) > Source/WebCore/inspector/front-end/AuditLauncherView.js:268 > + _selectedCategoriesUpdated: function() Could you clean up the persisted list of categories to remove junk (e.g. leftover categories from disabled/removed extensions) here? 792647 3 179723 caseq 2012-12-17 05:42:54 -0800 Created attachment 179723 Patch 792650 4 caseq 2012-12-17 05:44:42 -0800 (In reply to comment #2) > (From update of attachment 179712 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=179712&action=review > > > Source/WebCore/inspector/front-end/AuditLauncherView.js:69 > > +WebInspector.AuditLauncherView.AllCategoriesKey = "__AllCategories"; > > This can be a computed setting (will slightly break when more categories from new extensions are added, though) Yep -- keeping all categories explicitly in the state we display to the user simplifies things a lot, given that categories come and go dynamically. > > Source/WebCore/inspector/front-end/AuditLauncherView.js:268 > > + _selectedCategoriesUpdated: function() > > Could you clean up the persisted list of categories to remove junk (e.g. leftover categories from disabled/removed extensions) here? Fixed -- now remove categories that are not present each time we update state due to a user action. 792656 5 179723 apavlov 2012-12-17 05:59:14 -0800 Comment on attachment 179723 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179723&action=review Looks good audits-wise. I'd like to hear an authoritative opinion on whether this kind of setting initialization is valid. > Source/WebCore/inspector/front-end/AuditLauncherView.js:66 > + this._selectedCategoriesSetting = WebInspector.settings.createSetting("selectedAuditCategories", defaultSelectedAuditCategory); I'm not sure if this is the right way to initialize a setting (outside Settings.js) - need advice from someone who knows the settings handling well enough. 792660 6 179723 apavlov 2012-12-17 06:03:51 -0800 Comment on attachment 179723 Patch r=me per the offline discussion 792670 7 caseq 2012-12-17 06:15:49 -0800 Committed r137903: <http://trac.webkit.org/changeset/137903> 179712 2012-12-17 04:00:05 -0800 2012-12-17 05:42:48 -0800 Patch bug-103944-20121217155722.patch text/plain 6460 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2I5YzAxMjUxYmM5YzVi ZTcxMmU5ZDFlNWQ0Y2Q1ZTBmNjcyMWIyMy4uMWE0MWRlZDI1Zjg0ZWI2OGJlMzAwODEwZjNhOWVl NTg5ODUxZDQxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTE3ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUGVyc2lzdCBBdWRpdCBzZWxlY3Rpb25zIGFjcm9zcyBzZXNzaW9ucworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzOTQ0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBzZWxlY3RlZCBhdWRpdCBj YXRlZ29yaWVzIGEgcGVyc2lzdGVudCBzZXR0aW5nLCB0byBzaW1wbGlmeSBsaWZlIGZvciB0aG9z ZQorICAgICAgICByZXBlYXRlZGx5IHJ1bm5pbmcgc2FtZSBzZXQgb2YgY2F0ZWdvcmllcy4KKwor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRMYXVuY2hlclZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZS5hZGRDYXRlZ29yeS5nZXQgdmFyKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUuYWRkQ2F0ZWdv cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZS5f c2VsZWN0QWxsQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZp ZXcucHJvdG90eXBlLl9jYXRlZ29yeUNsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1 ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZS5fY3JlYXRlQ2F0ZWdvcnlFbGVtZW50KToKKwogMjAx Mi0xMi0xNiAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGZyYW1lIGJhcnMgb24gdGltZWxpbmUgZG8gbm90IHJlYWN0IG9uIGhv dmVyIGFuZCBkb3VibGUgY2xpY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQXVkaXRMYXVuY2hlclZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0F1ZGl0TGF1bmNoZXJWaWV3LmpzCmluZGV4IGJmNmRiNDM3ZDE3NTNiZDll MWYwYjVlYmQzYWVhNjA3NjA2MGE5NWMuLjc1MTI0YTU4MzgzODY2MDIxNjI3Zjg0M2M3MGZlMmVm OWI3ZTVkYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QXVkaXRMYXVuY2hlclZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9BdWRpdExhdW5jaGVyVmlldy5qcwpAQCAtNjAsOCArNjAsMTQgQEAgV2ViSW5zcGVjdG9y LkF1ZGl0TGF1bmNoZXJWaWV3ID0gZnVuY3Rpb24ocnVubmVyQ2FsbGJhY2spCiAKICAgICBXZWJJ bnNwZWN0b3IubmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0 d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXF1ZXN0U3RhcnRlZCwgdGhpcy5fb25SZXF1ZXN0U3Rh cnRlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVxdWVzdEZpbmlz aGVkLCB0aGlzLl9vblJlcXVlc3RGaW5pc2hlZCwgdGhpcyk7CisKKyAgICB2YXIgZGVmYXVsdFNl bGVjdGVkQXVkaXRDYXRlZ29yeSA9IHt9OworICAgIGRlZmF1bHRTZWxlY3RlZEF1ZGl0Q2F0ZWdv cnlbV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LkFsbENhdGVnb3JpZXNLZXldID0gdHJ1 ZTsKKyAgICB0aGlzLl9zZWxlY3RlZENhdGVnb3JpZXNTZXR0aW5nID0gV2ViSW5zcGVjdG9yLnNl dHRpbmdzLmNyZWF0ZVNldHRpbmcoInNlbGVjdGVkQXVkaXRDYXRlZ29yaWVzIiwgZGVmYXVsdFNl bGVjdGVkQXVkaXRDYXRlZ29yeSk7CiB9CiAKK1dlYkluc3BlY3Rvci5BdWRpdExhdW5jaGVyVmll dy5BbGxDYXRlZ29yaWVzS2V5ID0gIl9fQWxsQ2F0ZWdvcmllcyI7CisKIFdlYkluc3BlY3Rvci5B dWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUgPSB7CiAgICAgX3Jlc2V0UmVzb3VyY2VDb3VudDog ZnVuY3Rpb24oKQogICAgIHsKQEAgLTk3LDkgKzEwMywxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRM YXVuY2hlclZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3NvcnRlZENhdGVn b3JpZXMubGVuZ3RoKQogICAgICAgICAgICAgdGhpcy5fY3JlYXRlTGF1bmNoZXJVSSgpOwogCisg ICAgICAgIHZhciBzZWxlY3RlZENhdGVnb3JpZXMgPSB0aGlzLl9zZWxlY3RlZENhdGVnb3JpZXNT ZXR0aW5nLmdldCgpOwogICAgICAgICB2YXIgY2F0ZWdvcnlFbGVtZW50ID0gdGhpcy5fY3JlYXRl Q2F0ZWdvcnlFbGVtZW50KGNhdGVnb3J5LmRpc3BsYXlOYW1lLCBjYXRlZ29yeS5pZCk7CiAgICAg ICAgIGNhdGVnb3J5Ll9jaGVja2JveEVsZW1lbnQgPSBjYXRlZ29yeUVsZW1lbnQuZmlyc3RDaGls ZDsKLSAgICAgICAgaWYgKHRoaXMuX3NlbGVjdEFsbENoZWNrYm94RWxlbWVudC5jaGVja2VkKSB7 CisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RBbGxDaGVja2JveEVsZW1lbnQuY2hlY2tlZCB8fCBz ZWxlY3RlZENhdGVnb3JpZXNbY2F0ZWdvcnkuZGlzcGxheU5hbWVdKSB7CiAgICAgICAgICAgICBj YXRlZ29yeS5fY2hlY2tib3hFbGVtZW50LmNoZWNrZWQgPSB0cnVlOwogICAgICAgICAgICAgKyt0 aGlzLl9jdXJyZW50Q2F0ZWdvcmllc0NvdW50OwogICAgICAgICB9CkBAIC0xMTMsNyArMTIwLDcg QEAgV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIGluc2VydEJlZm9yZSA9IGluc2VydGlvbkluZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlG dW5jdGlvbihjYXRlZ29yeSwgdGhpcy5fc29ydGVkQ2F0ZWdvcmllcywgY29tcGFyZUNhdGVnb3Jp ZXMpOwogICAgICAgICB0aGlzLl9jYXRlZ29yaWVzRWxlbWVudC5pbnNlcnRCZWZvcmUoY2F0ZWdv cnlFbGVtZW50LCB0aGlzLl9jYXRlZ29yaWVzRWxlbWVudC5jaGlsZHJlbltpbnNlcnRCZWZvcmVd KTsKICAgICAgICAgdGhpcy5fc29ydGVkQ2F0ZWdvcmllcy5zcGxpY2UoaW5zZXJ0QmVmb3JlLCAw LCBjYXRlZ29yeSk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZUJ1dHRvbigpOworICAgICAgICB0aGlz Ll9zZWxlY3RlZENhdGVnb3JpZXNVcGRhdGVkKCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMTcz LDE0ICsxODAsMTQgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgZm9yICh2YXIgaSA9IDAsIGxlbmd0aCA9IGNoaWxkTm9kZXMubGVuZ3RoOyBp IDwgbGVuZ3RoOyArK2kpCiAgICAgICAgICAgICBjaGlsZE5vZGVzW2ldLmZpcnN0Q2hpbGQuY2hl Y2tlZCA9IGNoZWNrQ2F0ZWdvcmllczsKICAgICAgICAgdGhpcy5fY3VycmVudENhdGVnb3JpZXND b3VudCA9IGNoZWNrQ2F0ZWdvcmllcyA/IHRoaXMuX3NvcnRlZENhdGVnb3JpZXMubGVuZ3RoIDog MDsKLSAgICAgICAgdGhpcy5fdXBkYXRlQnV0dG9uKCk7CisgICAgICAgIHRoaXMuX3NlbGVjdGVk Q2F0ZWdvcmllc1VwZGF0ZWQoKTsKICAgICB9LAogCiAgICAgX2NhdGVnb3J5Q2xpY2tlZDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLl9jdXJyZW50Q2F0ZWdvcmllc0NvdW50 ICs9IGV2ZW50LnRhcmdldC5jaGVja2VkID8gMSA6IC0xOwogICAgICAgICB0aGlzLl9zZWxlY3RB bGxDaGVja2JveEVsZW1lbnQuY2hlY2tlZCA9IHRoaXMuX2N1cnJlbnRDYXRlZ29yaWVzQ291bnQg PT09IHRoaXMuX3NvcnRlZENhdGVnb3JpZXMubGVuZ3RoOwotICAgICAgICB0aGlzLl91cGRhdGVC dXR0b24oKTsKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRDYXRlZ29yaWVzVXBkYXRlZCgpOwogICAg IH0sCiAKICAgICAvKioKQEAgLTE5OCw2ICsyMDUsNyBAQCBXZWJJbnNwZWN0b3IuQXVkaXRMYXVu Y2hlclZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX2JvdW5kQ2F0ZWdvcnlDbGlja0xpc3RlbmVyLCBmYWxzZSk7CiAg ICAgICAgIGxhYmVsRWxlbWVudC5hcHBlbmRDaGlsZChlbGVtZW50KTsKICAgICAgICAgbGFiZWxF bGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHRpdGxlKSk7CisgICAg ICAgIGxhYmVsRWxlbWVudC5fX2Rpc3BsYXlOYW1lID0gdGl0bGU7CiAKICAgICAgICAgcmV0dXJu IGxhYmVsRWxlbWVudDsKICAgICB9LApAQCAtMjE5LDcgKzIyNyw3IEBAIFdlYkluc3BlY3Rvci5B dWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBjYXRlZ29yeUVsZW1l bnQgPSB0aGlzLl9jcmVhdGVDYXRlZ29yeUVsZW1lbnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT ZWxlY3QgQWxsIiksICIiKTsKICAgICAgICAgY2F0ZWdvcnlFbGVtZW50LmlkID0gImF1ZGl0LWxh dW5jaGVyLXNlbGVjdGFsbCI7CiAgICAgICAgIHRoaXMuX3NlbGVjdEFsbENoZWNrYm94RWxlbWVu dCA9IGNhdGVnb3J5RWxlbWVudC5maXJzdENoaWxkOwotICAgICAgICB0aGlzLl9zZWxlY3RBbGxD aGVja2JveEVsZW1lbnQuY2hlY2tlZCA9IHRydWU7CisgICAgICAgIHRoaXMuX3NlbGVjdEFsbENo ZWNrYm94RWxlbWVudC5jaGVja2VkID0gdGhpcy5fc2VsZWN0ZWRDYXRlZ29yaWVzU2V0dGluZy5n ZXQoKVtXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcuQWxsQ2F0ZWdvcmllc0tleV07CiAg ICAgICAgIHRoaXMuX3NlbGVjdEFsbENoZWNrYm94RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIGhhbmRsZVNlbGVjdEFsbENsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAg dGhpcy5fY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoY2F0ZWdvcnlFbGVtZW50KTsKIApAQCAt MjQ5LDcgKzI1Nyw2IEBAIFdlYkluc3BlY3Rvci5BdWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX2xhdW5jaEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIs IHRoaXMuX2xhdW5jaEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgICAg IHRoaXMuX3NlbGVjdEFsbENsaWNrZWQodGhpcy5fc2VsZWN0QWxsQ2hlY2tib3hFbGVtZW50LmNo ZWNrZWQpOwotICAgICAgICB0aGlzLl91cGRhdGVCdXR0b24oKTsKICAgICB9LAogCiAgICAgX3Vw ZGF0ZVJlc291cmNlUHJvZ3Jlc3M6IGZ1bmN0aW9uKCkKQEAgLTI1OCw2ICsyNjUsMTcgQEAgV2Vi SW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRo aXMuX3Byb2dyZXNzSW5kaWNhdG9yLnNldFRpdGxlKFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9h ZGluZyAoJWQgb2YgJWQpIiwgdGhpcy5fbG9hZGVkUmVzb3VyY2VzLCB0aGlzLl90b3RhbFJlc291 cmNlcykpOwogICAgIH0sCiAKKyAgICBfc2VsZWN0ZWRDYXRlZ29yaWVzVXBkYXRlZDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgdmFyIHNlbGVjdGVkQ2F0ZWdvcmllcyA9IHRoaXMuX3NlbGVj dGVkQ2F0ZWdvcmllc1NldHRpbmcuZ2V0KCk7CisgICAgICAgIHZhciBjaGlsZE5vZGVzID0gdGhp cy5fY2F0ZWdvcmllc0VsZW1lbnQuY2hpbGROb2RlczsKKyAgICAgICAgZm9yICh2YXIgaSA9IDAs IGxlbmd0aCA9IGNoaWxkTm9kZXMubGVuZ3RoOyBpIDwgbGVuZ3RoOyArK2kpCisgICAgICAgICAg ICBzZWxlY3RlZENhdGVnb3JpZXNbY2hpbGROb2Rlc1tpXS5fX2Rpc3BsYXlOYW1lXSA9IGNoaWxk Tm9kZXNbaV0uZmlyc3RDaGlsZC5jaGVja2VkOworICAgICAgICBzZWxlY3RlZENhdGVnb3JpZXNb V2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LkFsbENhdGVnb3JpZXNLZXldID0gdGhpcy5f c2VsZWN0QWxsQ2hlY2tib3hFbGVtZW50LmNoZWNrZWQ7CisgICAgICAgIHRoaXMuX3NlbGVjdGVk Q2F0ZWdvcmllc1NldHRpbmcuc2V0KHNlbGVjdGVkQ2F0ZWdvcmllcyk7CisgICAgICAgIHRoaXMu X3VwZGF0ZUJ1dHRvbigpOworICAgIH0sCisKICAgICBfdXBkYXRlQnV0dG9uOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB0aGlzLl9sYXVuY2hCdXR0b24udGV4dENvbnRlbnQgPSB0aGlzLl9h dWRpdFJ1bm5pbmcgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0b3AiKSA6IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUnVuIik7Cg== 179723 2012-12-17 05:42:54 -0800 2012-12-17 06:03:51 -0800 Patch bug-103944-20121217174011.patch text/plain 7308 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2I5YzAxMjUxYmM5YzVi ZTcxMmU5ZDFlNWQ0Y2Q1ZTBmNjcyMWIyMy4uMWE0MWRlZDI1Zjg0ZWI2OGJlMzAwODEwZjNhOWVl NTg5ODUxZDQxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTE3ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUGVyc2lzdCBBdWRpdCBzZWxlY3Rpb25zIGFjcm9zcyBzZXNzaW9ucworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzOTQ0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBzZWxlY3RlZCBhdWRpdCBj YXRlZ29yaWVzIGEgcGVyc2lzdGVudCBzZXR0aW5nLCB0byBzaW1wbGlmeSBsaWZlIGZvciB0aG9z ZQorICAgICAgICByZXBlYXRlZGx5IHJ1bm5pbmcgc2FtZSBzZXQgb2YgY2F0ZWdvcmllcy4KKwor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXVkaXRMYXVuY2hlclZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZS5hZGRDYXRlZ29yeS5nZXQgdmFyKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5BdWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUuYWRkQ2F0ZWdv cnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZS5f c2VsZWN0QWxsQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZp ZXcucHJvdG90eXBlLl9jYXRlZ29yeUNsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkF1 ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZS5fY3JlYXRlQ2F0ZWdvcnlFbGVtZW50KToKKwogMjAx Mi0xMi0xNiAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGZyYW1lIGJhcnMgb24gdGltZWxpbmUgZG8gbm90IHJlYWN0IG9uIGhv dmVyIGFuZCBkb3VibGUgY2xpY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQXVkaXRMYXVuY2hlclZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0F1ZGl0TGF1bmNoZXJWaWV3LmpzCmluZGV4IGJmNmRiNDM3ZDE3NTNiZDll MWYwYjVlYmQzYWVhNjA3NjA2MGE5NWMuLmYyN2IyN2NkZmQ2MGI5NjM5YmUxNzQ1ZThmZmFhNjUy ODgyNWZlNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QXVkaXRMYXVuY2hlclZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9BdWRpdExhdW5jaGVyVmlldy5qcwpAQCAtNjAsOCArNjAsMTQgQEAgV2ViSW5zcGVjdG9y LkF1ZGl0TGF1bmNoZXJWaWV3ID0gZnVuY3Rpb24ocnVubmVyQ2FsbGJhY2spCiAKICAgICBXZWJJ bnNwZWN0b3IubmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0 d29ya01hbmFnZXIuRXZlbnRUeXBlcy5SZXF1ZXN0U3RhcnRlZCwgdGhpcy5fb25SZXF1ZXN0U3Rh cnRlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVxdWVzdEZpbmlz aGVkLCB0aGlzLl9vblJlcXVlc3RGaW5pc2hlZCwgdGhpcyk7CisKKyAgICB2YXIgZGVmYXVsdFNl bGVjdGVkQXVkaXRDYXRlZ29yeSA9IHt9OworICAgIGRlZmF1bHRTZWxlY3RlZEF1ZGl0Q2F0ZWdv cnlbV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LkFsbENhdGVnb3JpZXNLZXldID0gdHJ1 ZTsKKyAgICB0aGlzLl9zZWxlY3RlZENhdGVnb3JpZXNTZXR0aW5nID0gV2ViSW5zcGVjdG9yLnNl dHRpbmdzLmNyZWF0ZVNldHRpbmcoInNlbGVjdGVkQXVkaXRDYXRlZ29yaWVzIiwgZGVmYXVsdFNl bGVjdGVkQXVkaXRDYXRlZ29yeSk7CiB9CiAKK1dlYkluc3BlY3Rvci5BdWRpdExhdW5jaGVyVmll dy5BbGxDYXRlZ29yaWVzS2V5ID0gIl9fQWxsQ2F0ZWdvcmllcyI7CisKIFdlYkluc3BlY3Rvci5B dWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUgPSB7CiAgICAgX3Jlc2V0UmVzb3VyY2VDb3VudDog ZnVuY3Rpb24oKQogICAgIHsKQEAgLTk3LDkgKzEwMywxMCBAQCBXZWJJbnNwZWN0b3IuQXVkaXRM YXVuY2hlclZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3NvcnRlZENhdGVn b3JpZXMubGVuZ3RoKQogICAgICAgICAgICAgdGhpcy5fY3JlYXRlTGF1bmNoZXJVSSgpOwogCisg ICAgICAgIHZhciBzZWxlY3RlZENhdGVnb3JpZXMgPSB0aGlzLl9zZWxlY3RlZENhdGVnb3JpZXNT ZXR0aW5nLmdldCgpOwogICAgICAgICB2YXIgY2F0ZWdvcnlFbGVtZW50ID0gdGhpcy5fY3JlYXRl Q2F0ZWdvcnlFbGVtZW50KGNhdGVnb3J5LmRpc3BsYXlOYW1lLCBjYXRlZ29yeS5pZCk7CiAgICAg ICAgIGNhdGVnb3J5Ll9jaGVja2JveEVsZW1lbnQgPSBjYXRlZ29yeUVsZW1lbnQuZmlyc3RDaGls ZDsKLSAgICAgICAgaWYgKHRoaXMuX3NlbGVjdEFsbENoZWNrYm94RWxlbWVudC5jaGVja2VkKSB7 CisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RBbGxDaGVja2JveEVsZW1lbnQuY2hlY2tlZCB8fCBz ZWxlY3RlZENhdGVnb3JpZXNbY2F0ZWdvcnkuZGlzcGxheU5hbWVdKSB7CiAgICAgICAgICAgICBj YXRlZ29yeS5fY2hlY2tib3hFbGVtZW50LmNoZWNrZWQgPSB0cnVlOwogICAgICAgICAgICAgKyt0 aGlzLl9jdXJyZW50Q2F0ZWdvcmllc0NvdW50OwogICAgICAgICB9CkBAIC0xMTMsNyArMTIwLDcg QEAgV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIGluc2VydEJlZm9yZSA9IGluc2VydGlvbkluZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlG dW5jdGlvbihjYXRlZ29yeSwgdGhpcy5fc29ydGVkQ2F0ZWdvcmllcywgY29tcGFyZUNhdGVnb3Jp ZXMpOwogICAgICAgICB0aGlzLl9jYXRlZ29yaWVzRWxlbWVudC5pbnNlcnRCZWZvcmUoY2F0ZWdv cnlFbGVtZW50LCB0aGlzLl9jYXRlZ29yaWVzRWxlbWVudC5jaGlsZHJlbltpbnNlcnRCZWZvcmVd KTsKICAgICAgICAgdGhpcy5fc29ydGVkQ2F0ZWdvcmllcy5zcGxpY2UoaW5zZXJ0QmVmb3JlLCAw LCBjYXRlZ29yeSk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZUJ1dHRvbigpOworICAgICAgICB0aGlz Ll9zZWxlY3RlZENhdGVnb3JpZXNVcGRhdGVkKCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMTY2 LDIxICsxNzMsMjIgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNoZXJWaWV3LnByb3RvdHlwZSA9 IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gY2hlY2tDYXRlZ29yaWVzCisg ICAgICogQHBhcmFtIHtib29sZWFuPX0gdXNlckdlc3R1cmUKICAgICAgKi8KLSAgICBfc2VsZWN0 QWxsQ2xpY2tlZDogZnVuY3Rpb24oY2hlY2tDYXRlZ29yaWVzKQorICAgIF9zZWxlY3RBbGxDbGlj a2VkOiBmdW5jdGlvbihjaGVja0NhdGVnb3JpZXMsIHVzZXJHZXN0dXJlKQogICAgIHsKICAgICAg ICAgdmFyIGNoaWxkTm9kZXMgPSB0aGlzLl9jYXRlZ29yaWVzRWxlbWVudC5jaGlsZE5vZGVzOwog ICAgICAgICBmb3IgKHZhciBpID0gMCwgbGVuZ3RoID0gY2hpbGROb2Rlcy5sZW5ndGg7IGkgPCBs ZW5ndGg7ICsraSkKICAgICAgICAgICAgIGNoaWxkTm9kZXNbaV0uZmlyc3RDaGlsZC5jaGVja2Vk ID0gY2hlY2tDYXRlZ29yaWVzOwogICAgICAgICB0aGlzLl9jdXJyZW50Q2F0ZWdvcmllc0NvdW50 ID0gY2hlY2tDYXRlZ29yaWVzID8gdGhpcy5fc29ydGVkQ2F0ZWdvcmllcy5sZW5ndGggOiAwOwot ICAgICAgICB0aGlzLl91cGRhdGVCdXR0b24oKTsKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRDYXRl Z29yaWVzVXBkYXRlZCh1c2VyR2VzdHVyZSk7CiAgICAgfSwKIAogICAgIF9jYXRlZ29yeUNsaWNr ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fY3VycmVudENhdGVnb3Jp ZXNDb3VudCArPSBldmVudC50YXJnZXQuY2hlY2tlZCA/IDEgOiAtMTsKICAgICAgICAgdGhpcy5f c2VsZWN0QWxsQ2hlY2tib3hFbGVtZW50LmNoZWNrZWQgPSB0aGlzLl9jdXJyZW50Q2F0ZWdvcmll c0NvdW50ID09PSB0aGlzLl9zb3J0ZWRDYXRlZ29yaWVzLmxlbmd0aDsKLSAgICAgICAgdGhpcy5f dXBkYXRlQnV0dG9uKCk7CisgICAgICAgIHRoaXMuX3NlbGVjdGVkQ2F0ZWdvcmllc1VwZGF0ZWQo dHJ1ZSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMTk4LDYgKzIwNiw3IEBAIFdlYkluc3BlY3Rv ci5BdWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBlbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fYm91bmRDYXRlZ29yeUNsaWNrTGlzdGVuZXIs IGZhbHNlKTsKICAgICAgICAgbGFiZWxFbGVtZW50LmFwcGVuZENoaWxkKGVsZW1lbnQpOwogICAg ICAgICBsYWJlbEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGl0 bGUpKTsKKyAgICAgICAgbGFiZWxFbGVtZW50Ll9fZGlzcGxheU5hbWUgPSB0aXRsZTsKIAogICAg ICAgICByZXR1cm4gbGFiZWxFbGVtZW50OwogICAgIH0sCkBAIC0yMTQsMTIgKzIyMywxMiBAQCBX ZWJJbnNwZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1 bmN0aW9uIGhhbmRsZVNlbGVjdEFsbENsaWNrKGV2ZW50KQogICAgICAgICB7Ci0gICAgICAgICAg ICB0aGlzLl9zZWxlY3RBbGxDbGlja2VkKGV2ZW50LnRhcmdldC5jaGVja2VkKTsKKyAgICAgICAg ICAgIHRoaXMuX3NlbGVjdEFsbENsaWNrZWQoZXZlbnQudGFyZ2V0LmNoZWNrZWQsIHRydWUpOwog ICAgICAgICB9CiAgICAgICAgIHZhciBjYXRlZ29yeUVsZW1lbnQgPSB0aGlzLl9jcmVhdGVDYXRl Z29yeUVsZW1lbnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgQWxsIiksICIiKTsKICAg ICAgICAgY2F0ZWdvcnlFbGVtZW50LmlkID0gImF1ZGl0LWxhdW5jaGVyLXNlbGVjdGFsbCI7CiAg ICAgICAgIHRoaXMuX3NlbGVjdEFsbENoZWNrYm94RWxlbWVudCA9IGNhdGVnb3J5RWxlbWVudC5m aXJzdENoaWxkOwotICAgICAgICB0aGlzLl9zZWxlY3RBbGxDaGVja2JveEVsZW1lbnQuY2hlY2tl ZCA9IHRydWU7CisgICAgICAgIHRoaXMuX3NlbGVjdEFsbENoZWNrYm94RWxlbWVudC5jaGVja2Vk ID0gdGhpcy5fc2VsZWN0ZWRDYXRlZ29yaWVzU2V0dGluZy5nZXQoKVtXZWJJbnNwZWN0b3IuQXVk aXRMYXVuY2hlclZpZXcuQWxsQ2F0ZWdvcmllc0tleV07CiAgICAgICAgIHRoaXMuX3NlbGVjdEFs bENoZWNrYm94RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGhhbmRsZVNlbGVjdEFs bENsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgdGhpcy5fY29udGVudEVsZW1lbnQu YXBwZW5kQ2hpbGQoY2F0ZWdvcnlFbGVtZW50KTsKIApAQCAtMjQ5LDcgKzI1OCw2IEBAIFdlYklu c3BlY3Rvci5BdWRpdExhdW5jaGVyVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2xh dW5jaEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2xhdW5jaEJ1dHRvbkNs aWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgICAgIHRoaXMuX3NlbGVjdEFsbENsaWNr ZWQodGhpcy5fc2VsZWN0QWxsQ2hlY2tib3hFbGVtZW50LmNoZWNrZWQpOwotICAgICAgICB0aGlz Ll91cGRhdGVCdXR0b24oKTsKICAgICB9LAogCiAgICAgX3VwZGF0ZVJlc291cmNlUHJvZ3Jlc3M6 IGZ1bmN0aW9uKCkKQEAgLTI1OCw2ICsyNjYsMjMgQEAgV2ViSW5zcGVjdG9yLkF1ZGl0TGF1bmNo ZXJWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3Byb2dyZXNzSW5kaWNhdG9y LnNldFRpdGxlKFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9hZGluZyAoJWQgb2YgJWQpIiwgdGhp cy5fbG9hZGVkUmVzb3VyY2VzLCB0aGlzLl90b3RhbFJlc291cmNlcykpOwogICAgIH0sCiAKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW49fSB1c2VyR2VzdHVyZQorICAgICAqLworICAg IF9zZWxlY3RlZENhdGVnb3JpZXNVcGRhdGVkOiBmdW5jdGlvbih1c2VyR2VzdHVyZSkKKyAgICB7 CisgICAgICAgIC8vIFNhdmUgcHJlc2VudCBjYXRlZ29yaWVzIG9ubHkgdXBvbiB1c2VyIGdlc3R1 cmUgdG8gY2xlYW4gdXAganVuayBmcm9tIHBhc3QgdmVyc2lvbnMgYW5kIHJlbW92ZWQgZXh0ZW5z aW9ucy4KKyAgICAgICAgLy8gRG8gbm90IHJlbW92ZSBvbGQgY2F0ZWdvcmllcyBpZiBub3QgaGFu ZGxpbmcgYSB1c2VyIGdlc3R1cmUsIGFzIHRoZXJlJ3MgY2hhbmNlIGNhdGVnb3JpZXMgd2lsbCBi ZSBhZGRlZAorICAgICAgICAvLyBsYXRlciBkdXJpbmcgc3RhcnQtdXAuCisgICAgICAgIHZhciBz ZWxlY3RlZENhdGVnb3JpZXMgPSB1c2VyR2VzdHVyZSA/IHt9IDogdGhpcy5fc2VsZWN0ZWRDYXRl Z29yaWVzU2V0dGluZy5nZXQoKTsKKyAgICAgICAgdmFyIGNoaWxkTm9kZXMgPSB0aGlzLl9jYXRl Z29yaWVzRWxlbWVudC5jaGlsZE5vZGVzOworICAgICAgICBmb3IgKHZhciBpID0gMCwgbGVuZ3Ro ID0gY2hpbGROb2Rlcy5sZW5ndGg7IGkgPCBsZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHNlbGVj dGVkQ2F0ZWdvcmllc1tjaGlsZE5vZGVzW2ldLl9fZGlzcGxheU5hbWVdID0gY2hpbGROb2Rlc1tp XS5maXJzdENoaWxkLmNoZWNrZWQ7CisgICAgICAgIHNlbGVjdGVkQ2F0ZWdvcmllc1tXZWJJbnNw ZWN0b3IuQXVkaXRMYXVuY2hlclZpZXcuQWxsQ2F0ZWdvcmllc0tleV0gPSB0aGlzLl9zZWxlY3RB bGxDaGVja2JveEVsZW1lbnQuY2hlY2tlZDsKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRDYXRlZ29y aWVzU2V0dGluZy5zZXQoc2VsZWN0ZWRDYXRlZ29yaWVzKTsKKyAgICAgICAgdGhpcy5fdXBkYXRl QnV0dG9uKCk7CisgICAgfSwKKwogICAgIF91cGRhdGVCdXR0b246IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX2xhdW5jaEJ1dHRvbi50ZXh0Q29udGVudCA9IHRoaXMuX2F1ZGl0UnVu bmluZyA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RvcCIpIDogV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJSdW4iKTsK