167651 2017-01-31 10:18:55 -0800 Web Inspector: User Settings: Secondary-clicking the New Tab and Settings tabs should not produce a context menu 2017-01-31 13:05:55 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi bburg commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1271769 0 bburg 2017-01-31 10:18:55 -0800 Via Nelson Thachuk: * SUMMARY - Secondary-clicking the New Tab and Settings tabs should not produce a context menu * STEPS TO REPRODUCE 1. Launch Safari 2. Navigate to a webpage 3. Show Web Inspector (⌥⌘I) 4. Secondary-click the New Tab and Settings buttons * EXPECTED RESULTS - Nothing should occur * ACTUAL RESULTS - Context menu with “Copy Image” that doesn’t copy anything to the clipboard 1271770 1 bburg 2017-01-31 10:19:19 -0800 <rdar://problem/30222495> 1271791 2 300237 hi 2017-01-31 11:08:03 -0800 Created attachment 300237 Patch 1271793 3 300237 joepeck 2017-01-31 11:13:27 -0800 Comment on attachment 300237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300237&action=review > Source/WebInspectorUI/UserInterface/Views/TabBar.js:376 > + get newTabTabBarItem() { return this._newTabTabBarItem; } Getters like these should be at the top of the Public section. 1271796 4 300237 joepeck 2017-01-31 11:15:47 -0800 Comment on attachment 300237 Patch r=me 1271832 5 300246 hi 2017-01-31 12:28:29 -0800 Created attachment 300246 Patch 1271851 6 300246 commit-queue 2017-01-31 13:05:52 -0800 Comment on attachment 300246 Patch Clearing flags on attachment: 300246 Committed r211445: <http://trac.webkit.org/changeset/211445> 1271852 7 commit-queue 2017-01-31 13:05:55 -0800 All reviewed patches have been landed. Closing bug. 300237 2017-01-31 11:08:03 -0800 2017-01-31 12:28:29 -0800 Patch bug-167651-20170131110552.patch text/plain 5677 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJiMjVkNGMzNmQ2MzkwN2YzODM0OTg4ZmNmY2Jl MDY1Y2Q4MmY0NTcuLjQ0YzRiZWYzYzYzZTg4YjAwNmZmODRmZWFjODRiYTc5MjdiMzdlZjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTAxLTMxICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFVzZXIgU2V0dGluZ3M6IFNlY29uZGFyeS1jbGlja2luZyB0aGUgTmV3IFRhYiBhbmQg U2V0dGluZ3MgdGFicyBzaG91bGQgbm90IHByb2R1Y2UgYSBjb250ZXh0IG1lbnUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzY1MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9QaW5uZWRUYWJCYXJJdGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBpbm5lZFRh YkJhckl0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBpbm5lZFRhYkJhckl0ZW0ucHJvdG90 eXBlLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgQWx3YXlzIHByZXZlbnREZWZh dWx0KCkgdG8gZW5zdXJlIHRoYXQgdGhlIHN5c3RlbSBjb250ZXh0IG1lbnUgaXMgbmV2ZXIgc2hv d24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UYWJCYXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkJhci5wcm90 b3R5cGUuZ2V0IG5ld1RhYlRhYkJhckl0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkJh ci5wcm90b3R5cGUuX2hhbmRsZU5ld1RhYkNvbnRleHRNZW51KTogRGVsZXRlZC4KKyAgICAgICAg TW92ZSB0aGUgZXZlbnQgZGlzcGF0Y2ggdG8gV2ViSW5zcGVjdG9yLlBpbm5lZFRhYkJhckl0ZW0g dG8gZ2l2ZSBhbGwgaW5zdGFuY2VzIGEgY29udGV4dG1lbnUKKyAgICAgICAgZXZlbnQgaGFuZGxl ci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UYWJCcm93c2VyKToKKwogMjAxNy0wMS0zMSAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZHJl c3Mgc29tZSBFU0xpbnQgd2FybmluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Bpbm5lZFRhYkJhckl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9QaW5uZWRUYWJCYXJJdGVtLmpzCmluZGV4IDhh YzMwOGVlZDBiZTcxNGI1MGFlMzRlYmFkYWIwYTU1NGY1MzZiNDguLmI0MWZkNmJmZGRkYjU3NTE1 NmYxMWIxOGVmODJmYTcxOWJlM2EyNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Bpbm5lZFRhYkJhckl0ZW0uanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUGlubmVkVGFiQmFySXRlbS5qcwpAQCAt MzAsNSArMzAsMjIgQEAgV2ViSW5zcGVjdG9yLlBpbm5lZFRhYkJhckl0ZW0gPSBjbGFzcyBQaW5u ZWRUYWJCYXJJdGVtIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRhYkIKICAgICAgICAgc3VwZXIoaW1h Z2UsIHRpdGxlLCByZXByZXNlbnRlZE9iamVjdCk7CiAKICAgICAgICAgdGhpcy5lbGVtZW50LmNs YXNzTGlzdC5hZGQoInBpbm5lZCIpOworCisgICAgICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQuYmluZCh0 aGlzKSk7CiAgICAgfQorCisgICAgLy8gUHJpdmF0ZQorCisgICAgX2hhbmRsZUNvbnRleHRNZW51 RXZlbnQoZXZlbnQpCisgICAgeworICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworCisg ICAgICAgIGxldCBjb250ZXh0TWVudSA9IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudS5jcmVhdGVG cm9tRXZlbnQoZXZlbnQpOworCisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5QaW5uZWRUYWJCYXJJdGVtLkV2ZW50LkNvbnRleHRNZW51LCB7Y29udGV4 dE1lbnV9KTsKKyAgICB9Cit9OworCitXZWJJbnNwZWN0b3IuUGlubmVkVGFiQmFySXRlbS5FdmVu dCA9IHsKKyAgICBDb250ZXh0TWVudTogInBpbm5lZC10YWItYmFyLWl0ZW0tY29udGV4dC1tZW51 IiwKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UYWJCYXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UYWJCYXIuanMKaW5kZXggZDYyNmNkZTY0M2ZjOTJhMjBmMWI1ZDlkODk3OTZhMjQ5NDBkMTRl NC4uZWUyM2FlYTk2NTc3MmFmMDBkNjE4MjQzY2Y0MzMxOTlhNDg4N2QwYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qcwpAQCAt NDksNyArNDksNiBAQCBXZWJJbnNwZWN0b3IuVGFiQmFyID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMg V2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhpcy5fbmV3VGFiVGFiQmFySXRlbSA9IG5ldyBX ZWJJbnNwZWN0b3IuUGlubmVkVGFiQmFySXRlbSgiSW1hZ2VzL05ld1RhYlBsdXMuc3ZnIiwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJDcmVhdGUgYSBuZXcgdGFiIikpOwogICAgICAgICB0aGlzLl9u ZXdUYWJUYWJCYXJJdGVtLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VlbnRlciIsIHRo aXMuX2hhbmRsZU5ld1RhYk1vdXNlRW50ZXIuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX25l d1RhYlRhYkJhckl0ZW0uZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2hh bmRsZU5ld1RhYkNsaWNrLmJpbmQodGhpcykpOwotICAgICAgICB0aGlzLl9uZXdUYWJUYWJCYXJJ dGVtLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVO ZXdUYWJDb250ZXh0TWVudS5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5hZGRUYWJCYXJJdGVt KHRoaXMuX25ld1RhYlRhYkJhckl0ZW0sIHRydWUpOwogICAgIH0KIApAQCAtMzc0LDYgKzM3Myw4 IEBAIFdlYkluc3BlY3Rvci5UYWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuVmlldwogICAgICAgICByZXR1cm4gdGhpcy5fdGFiQmFySXRlbXMuZmlsdGVyKChpdGVtKSA9 PiAhKGl0ZW0gaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUGlubmVkVGFiQmFySXRlbSkpLmxlbmd0 aDsKICAgICB9CiAKKyAgICBnZXQgbmV3VGFiVGFiQmFySXRlbSgpIHsgcmV0dXJuIHRoaXMuX25l d1RhYlRhYkJhckl0ZW07IH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAgICAgbGF5b3V0KCkKQEAg LTcyOSwxMyArNzMwLDYgQEAgV2ViSW5zcGVjdG9yLlRhYkJhciA9IGNsYXNzIFRhYkJhciBleHRl bmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93TmV3VGFiVGFi KHNob3VsZEFuaW1hdGUpOwogICAgIH0KIAotICAgIF9oYW5kbGVOZXdUYWJDb250ZXh0TWVudShl dmVudCkKLSAgICB7Ci0gICAgICAgIGxldCBjb250ZXh0TWVudSA9IFdlYkluc3BlY3Rvci5Db250 ZXh0TWVudS5jcmVhdGVGcm9tRXZlbnQoZXZlbnQpOwotCi0gICAgICAgIHRoaXMuZGlzcGF0Y2hF dmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UYWJCYXIuRXZlbnQuTmV3VGFiQ29udGV4dE1l bnUsIHtjb250ZXh0TWVudX0pOwotICAgIH0KLQogICAgIF9oYW5kbGVOZXdUYWJNb3VzZUVudGVy KGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl90YWJBbmltYXRlZENsb3NlZFNpbmNl TW91c2VFbnRlciB8fCAhdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5jb250YWlucygic3RhdGljLWxh eW91dCIpIHx8IHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuY29udGFpbnMoImFuaW1hdGluZyIpKQpA QCAtNzUwLDYgKzc0NCw1IEBAIFdlYkluc3BlY3Rvci5UYWJCYXIuRXZlbnQgPSB7CiAgICAgVGFi QmFySXRlbUFkZGVkOiAidGFiLWJhci10YWItYmFyLWl0ZW0tYWRkZWQiLAogICAgIFRhYkJhckl0 ZW1SZW1vdmVkOiAidGFiLWJhci10YWItYmFyLWl0ZW0tcmVtb3ZlZCIsCiAgICAgVGFiQmFySXRl bXNSZW9yZGVyZWQ6ICJ0YWItYmFyLXRhYi1iYXItaXRlbXMtcmVvcmRlcmVkIiwKLSAgICBOZXdU YWJDb250ZXh0TWVudTogInRhYi1iYXItbmV3LXRhYi1jb250ZXh0bWVudSIsCiAgICAgT3BlbkRl ZmF1bHRUYWI6ICJ0YWItYmFyLW9wZW4tZGVmYXVsdC10YWIiCiB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMKaW5k ZXggNzQ1MDczNzNmOTQ0OGE3NmMxODYxMzJmZjkxNDJiNWZmNjNlYTZmOS4uNTEyMTkzYWIzNmNi MTQ5ZmZiMzdhNzIwNTUwYzFkYTgzOWU2NzQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCkBAIC03NCw3ICs3 NCw3IEBAIFdlYkluc3BlY3Rvci5UYWJCcm93c2VyID0gY2xhc3MgVGFiQnJvd3NlciBleHRlbmRz IFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHRoaXMuX3RhYkJhci5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5UYWJCYXIuRXZlbnQuVGFiQmFySXRlbVNlbGVjdGVkLCB0aGlzLl90YWJC YXJJdGVtU2VsZWN0ZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl90YWJCYXIuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuVGFiQmFyLkV2ZW50LlRhYkJhckl0ZW1BZGRlZCwgdGhpcy5fdGFi QmFySXRlbUFkZGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fdGFiQmFyLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlRhYkJhci5FdmVudC5UYWJCYXJJdGVtUmVtb3ZlZCwgdGhpcy5fdGFi QmFySXRlbVJlbW92ZWQsIHRoaXMpOwotICAgICAgICB0aGlzLl90YWJCYXIuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuVGFiQmFyLkV2ZW50Lk5ld1RhYkNvbnRleHRNZW51LCB0aGlzLl9o YW5kbGVOZXdUYWJDb250ZXh0TWVudSwgdGhpcyk7CisgICAgICAgIHRoaXMuX3RhYkJhci5uZXdU YWJUYWJCYXJJdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlBpbm5lZFRhYkJhckl0 ZW0uRXZlbnQuQ29udGV4dE1lbnUsIHRoaXMuX2hhbmRsZU5ld1RhYkNvbnRleHRNZW51LCB0aGlz KTsKIAogICAgICAgICB0aGlzLl9yZWNlbnRUYWJDb250ZW50Vmlld3MgPSBbXTsKICAgICAgICAg dGhpcy5fY2xvc2VkVGFiQ2xhc3NlcyA9IG5ldyBTZXQ7Cg== 300246 2017-01-31 12:28:29 -0800 2017-01-31 13:05:52 -0800 Patch 167651.diff text/plain 5346 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJiMjVkNGMuLjRhNzhiZGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTAxLTMxICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVz ZXIgU2V0dGluZ3M6IFNlY29uZGFyeS1jbGlja2luZyB0aGUgTmV3IFRhYiBhbmQgU2V0dGluZ3Mg dGFicyBzaG91bGQgbm90IHByb2R1Y2UgYSBjb250ZXh0IG1lbnUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzY1MQorCisgICAgICAgIFJldmlld2Vk IGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUGlu bmVkVGFiQmFySXRlbS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QaW5uZWRUYWJCYXJJdGVt KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QaW5uZWRUYWJCYXJJdGVtLnByb3RvdHlwZS5faGFu ZGxlQ29udGV4dE1lbnVFdmVudCk6CisgICAgICAgIEFsd2F5cyBwcmV2ZW50RGVmYXVsdCgpIHRv IGVuc3VyZSB0aGF0IHRoZSBzeXN0ZW0gY29udGV4dCBtZW51IGlzIG5ldmVyIHNob3duLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGFiQmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCYXIucHJvdG90eXBlLmdl dCBuZXdUYWJUYWJCYXJJdGVtKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCYXIucHJvdG90 eXBlLl9oYW5kbGVOZXdUYWJDb250ZXh0TWVudSk6IERlbGV0ZWQuCisgICAgICAgIE1vdmUgdGhl IGV2ZW50IGRpc3BhdGNoIHRvIFdlYkluc3BlY3Rvci5QaW5uZWRUYWJCYXJJdGVtIHRvIGdpdmUg YWxsIGluc3RhbmNlcyBhIGNvbnRleHRtZW51CisgICAgICAgIGV2ZW50IGhhbmRsZXIuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGFiQnJvd3Nlcik6CisKIDIwMTctMDEtMzEgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGRyZXNzIHNvbWUg RVNMaW50IHdhcm5pbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9QaW5uZWRUYWJCYXJJdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUGlubmVkVGFiQmFySXRlbS5qcwppbmRleCA4YWMzMDhlLi5i NDFmZDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9QaW5uZWRUYWJCYXJJdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Bpbm5lZFRhYkJhckl0ZW0uanMKQEAgLTMwLDUgKzMwLDIyIEBAIFdl Ykluc3BlY3Rvci5QaW5uZWRUYWJCYXJJdGVtID0gY2xhc3MgUGlubmVkVGFiQmFySXRlbSBleHRl bmRzIFdlYkluc3BlY3Rvci5UYWJCCiAgICAgICAgIHN1cGVyKGltYWdlLCB0aXRsZSwgcmVwcmVz ZW50ZWRPYmplY3QpOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJwaW5u ZWQiKTsKKworICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1l bnUiLCB0aGlzLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50LmJpbmQodGhpcykpOwogICAgIH0KKwor ICAgIC8vIFByaXZhdGUKKworICAgIF9oYW5kbGVDb250ZXh0TWVudUV2ZW50KGV2ZW50KQorICAg IHsKKyAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKworICAgICAgICBsZXQgY29udGV4 dE1lbnUgPSBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUuY3JlYXRlRnJvbUV2ZW50KGV2ZW50KTsK KworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUGlu bmVkVGFiQmFySXRlbS5FdmVudC5Db250ZXh0TWVudSwge2NvbnRleHRNZW51fSk7CisgICAgfQor fTsKKworV2ViSW5zcGVjdG9yLlBpbm5lZFRhYkJhckl0ZW0uRXZlbnQgPSB7CisgICAgQ29udGV4 dE1lbnU6ICJwaW5uZWQtdGFiLWJhci1pdGVtLWNvbnRleHQtbWVudSIsCiB9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzCmluZGV4 IGQ2MjZjZGUuLmE0OWFmOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMKQEAgLTQ5LDEyICs0OSwxMyBAQCBXZWJJbnNwZWN0 b3IuVGFiQmFyID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAg ICAgdGhpcy5fbmV3VGFiVGFiQmFySXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuUGlubmVkVGFiQmFy SXRlbSgiSW1hZ2VzL05ld1RhYlBsdXMuc3ZnIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDcmVh dGUgYSBuZXcgdGFiIikpOwogICAgICAgICB0aGlzLl9uZXdUYWJUYWJCYXJJdGVtLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigibW91c2VlbnRlciIsIHRoaXMuX2hhbmRsZU5ld1RhYk1vdXNlRW50 ZXIuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX25ld1RhYlRhYkJhckl0ZW0uZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2hhbmRsZU5ld1RhYkNsaWNrLmJpbmQodGhp cykpOwotICAgICAgICB0aGlzLl9uZXdUYWJUYWJCYXJJdGVtLmVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVOZXdUYWJDb250ZXh0TWVudS5iaW5kKHRo aXMpKTsKICAgICAgICAgdGhpcy5hZGRUYWJCYXJJdGVtKHRoaXMuX25ld1RhYlRhYkJhckl0ZW0s IHRydWUpOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwogCisgICAgZ2V0IG5ld1RhYlRhYkJhckl0 ZW0oKSB7IHJldHVybiB0aGlzLl9uZXdUYWJUYWJCYXJJdGVtOyB9CisKICAgICB1cGRhdGVOZXdU YWJUYWJCYXJJdGVtU3RhdGUoKQogICAgIHsKICAgICAgICAgbGV0IG5ld1RhYkV4aXN0cyA9ICFX ZWJJbnNwZWN0b3IuaXNOZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLk5ld1RhYkNv bnRlbnRWaWV3LlR5cGUpOwpAQCAtNzI5LDEzICs3MzAsNiBAQCBXZWJJbnNwZWN0b3IuVGFiQmFy ID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgV2ViSW5z cGVjdG9yLnNob3dOZXdUYWJUYWIoc2hvdWxkQW5pbWF0ZSk7CiAgICAgfQogCi0gICAgX2hhbmRs ZU5ld1RhYkNvbnRleHRNZW51KGV2ZW50KQotICAgIHsKLSAgICAgICAgbGV0IGNvbnRleHRNZW51 ID0gV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LmNyZWF0ZUZyb21FdmVudChldmVudCk7Ci0KLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRhYkJhci5F dmVudC5OZXdUYWJDb250ZXh0TWVudSwge2NvbnRleHRNZW51fSk7Ci0gICAgfQotCiAgICAgX2hh bmRsZU5ld1RhYk1vdXNlRW50ZXIoZXZlbnQpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3Rh YkFuaW1hdGVkQ2xvc2VkU2luY2VNb3VzZUVudGVyIHx8ICF0aGlzLmVsZW1lbnQuY2xhc3NMaXN0 LmNvbnRhaW5zKCJzdGF0aWMtbGF5b3V0IikgfHwgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5jb250 YWlucygiYW5pbWF0aW5nIikpCkBAIC03NTAsNiArNzQ0LDUgQEAgV2ViSW5zcGVjdG9yLlRhYkJh ci5FdmVudCA9IHsKICAgICBUYWJCYXJJdGVtQWRkZWQ6ICJ0YWItYmFyLXRhYi1iYXItaXRlbS1h ZGRlZCIsCiAgICAgVGFiQmFySXRlbVJlbW92ZWQ6ICJ0YWItYmFyLXRhYi1iYXItaXRlbS1yZW1v dmVkIiwKICAgICBUYWJCYXJJdGVtc1Jlb3JkZXJlZDogInRhYi1iYXItdGFiLWJhci1pdGVtcy1y ZW9yZGVyZWQiLAotICAgIE5ld1RhYkNvbnRleHRNZW51OiAidGFiLWJhci1uZXctdGFiLWNvbnRl eHRtZW51IiwKICAgICBPcGVuRGVmYXVsdFRhYjogInRhYi1iYXItb3Blbi1kZWZhdWx0LXRhYiIK IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UYWJCcm93c2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGFiQnJvd3Nlci5qcwppbmRleCA3NDUwNzM3Li41MTIxOTNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMK QEAgLTc0LDcgKzc0LDcgQEAgV2ViSW5zcGVjdG9yLlRhYkJyb3dzZXIgPSBjbGFzcyBUYWJCcm93 c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhpcy5fdGFiQmFyLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRhYkJhci5FdmVudC5UYWJCYXJJdGVtU2VsZWN0ZWQs IHRoaXMuX3RhYkJhckl0ZW1TZWxlY3RlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3RhYkJhci5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UYWJCYXIuRXZlbnQuVGFiQmFySXRlbUFkZGVk LCB0aGlzLl90YWJCYXJJdGVtQWRkZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl90YWJCYXIuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGFiQmFyLkV2ZW50LlRhYkJhckl0ZW1SZW1vdmVk LCB0aGlzLl90YWJCYXJJdGVtUmVtb3ZlZCwgdGhpcyk7Ci0gICAgICAgIHRoaXMuX3RhYkJhci5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UYWJCYXIuRXZlbnQuTmV3VGFiQ29udGV4dE1l bnUsIHRoaXMuX2hhbmRsZU5ld1RhYkNvbnRleHRNZW51LCB0aGlzKTsKKyAgICAgICAgdGhpcy5f dGFiQmFyLm5ld1RhYlRhYkJhckl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUGlu bmVkVGFiQmFySXRlbS5FdmVudC5Db250ZXh0TWVudSwgdGhpcy5faGFuZGxlTmV3VGFiQ29udGV4 dE1lbnUsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuX3JlY2VudFRhYkNvbnRlbnRWaWV3cyA9IFtd OwogICAgICAgICB0aGlzLl9jbG9zZWRUYWJDbGFzc2VzID0gbmV3IFNldDsK