174842 2017-07-25 16:15:03 -0700 Web Inspector: Don't output "No message" for multi-value logs like console.log(x, y) 2017-07-25 19:27:45 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck mattbaker oldest_to_newest 1332143 0 joepeck 2017-07-25 16:15:03 -0700 Don't output "No message" for multi-value logs like console.log(x, y) Test: console.log(100, 200) Expected: [Log] 100 – 200 Actual: [Log] No Message – 100 – 200 1332148 1 316404 joepeck 2017-07-25 16:28:09 -0700 Created attachment 316404 [PATCH] Proposed Fix 1332152 2 316405 joepeck 2017-07-25 16:32:21 -0700 Created attachment 316405 [PATCH] Proposed Fix Now that commit-queue has caught up to the rest of the world. 1332157 3 316405 mattbaker 2017-07-25 16:49:14 -0700 Comment on attachment 316405 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=316405&action=review r=me > Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js:476 > + } I know it's only in two places, but a helper might be nice: function createDivider() { let divider = document.createElement("span"); divider.textContent = ` ${enDash} `; divider.classList.add("console-message-preview-divider"); return divider; } if (needsDivider) { builderElement.appendChild(createDivider()); 1332217 4 316405 joepeck 2017-07-25 18:48:04 -0700 Comment on attachment 316405 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=316405&action=review >> Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js:476 >> + } > > I know it's only in two places, but a helper might be nice: > > function createDivider() { > let divider = document.createElement("span"); > divider.textContent = ` ${enDash} `; > divider.classList.add("console-message-preview-divider"); > return divider; > } > > if (needsDivider) { > builderElement.appendChild(createDivider()); This actually exposed an issue, in the case below `enclosedElement` is used later on to add the "inline-lossless" class if it is needed. I extracted this out into an: `appendDividerIfNeeded` method which then makes it easy to correct the code below as well. 1332218 5 316417 joepeck 2017-07-25 18:48:47 -0700 Created attachment 316417 [PATCH] For Landing 1332229 6 316417 commit-queue 2017-07-25 19:27:11 -0700 Comment on attachment 316417 [PATCH] For Landing Clearing flags on attachment: 316417 Committed r219900: <http://trac.webkit.org/changeset/219900> 316404 2017-07-25 16:28:09 -0700 2017-07-25 16:32:21 -0700 [PATCH] Proposed Fix no-message-1.patch text/plain 6122 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ1OGI3OWI1Nzk2Li4wYjEyYjUyODFhMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTctMDctMjUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBEb24ndCBvdXRwdXQgIk5vIG1lc3NhZ2UiIGZvciBtdWx0aS12YWx1ZSBsb2dzIGxpa2UgY29u c29sZS5sb2coeCwgeSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NDg0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAg ICAgICBSZW1vdmVkICJObyBtZXNzYWdlIi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlVmlldy5wcm90b3R5cGUuX2FwcGVuZEZvcm1hdHRlZEFyZ3VtZW50cyk6CisgICAgICAg IFRyYWNrIHdoZXRoZXIgb3Igbm90IG91dHB1dHRpbmcgdGhlIG5leHQgcGFyYW1ldGVyIHdpbGwg bmVlZCBhIGRpdmlkZXIKKyAgICAgICAgaW4gZnJvbnQgb2YgaXQgb3Igbm90LgorCisyMDE3LTA3 LTI1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogRml4IHdhcm5pbmdzIGFib3V0IGNvbnNvbGUuYXNzZXJ0IGxpbmVzIHdpdGhv dXQgc2VtaWNvbG9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc0ODQwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGE3OGM3 YjdmZTJkLi4xOGQzOGIxOWY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC01ODUsNyArNTg1LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siTm8gUmVzdWx0cyBGb3VuZCJdID0g Ik5vIFJlc3VsdHMgRm91bmQiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gU2VhcmNoIFJlc3VsdHMi XSA9ICJObyBTZWFyY2ggUmVzdWx0cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBXYXRjaCBFeHBy ZXNzaW9ucyJdID0gIk5vIFdhdGNoIEV4cHJlc3Npb25zIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5v IG1hdGNoaW5nIEFSSUEgcm9sZSJdID0gIk5vIG1hdGNoaW5nIEFSSUEgcm9sZSI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJObyBtZXNzYWdlIl0gPSAiTm8gbWVzc2FnZSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJObyBwcmV2aWV3IGF2YWlsYWJsZSJdID0gIk5vIHByZXZpZXcgYXZhaWxhYmxlIjsKIGxvY2Fs aXplZFN0cmluZ3NbIk5vZGUiXSA9ICJOb2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vZGUgUmVt b3ZlZCJdID0gIk5vZGUgUmVtb3ZlZCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKaW5k ZXggNGYxMDE5ZTE4ODAuLjkzMWNhYTgyNmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3 LmpzCkBAIC00NDQsMTQgKzQ0NCwxNCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3 ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAg ICBpZiAoc2hvdWxkRm9ybWF0V2l0aFN0cmluZ1N1YnN0aXR1dGlvbiAmJiB0aGlzLl9pc1N0YWNr VHJhY2UocGFyYW1ldGVyc1swXSkpCiAgICAgICAgICAgICBzaG91bGRGb3JtYXRXaXRoU3RyaW5n U3Vic3RpdHV0aW9uID0gZmFsc2U7CiAKLSAgICAgICAgLy8gRm9ybWF0IHN0cmluZyAvIG1lc3Nh Z2UgLyBkZWZhdWx0IG1lc3NhZ2UuCisgICAgICAgIGxldCBuZWVkc0RpdmlkZXIgPSBmYWxzZTsK KworICAgICAgICAvLyBGb3JtYXQgc3RyaW5nLgogICAgICAgICBpZiAoc2hvdWxkRm9ybWF0V2l0 aFN0cmluZ1N1YnN0aXR1dGlvbikgewogICAgICAgICAgICAgbGV0IHJlc3VsdCA9IHRoaXMuX2Zv cm1hdFdpdGhTdWJzdGl0dXRpb25TdHJpbmcocGFyYW1ldGVycywgYnVpbGRlckVsZW1lbnQpOwog ICAgICAgICAgICAgcGFyYW1ldGVycyA9IHJlc3VsdC51bnVzZWRTdWJzdGl0dXRpb25zOwogICAg ICAgICAgICAgdGhpcy5fZXh0cmFQYXJhbWV0ZXJzID0gcGFyYW1ldGVyczsKLSAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgIGxldCBkZWZhdWx0TWVzc2FnZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiTm8gbWVzc2FnZSIpOwotICAgICAgICAgICAgYnVpbGRlckVsZW1lbnQuYXBwZW5kKGRl ZmF1bHRNZXNzYWdlKTsKKyAgICAgICAgICAgIG5lZWRzRGl2aWRlciA9IHRydWU7CiAgICAgICAg IH0KIAogICAgICAgICAvLyBUcmFpbGluZyBpbmxpbmUgcGFyYW1ldGVycy4KQEAgLTQ2OSw5ICs0 NjksMTEgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmlldyA9IGNsYXNzIENvbnNvbGVN ZXNzYWdlVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAgICAgICAgICAgICAgICB0aGlzLl9l eHRyYVBhcmFtZXRlcnMgPSBwYXJhbWV0ZXJzOwogCiAgICAgICAgICAgICAgICAgZm9yIChsZXQg cGFyYW1ldGVyIG9mIHNpbXBsZVBhcmFtZXRlcnMpIHsKLSAgICAgICAgICAgICAgICAgICAgbGV0 IGVuY2xvc2VkRWxlbWVudCA9IGJ1aWxkZXJFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInNwYW4iKSk7Ci0gICAgICAgICAgICAgICAgICAgIGVuY2xvc2VkRWxlbWVu dC5jbGFzc0xpc3QuYWRkKCJjb25zb2xlLW1lc3NhZ2UtcHJldmlldy1kaXZpZGVyIiwgImlubGlu ZS1sb3NzbGVzcyIpOwotICAgICAgICAgICAgICAgICAgICBlbmNsb3NlZEVsZW1lbnQudGV4dENv bnRlbnQgPSBgICR7ZW5EYXNofSBgOworICAgICAgICAgICAgICAgICAgICBpZiAobmVlZHNEaXZp ZGVyKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBsZXQgZW5jbG9zZWRFbGVtZW50ID0gYnVp bGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGVuY2xvc2VkRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJj b25zb2xlLW1lc3NhZ2UtcHJldmlldy1kaXZpZGVyIiwgImlubGluZS1sb3NzbGVzcyIpOworICAg ICAgICAgICAgICAgICAgICAgICAgZW5jbG9zZWRFbGVtZW50LnRleHRDb250ZW50ID0gYCAke2Vu RGFzaH0gYDsKKyAgICAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgICAgIGxl dCBwcmV2aWV3Q29udGFpbmVyID0gYnVpbGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpKTsKICAgICAgICAgICAgICAgICAgICAgcHJldmlld0NvbnRh aW5lci5jbGFzc0xpc3QuYWRkKCJpbmxpbmUtbG9zc2xlc3MiKTsKQEAgLTQ4NSw2ICs0ODcsOCBA QCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VW aWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAgICAgICAgICAgICAgICBsZXQgcHJldmll d0VsZW1lbnQgPSBpc1ByZXZpZXdWaWV3ID8gcHJldmlldy5lbGVtZW50IDogcHJldmlldzsKICAg ICAgICAgICAgICAgICAgICAgcHJldmlld0NvbnRhaW5lci5hcHBlbmRDaGlsZChwcmV2aWV3RWxl bWVudCk7CiAKKyAgICAgICAgICAgICAgICAgICAgbmVlZHNEaXZpZGVyID0gdHJ1ZTsKKwogICAg ICAgICAgICAgICAgICAgICAvLyBTaW1wbGUgZGlzcGxheWFibGUgcGFyYW1ldGVycyBzaG91bGQg cHJldHR5IG11Y2ggYWx3YXlzIGJlIGxvc3NsZXNzLgogICAgICAgICAgICAgICAgICAgICAvLyBB biBleGNlcHRpb24gbWlnaHQgYmUgYSB0cnVuY2F0ZWQgc3RyaW5nLgogICAgICAgICAgICAgICAg ICAgICBjb25zb2xlLmFzc2VydCgoaXNQcmV2aWV3VmlldyAmJiBwcmV2aWV3Lmxvc3NsZXNzKSB8 fCAoIWlzUHJldmlld1ZpZXcgJiYgdGhpcy5fc2hvdWxkQ29uc2lkZXJPYmplY3RMb3NzbGVzcyhw YXJhbWV0ZXIpKSk7CkBAIC00OTUsOSArNDk5LDExIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZVZpZXcgPSBjbGFzcyBDb25zb2xlTWVzc2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu CiAgICAgICAgICAgICBpZiAocGFyYW1ldGVycy5sZW5ndGggPT09IDEgJiYgIXRoaXMuX2lzU3Rh Y2tUcmFjZShwYXJhbWV0ZXJzWzBdKSkgewogICAgICAgICAgICAgICAgIGxldCBwYXJhbWV0ZXIg PSBwYXJhbWV0ZXJzWzBdOwogCi0gICAgICAgICAgICAgICAgbGV0IGVuY2xvc2VkRWxlbWVudCA9 IGJ1aWxkZXJFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4i KSk7Ci0gICAgICAgICAgICAgICAgZW5jbG9zZWRFbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbnNv bGUtbWVzc2FnZS1wcmV2aWV3LWRpdmlkZXIiKTsKLSAgICAgICAgICAgICAgICBlbmNsb3NlZEVs ZW1lbnQudGV4dENvbnRlbnQgPSBgICR7ZW5EYXNofSBgOworICAgICAgICAgICAgICAgIGlmIChu ZWVkc0RpdmlkZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGVuY2xvc2VkRWxlbWVudCA9 IGJ1aWxkZXJFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4i KSk7CisgICAgICAgICAgICAgICAgICAgIGVuY2xvc2VkRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJj b25zb2xlLW1lc3NhZ2UtcHJldmlldy1kaXZpZGVyIik7CisgICAgICAgICAgICAgICAgICAgIGVu Y2xvc2VkRWxlbWVudC50ZXh0Q29udGVudCA9IGAgJHtlbkRhc2h9IGA7CisgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgbGV0IHByZXZpZXdDb250YWluZXIgPSBidWlsZGVyRWxl bWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpOwogICAgICAg ICAgICAgICAgIHByZXZpZXdDb250YWluZXIuY2xhc3NMaXN0LmFkZCgiY29uc29sZS1tZXNzYWdl LXByZXZpZXciKTsKQEAgLTUxMSw2ICs1MTcsOCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgog ICAgICAgICAgICAgICAgIGxldCBwcmV2aWV3RWxlbWVudCA9IGlzUHJldmlld1ZpZXcgPyBwcmV2 aWV3LmVsZW1lbnQgOiBwcmV2aWV3OwogICAgICAgICAgICAgICAgIHByZXZpZXdDb250YWluZXIu YXBwZW5kQ2hpbGQocHJldmlld0VsZW1lbnQpOwogCisgICAgICAgICAgICAgICAgbmVlZHNEaXZp ZGVyID0gdHJ1ZTsKKwogICAgICAgICAgICAgICAgIC8vIElmIHRoaXMgcHJldmlldyBpcyBlZmZl Y3RpdmVseSBsb3NzbGVzcywgd2UgY2FuIGF2b2lkIG1ha2luZyB0aGlzIGNvbnNvbGUgbWVzc2Fn ZSBleHBhbmRhYmxlLgogICAgICAgICAgICAgICAgIGlmICgoaXNQcmV2aWV3VmlldyAmJiBwcmV2 aWV3Lmxvc3NsZXNzKSB8fCAoIWlzUHJldmlld1ZpZXcgJiYgdGhpcy5fc2hvdWxkQ29uc2lkZXJP YmplY3RMb3NzbGVzcyhwYXJhbWV0ZXIpKSkgewogICAgICAgICAgICAgICAgICAgICB0aGlzLl9l eHRyYVBhcmFtZXRlcnMgPSBudWxsOwo= 316405 2017-07-25 16:32:21 -0700 2017-07-25 18:48:04 -0700 [PATCH] Proposed Fix no-message-1.patch text/plain 6122 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ1OGI3OWI1Nzk2Li4wYjEyYjUyODFhMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTctMDctMjUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBEb24ndCBvdXRwdXQgIk5vIG1lc3NhZ2UiIGZvciBtdWx0aS12YWx1ZSBsb2dzIGxpa2UgY29u c29sZS5sb2coeCwgeSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NDg0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAg ICAgICBSZW1vdmVkICJObyBtZXNzYWdlIi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlVmlldy5wcm90b3R5cGUuX2FwcGVuZEZvcm1hdHRlZEFyZ3VtZW50cyk6CisgICAgICAg IFRyYWNrIHdoZXRoZXIgb3Igbm90IG91dHB1dHRpbmcgdGhlIG5leHQgcGFyYW1ldGVyIHdpbGwg bmVlZCBhIGRpdmlkZXIKKyAgICAgICAgaW4gZnJvbnQgb2YgaXQgb3Igbm90LgorCisyMDE3LTA3 LTI1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogRml4IHdhcm5pbmdzIGFib3V0IGNvbnNvbGUuYXNzZXJ0IGxpbmVzIHdpdGhv dXQgc2VtaWNvbG9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc0ODQwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGE3OGM3 YjdmZTJkLi4xOGQzOGIxOWY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC01ODUsNyArNTg1LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siTm8gUmVzdWx0cyBGb3VuZCJdID0g Ik5vIFJlc3VsdHMgRm91bmQiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gU2VhcmNoIFJlc3VsdHMi XSA9ICJObyBTZWFyY2ggUmVzdWx0cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBXYXRjaCBFeHBy ZXNzaW9ucyJdID0gIk5vIFdhdGNoIEV4cHJlc3Npb25zIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5v IG1hdGNoaW5nIEFSSUEgcm9sZSJdID0gIk5vIG1hdGNoaW5nIEFSSUEgcm9sZSI7Ci1sb2NhbGl6 ZWRTdHJpbmdzWyJObyBtZXNzYWdlIl0gPSAiTm8gbWVzc2FnZSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJObyBwcmV2aWV3IGF2YWlsYWJsZSJdID0gIk5vIHByZXZpZXcgYXZhaWxhYmxlIjsKIGxvY2Fs aXplZFN0cmluZ3NbIk5vZGUiXSA9ICJOb2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vZGUgUmVt b3ZlZCJdID0gIk5vZGUgUmVtb3ZlZCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKaW5k ZXggNGYxMDE5ZTE4ODAuLjkzMWNhYTgyNmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3 LmpzCkBAIC00NDQsMTQgKzQ0NCwxNCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3 ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAg ICBpZiAoc2hvdWxkRm9ybWF0V2l0aFN0cmluZ1N1YnN0aXR1dGlvbiAmJiB0aGlzLl9pc1N0YWNr VHJhY2UocGFyYW1ldGVyc1swXSkpCiAgICAgICAgICAgICBzaG91bGRGb3JtYXRXaXRoU3RyaW5n U3Vic3RpdHV0aW9uID0gZmFsc2U7CiAKLSAgICAgICAgLy8gRm9ybWF0IHN0cmluZyAvIG1lc3Nh Z2UgLyBkZWZhdWx0IG1lc3NhZ2UuCisgICAgICAgIGxldCBuZWVkc0RpdmlkZXIgPSBmYWxzZTsK KworICAgICAgICAvLyBGb3JtYXQgc3RyaW5nLgogICAgICAgICBpZiAoc2hvdWxkRm9ybWF0V2l0 aFN0cmluZ1N1YnN0aXR1dGlvbikgewogICAgICAgICAgICAgbGV0IHJlc3VsdCA9IHRoaXMuX2Zv cm1hdFdpdGhTdWJzdGl0dXRpb25TdHJpbmcocGFyYW1ldGVycywgYnVpbGRlckVsZW1lbnQpOwog ICAgICAgICAgICAgcGFyYW1ldGVycyA9IHJlc3VsdC51bnVzZWRTdWJzdGl0dXRpb25zOwogICAg ICAgICAgICAgdGhpcy5fZXh0cmFQYXJhbWV0ZXJzID0gcGFyYW1ldGVyczsKLSAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgIGxldCBkZWZhdWx0TWVzc2FnZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiTm8gbWVzc2FnZSIpOwotICAgICAgICAgICAgYnVpbGRlckVsZW1lbnQuYXBwZW5kKGRl ZmF1bHRNZXNzYWdlKTsKKyAgICAgICAgICAgIG5lZWRzRGl2aWRlciA9IHRydWU7CiAgICAgICAg IH0KIAogICAgICAgICAvLyBUcmFpbGluZyBpbmxpbmUgcGFyYW1ldGVycy4KQEAgLTQ2OSw5ICs0 NjksMTEgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmlldyA9IGNsYXNzIENvbnNvbGVN ZXNzYWdlVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAgICAgICAgICAgICAgICB0aGlzLl9l eHRyYVBhcmFtZXRlcnMgPSBwYXJhbWV0ZXJzOwogCiAgICAgICAgICAgICAgICAgZm9yIChsZXQg cGFyYW1ldGVyIG9mIHNpbXBsZVBhcmFtZXRlcnMpIHsKLSAgICAgICAgICAgICAgICAgICAgbGV0 IGVuY2xvc2VkRWxlbWVudCA9IGJ1aWxkZXJFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInNwYW4iKSk7Ci0gICAgICAgICAgICAgICAgICAgIGVuY2xvc2VkRWxlbWVu dC5jbGFzc0xpc3QuYWRkKCJjb25zb2xlLW1lc3NhZ2UtcHJldmlldy1kaXZpZGVyIiwgImlubGlu ZS1sb3NzbGVzcyIpOwotICAgICAgICAgICAgICAgICAgICBlbmNsb3NlZEVsZW1lbnQudGV4dENv bnRlbnQgPSBgICR7ZW5EYXNofSBgOworICAgICAgICAgICAgICAgICAgICBpZiAobmVlZHNEaXZp ZGVyKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBsZXQgZW5jbG9zZWRFbGVtZW50ID0gYnVp bGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGVuY2xvc2VkRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJj b25zb2xlLW1lc3NhZ2UtcHJldmlldy1kaXZpZGVyIiwgImlubGluZS1sb3NzbGVzcyIpOworICAg ICAgICAgICAgICAgICAgICAgICAgZW5jbG9zZWRFbGVtZW50LnRleHRDb250ZW50ID0gYCAke2Vu RGFzaH0gYDsKKyAgICAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgICAgIGxl dCBwcmV2aWV3Q29udGFpbmVyID0gYnVpbGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpKTsKICAgICAgICAgICAgICAgICAgICAgcHJldmlld0NvbnRh aW5lci5jbGFzc0xpc3QuYWRkKCJpbmxpbmUtbG9zc2xlc3MiKTsKQEAgLTQ4NSw2ICs0ODcsOCBA QCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VW aWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAgICAgICAgICAgICAgICBsZXQgcHJldmll d0VsZW1lbnQgPSBpc1ByZXZpZXdWaWV3ID8gcHJldmlldy5lbGVtZW50IDogcHJldmlldzsKICAg ICAgICAgICAgICAgICAgICAgcHJldmlld0NvbnRhaW5lci5hcHBlbmRDaGlsZChwcmV2aWV3RWxl bWVudCk7CiAKKyAgICAgICAgICAgICAgICAgICAgbmVlZHNEaXZpZGVyID0gdHJ1ZTsKKwogICAg ICAgICAgICAgICAgICAgICAvLyBTaW1wbGUgZGlzcGxheWFibGUgcGFyYW1ldGVycyBzaG91bGQg cHJldHR5IG11Y2ggYWx3YXlzIGJlIGxvc3NsZXNzLgogICAgICAgICAgICAgICAgICAgICAvLyBB biBleGNlcHRpb24gbWlnaHQgYmUgYSB0cnVuY2F0ZWQgc3RyaW5nLgogICAgICAgICAgICAgICAg ICAgICBjb25zb2xlLmFzc2VydCgoaXNQcmV2aWV3VmlldyAmJiBwcmV2aWV3Lmxvc3NsZXNzKSB8 fCAoIWlzUHJldmlld1ZpZXcgJiYgdGhpcy5fc2hvdWxkQ29uc2lkZXJPYmplY3RMb3NzbGVzcyhw YXJhbWV0ZXIpKSk7CkBAIC00OTUsOSArNDk5LDExIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVz c2FnZVZpZXcgPSBjbGFzcyBDb25zb2xlTWVzc2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu CiAgICAgICAgICAgICBpZiAocGFyYW1ldGVycy5sZW5ndGggPT09IDEgJiYgIXRoaXMuX2lzU3Rh Y2tUcmFjZShwYXJhbWV0ZXJzWzBdKSkgewogICAgICAgICAgICAgICAgIGxldCBwYXJhbWV0ZXIg PSBwYXJhbWV0ZXJzWzBdOwogCi0gICAgICAgICAgICAgICAgbGV0IGVuY2xvc2VkRWxlbWVudCA9 IGJ1aWxkZXJFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4i KSk7Ci0gICAgICAgICAgICAgICAgZW5jbG9zZWRFbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbnNv bGUtbWVzc2FnZS1wcmV2aWV3LWRpdmlkZXIiKTsKLSAgICAgICAgICAgICAgICBlbmNsb3NlZEVs ZW1lbnQudGV4dENvbnRlbnQgPSBgICR7ZW5EYXNofSBgOworICAgICAgICAgICAgICAgIGlmIChu ZWVkc0RpdmlkZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGVuY2xvc2VkRWxlbWVudCA9 IGJ1aWxkZXJFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4i KSk7CisgICAgICAgICAgICAgICAgICAgIGVuY2xvc2VkRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJj b25zb2xlLW1lc3NhZ2UtcHJldmlldy1kaXZpZGVyIik7CisgICAgICAgICAgICAgICAgICAgIGVu Y2xvc2VkRWxlbWVudC50ZXh0Q29udGVudCA9IGAgJHtlbkRhc2h9IGA7CisgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgbGV0IHByZXZpZXdDb250YWluZXIgPSBidWlsZGVyRWxl bWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpOwogICAgICAg ICAgICAgICAgIHByZXZpZXdDb250YWluZXIuY2xhc3NMaXN0LmFkZCgiY29uc29sZS1tZXNzYWdl LXByZXZpZXciKTsKQEAgLTUxMSw2ICs1MTcsOCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgog ICAgICAgICAgICAgICAgIGxldCBwcmV2aWV3RWxlbWVudCA9IGlzUHJldmlld1ZpZXcgPyBwcmV2 aWV3LmVsZW1lbnQgOiBwcmV2aWV3OwogICAgICAgICAgICAgICAgIHByZXZpZXdDb250YWluZXIu YXBwZW5kQ2hpbGQocHJldmlld0VsZW1lbnQpOwogCisgICAgICAgICAgICAgICAgbmVlZHNEaXZp ZGVyID0gdHJ1ZTsKKwogICAgICAgICAgICAgICAgIC8vIElmIHRoaXMgcHJldmlldyBpcyBlZmZl Y3RpdmVseSBsb3NzbGVzcywgd2UgY2FuIGF2b2lkIG1ha2luZyB0aGlzIGNvbnNvbGUgbWVzc2Fn ZSBleHBhbmRhYmxlLgogICAgICAgICAgICAgICAgIGlmICgoaXNQcmV2aWV3VmlldyAmJiBwcmV2 aWV3Lmxvc3NsZXNzKSB8fCAoIWlzUHJldmlld1ZpZXcgJiYgdGhpcy5fc2hvdWxkQ29uc2lkZXJP YmplY3RMb3NzbGVzcyhwYXJhbWV0ZXIpKSkgewogICAgICAgICAgICAgICAgICAgICB0aGlzLl9l eHRyYVBhcmFtZXRlcnMgPSBudWxsOwo= 316417 2017-07-25 18:48:47 -0700 2017-07-25 19:27:11 -0700 [PATCH] For Landing for-landing-1.patch text/plain 6376 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ1OGI3OWI1Nzk2Li44YWFlOTUyMzI0OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTctMDctMjUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBEb24ndCBvdXRwdXQgIk5vIG1lc3NhZ2UiIGZvciBtdWx0aS12YWx1ZSBsb2dzIGxpa2UgY29u c29sZS5sb2coeCwgeSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NDg0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE1hdHQgQmFrZXIuCisKKyAgICAg ICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAg IFJlbW92ZWQgIk5vIG1lc3NhZ2UiLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9D b25zb2xlTWVzc2FnZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3Nh Z2VWaWV3LnByb3RvdHlwZS5fYXBwZW5kRm9ybWF0dGVkQXJndW1lbnRzKToKKyAgICAgICAgVHJh Y2sgd2hldGhlciBvciBub3Qgb3V0cHV0dGluZyB0aGUgbmV4dCBwYXJhbWV0ZXIgd2lsbCBuZWVk IGEgZGl2aWRlcgorICAgICAgICBpbiBmcm9udCBvZiBpdCBvciBub3QuCisKKzIwMTctMDctMjUg IEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5z cGVjdG9yOiBGaXggd2FybmluZ3MgYWJvdXQgY29uc29sZS5hc3NlcnQgbGluZXMgd2l0aG91dCBz ZW1pY29sb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzQ4NDAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYTc4YzdiN2Zl MmQuLjE4ZDM4YjE5ZjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTU4 NSw3ICs1ODUsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJObyBSZXN1bHRzIEZvdW5kIl0gPSAiTm8g UmVzdWx0cyBGb3VuZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBTZWFyY2ggUmVzdWx0cyJdID0g Ik5vIFNlYXJjaCBSZXN1bHRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIFdhdGNoIEV4cHJlc3Np b25zIl0gPSAiTm8gV2F0Y2ggRXhwcmVzc2lvbnMiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gbWF0 Y2hpbmcgQVJJQSByb2xlIl0gPSAiTm8gbWF0Y2hpbmcgQVJJQSByb2xlIjsKLWxvY2FsaXplZFN0 cmluZ3NbIk5vIG1lc3NhZ2UiXSA9ICJObyBtZXNzYWdlIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5v IHByZXZpZXcgYXZhaWxhYmxlIl0gPSAiTm8gcHJldmlldyBhdmFpbGFibGUiOwogbG9jYWxpemVk U3RyaW5nc1siTm9kZSJdID0gIk5vZGUiOwogbG9jYWxpemVkU3RyaW5nc1siTm9kZSBSZW1vdmVk Il0gPSAiTm9kZSBSZW1vdmVkIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcwppbmRleCA0 ZjEwMTllMTg4MC4uNGJiZTUyYjM4ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMK QEAgLTQ0NCwxNCArNDQ0LDIyIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcgPSBj bGFzcyBDb25zb2xlTWVzc2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgIGlm IChzaG91bGRGb3JtYXRXaXRoU3RyaW5nU3Vic3RpdHV0aW9uICYmIHRoaXMuX2lzU3RhY2tUcmFj ZShwYXJhbWV0ZXJzWzBdKSkKICAgICAgICAgICAgIHNob3VsZEZvcm1hdFdpdGhTdHJpbmdTdWJz dGl0dXRpb24gPSBmYWxzZTsKIAotICAgICAgICAvLyBGb3JtYXQgc3RyaW5nIC8gbWVzc2FnZSAv IGRlZmF1bHQgbWVzc2FnZS4KKyAgICAgICAgbGV0IG5lZWRzRGl2aWRlciA9IGZhbHNlOworICAg ICAgICBmdW5jdGlvbiBhcHBlbmREaXZpZGVySWZOZWVkZWQoKSB7CisgICAgICAgICAgICBpZiAo IW5lZWRzRGl2aWRlcikKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgICAg IGxldCBlbGVtZW50ID0gYnVpbGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgic3BhbiIpKTsKKyAgICAgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29u c29sZS1tZXNzYWdlLXByZXZpZXctZGl2aWRlciIpOworICAgICAgICAgICAgZWxlbWVudC50ZXh0 Q29udGVudCA9IGAgJHtlbkRhc2h9IGA7CisgICAgICAgICAgICByZXR1cm4gZWxlbWVudDsKKyAg ICAgICAgfQorCisgICAgICAgIC8vIEZvcm1hdCBzdHJpbmcuCiAgICAgICAgIGlmIChzaG91bGRG b3JtYXRXaXRoU3RyaW5nU3Vic3RpdHV0aW9uKSB7CiAgICAgICAgICAgICBsZXQgcmVzdWx0ID0g dGhpcy5fZm9ybWF0V2l0aFN1YnN0aXR1dGlvblN0cmluZyhwYXJhbWV0ZXJzLCBidWlsZGVyRWxl bWVudCk7CiAgICAgICAgICAgICBwYXJhbWV0ZXJzID0gcmVzdWx0LnVudXNlZFN1YnN0aXR1dGlv bnM7CiAgICAgICAgICAgICB0aGlzLl9leHRyYVBhcmFtZXRlcnMgPSBwYXJhbWV0ZXJzOwotICAg ICAgICB9IGVsc2UgewotICAgICAgICAgICAgbGV0IGRlZmF1bHRNZXNzYWdlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJObyBtZXNzYWdlIik7Ci0gICAgICAgICAgICBidWlsZGVyRWxlbWVudC5h cHBlbmQoZGVmYXVsdE1lc3NhZ2UpOworICAgICAgICAgICAgbmVlZHNEaXZpZGVyID0gdHJ1ZTsK ICAgICAgICAgfQogCiAgICAgICAgIC8vIFRyYWlsaW5nIGlubGluZSBwYXJhbWV0ZXJzLgpAQCAt NDY5LDkgKzQ3Nyw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcgPSBjbGFzcyBD b25zb2xlTWVzc2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgICAgICAgICAg dGhpcy5fZXh0cmFQYXJhbWV0ZXJzID0gcGFyYW1ldGVyczsKIAogICAgICAgICAgICAgICAgIGZv ciAobGV0IHBhcmFtZXRlciBvZiBzaW1wbGVQYXJhbWV0ZXJzKSB7Ci0gICAgICAgICAgICAgICAg ICAgIGxldCBlbmNsb3NlZEVsZW1lbnQgPSBidWlsZGVyRWxlbWVudC5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpOwotICAgICAgICAgICAgICAgICAgICBlbmNsb3Nl ZEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29uc29sZS1tZXNzYWdlLXByZXZpZXctZGl2aWRlciIs ICJpbmxpbmUtbG9zc2xlc3MiKTsKLSAgICAgICAgICAgICAgICAgICAgZW5jbG9zZWRFbGVtZW50 LnRleHRDb250ZW50ID0gYCAke2VuRGFzaH0gYDsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGRp dmlkZXJFbGVtZW50ID0gYXBwZW5kRGl2aWRlcklmTmVlZGVkKCk7CisgICAgICAgICAgICAgICAg ICAgIGlmIChkaXZpZGVyRWxlbWVudCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGRpdmlkZXJF bGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGluZS1sb3NzbGVzcyIpOwogCiAgICAgICAgICAgICAg ICAgICAgIGxldCBwcmV2aWV3Q29udGFpbmVyID0gYnVpbGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpKTsKICAgICAgICAgICAgICAgICAgICAgcHJl dmlld0NvbnRhaW5lci5jbGFzc0xpc3QuYWRkKCJpbmxpbmUtbG9zc2xlc3MiKTsKQEAgLTQ4NSw2 ICs0OTMsOCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29s ZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAgICAgICAgICAgICAgICBs ZXQgcHJldmlld0VsZW1lbnQgPSBpc1ByZXZpZXdWaWV3ID8gcHJldmlldy5lbGVtZW50IDogcHJl dmlldzsKICAgICAgICAgICAgICAgICAgICAgcHJldmlld0NvbnRhaW5lci5hcHBlbmRDaGlsZChw cmV2aWV3RWxlbWVudCk7CiAKKyAgICAgICAgICAgICAgICAgICAgbmVlZHNEaXZpZGVyID0gdHJ1 ZTsKKwogICAgICAgICAgICAgICAgICAgICAvLyBTaW1wbGUgZGlzcGxheWFibGUgcGFyYW1ldGVy cyBzaG91bGQgcHJldHR5IG11Y2ggYWx3YXlzIGJlIGxvc3NsZXNzLgogICAgICAgICAgICAgICAg ICAgICAvLyBBbiBleGNlcHRpb24gbWlnaHQgYmUgYSB0cnVuY2F0ZWQgc3RyaW5nLgogICAgICAg ICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCgoaXNQcmV2aWV3VmlldyAmJiBwcmV2aWV3Lmxv c3NsZXNzKSB8fCAoIWlzUHJldmlld1ZpZXcgJiYgdGhpcy5fc2hvdWxkQ29uc2lkZXJPYmplY3RM b3NzbGVzcyhwYXJhbWV0ZXIpKSk7CkBAIC00OTUsOSArNTA1LDcgQEAgV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlVmlldyA9IGNsYXNzIENvbnNvbGVNZXNzYWdlVmlldyBleHRlbmRzIFdlYklu c3BlY3Rvci4KICAgICAgICAgICAgIGlmIChwYXJhbWV0ZXJzLmxlbmd0aCA9PT0gMSAmJiAhdGhp cy5faXNTdGFja1RyYWNlKHBhcmFtZXRlcnNbMF0pKSB7CiAgICAgICAgICAgICAgICAgbGV0IHBh cmFtZXRlciA9IHBhcmFtZXRlcnNbMF07CiAKLSAgICAgICAgICAgICAgICBsZXQgZW5jbG9zZWRF bGVtZW50ID0gYnVpbGRlckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgic3BhbiIpKTsKLSAgICAgICAgICAgICAgICBlbmNsb3NlZEVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgiY29uc29sZS1tZXNzYWdlLXByZXZpZXctZGl2aWRlciIpOwotICAgICAgICAgICAgICAgIGVu Y2xvc2VkRWxlbWVudC50ZXh0Q29udGVudCA9IGAgJHtlbkRhc2h9IGA7CisgICAgICAgICAgICAg ICAgbGV0IGRpdmlkZXJFbGVtZW50ID0gYXBwZW5kRGl2aWRlcklmTmVlZGVkKCk7CiAKICAgICAg ICAgICAgICAgICBsZXQgcHJldmlld0NvbnRhaW5lciA9IGJ1aWxkZXJFbGVtZW50LmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKSk7CiAgICAgICAgICAgICAgICAgcHJl dmlld0NvbnRhaW5lci5jbGFzc0xpc3QuYWRkKCJjb25zb2xlLW1lc3NhZ2UtcHJldmlldyIpOwpA QCAtNTExLDEwICs1MTksMTMgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmlldyA9IGNs YXNzIENvbnNvbGVNZXNzYWdlVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAgICAgICAgICAg ICAgICBsZXQgcHJldmlld0VsZW1lbnQgPSBpc1ByZXZpZXdWaWV3ID8gcHJldmlldy5lbGVtZW50 IDogcHJldmlldzsKICAgICAgICAgICAgICAgICBwcmV2aWV3Q29udGFpbmVyLmFwcGVuZENoaWxk KHByZXZpZXdFbGVtZW50KTsKIAorICAgICAgICAgICAgICAgIG5lZWRzRGl2aWRlciA9IHRydWU7 CisKICAgICAgICAgICAgICAgICAvLyBJZiB0aGlzIHByZXZpZXcgaXMgZWZmZWN0aXZlbHkgbG9z c2xlc3MsIHdlIGNhbiBhdm9pZCBtYWtpbmcgdGhpcyBjb25zb2xlIG1lc3NhZ2UgZXhwYW5kYWJs ZS4KICAgICAgICAgICAgICAgICBpZiAoKGlzUHJldmlld1ZpZXcgJiYgcHJldmlldy5sb3NzbGVz cykgfHwgKCFpc1ByZXZpZXdWaWV3ICYmIHRoaXMuX3Nob3VsZENvbnNpZGVyT2JqZWN0TG9zc2xl c3MocGFyYW1ldGVyKSkpIHsKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fZXh0cmFQYXJhbWV0 ZXJzID0gbnVsbDsKLSAgICAgICAgICAgICAgICAgICAgZW5jbG9zZWRFbGVtZW50LmNsYXNzTGlz dC5hZGQoImlubGluZS1sb3NzbGVzcyIpOworICAgICAgICAgICAgICAgICAgICBpZiAoZGl2aWRl ckVsZW1lbnQpCisgICAgICAgICAgICAgICAgICAgICAgICBkaXZpZGVyRWxlbWVudC5jbGFzc0xp c3QuYWRkKCJpbmxpbmUtbG9zc2xlc3MiKTsKICAgICAgICAgICAgICAgICAgICAgcHJldmlld0Nv bnRhaW5lci5jbGFzc0xpc3QuYWRkKCJpbmxpbmUtbG9zc2xlc3MiKTsKICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHBhcmFtZXRlcnMubGVuZ3RoKSB7Cg==