157294 2016-05-02 19:54:45 -0700 REGRESSION(r200337): Console hangs when evaluating expresisons (Requested by JoePeck on #webkit). 2016-05-02 19:58:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 155629 1 commit-queue commit-queue nvasilyev timothy oldest_to_newest 1189637 0 commit-queue 2016-05-02 19:54:45 -0700 http://trac.webkit.org/changeset/200337 broke the build: Console hangs when evaluating expresisons (Requested by JoePeck on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1189639 1 277964 commit-queue 2016-05-02 19:55:16 -0700 Created attachment 277964 ROLLOUT of r200337 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1189640 2 277964 commit-queue 2016-05-02 19:58:07 -0700 Comment on attachment 277964 ROLLOUT of r200337 Clearing flags on attachment: 277964 Committed r200359: <http://trac.webkit.org/changeset/200359> 1189641 3 commit-queue 2016-05-02 19:58:11 -0700 All reviewed patches have been landed. Closing bug. 277964 2016-05-02 19:55:16 -0700 2016-05-02 19:58:07 -0700 ROLLOUT of r200337 bug-157294-20160502195553.patch text/plain 11945 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi ZDRmZmRjODUzYTcyYmUxMzU2NDY1M2Y0M2FjYTcxY2U1ZmVmMmM4Li5kNmMxNDVkMmRiNzY2NGY0 ZjI4MDEwN2FhOGU0ZTEwMGEwNTc4NDkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNi0wNS0wMiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIwMDMzNy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzI5NAorCisgICAg ICAgIENvbnNvbGUgaGFuZ3Mgd2hlbiBldmFsdWF0aW5nIGV4cHJlc2lzb25zIChSZXF1ZXN0ZWQg YnkKKyAgICAgICAgSm9lUGVjayBvbiAjd2Via2l0KS4KKworICAgICAgICBSZXZlcnRlZCBjaGFu Z2VzZXQ6CisKKyAgICAgICAgIldlYiBJbnNwZWN0b3I6IEFkZGluZyBhIG5ldyBjb25zb2xlIG1l c3NhZ2Ugc2hvdWxkbid0IG1vZGlmeQorICAgICAgICBET00gd2hlbiB0aGUgY29uc29sZSBsb2cg aXMgaGlkZGVuIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU1NjI5CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzIwMDMz NworCiAyMDE2LTA1LTAyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogVW5leHBlY3RlZCAiU2NyaXB0IEVsZW1lbnQgIyIgcmVz b3VyY2VzIGluIERlYnVnZ2VyIFNpZGViYXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ph dmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcwppbmRleCAxNmVkMjY5MTE3MmU5MWFhNjNkYTli ZWJkNjMyOTM2MDkxMDRmMDA3Li5iM2ViMWNmMjNmNjY0NTM2Mjg3OTY3ZDQwNTM4MDk3NzE3NDUy NzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250 cm9sbGVyLmpzCkBAIC02MCw5ICs2MCw2IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmll d0NvbnRyb2xsZXIgPSBjbGFzcyBKYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAgICAg ICAgIHRoaXMuX3Byb21wdEZpbmROZXh0S2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmll ci5Db21tYW5kT3JDb250cm9sLCAiRyIsIHRoaXMuX2hhbmRsZUZpbmROZXh0U2hvcnRjdXQuYmlu ZCh0aGlzKSwgdGhpcy5fcHJvbXB0LmVsZW1lbnQpOwogICAgICAgICB0aGlzLl9wcm9tcHRGaW5k UHJldmlvdXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRy b2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCwgIkciLCB0 aGlzLl9oYW5kbGVGaW5kUHJldmlvdXNTaG9ydGN1dC5iaW5kKHRoaXMpLCB0aGlzLl9wcm9tcHQu ZWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5fcGVuZGluZ01lc3NhZ2VzID0gW107Ci0gICAgICAg IHRoaXMuX3NjaGVkdWxlZFJlbmRlcklkZW50aWZpZXIgPSAwOwotCiAgICAgICAgIHRoaXMuc3Rh cnROZXdTZXNzaW9uKCk7CiAgICAgfQogCkBAIC0yNTUsNyArMjUyLDcgQEAgV2ViSW5zcGVjdG9y LkphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29u dHJvbGxlciBleHQKIAogICAgIF9hcHBlbmRDb25zb2xlTWVzc2FnZVZpZXcobWVzc2FnZVZpZXcs IHJlcGVhdENvdW50V2FzSW50ZXJydXB0ZWQpCiAgICAgewotICAgICAgICB0aGlzLl9wZW5kaW5n TWVzc2FnZXMucHVzaChtZXNzYWdlVmlldyk7CisgICAgICAgIHZhciB3YXNTY3JvbGxlZFRvQm90 dG9tID0gdGhpcy5pc1Njcm9sbGVkVG9Cb3R0b20oKTsKIAogICAgICAgICB0aGlzLl9jbGVhcmVk ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3JlcGVhdENvdW50V2FzSW50ZXJydXB0ZWQgPSByZXBl YXRDb3VudFdhc0ludGVycnVwdGVkIHx8IGZhbHNlOwpAQCAtMjY2LDQ1ICsyNjMsNiBAQCBXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyID0gY2xhc3MgSmF2YVNjcmlwdExv Z1ZpZXdDb250cm9sbGVyIGV4dAogICAgICAgICBpZiAobWVzc2FnZVZpZXcubWVzc2FnZSAmJiBt ZXNzYWdlVmlldy5tZXNzYWdlLnNvdXJjZSAhPT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl Lk1lc3NhZ2VTb3VyY2UuSlMpCiAgICAgICAgICAgICB0aGlzLl9sYXN0Q29tbWl0dGVkID0gIiI7 CiAKLSAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5jb25zb2xlQ29udGVudFZpZXcudmlzaWJsZSkK LSAgICAgICAgICAgIHRoaXMucmVuZGVyUGVuZGluZ01lc3NhZ2VzU29vbigpOwotICAgIH0KLQot ICAgIHJlbmRlclBlbmRpbmdNZXNzYWdlcygpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fc2No ZWR1bGVkUmVuZGVySWRlbnRpZmllcikgewotICAgICAgICAgICAgY2FuY2VsQW5pbWF0aW9uRnJh bWUodGhpcy5fc2NoZWR1bGVkUmVuZGVySWRlbnRpZmllcik7Ci0gICAgICAgICAgICB0aGlzLl9z Y2hlZHVsZWRSZW5kZXJJZGVudGlmaWVyID0gMDsKLSAgICAgICAgfQotCi0gICAgICAgIGlmICh0 aGlzLl9wZW5kaW5nTWVzc2FnZXMubGVuZ3RoID09PSAwKQotICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIGxldCBsYXN0TWVzc2FnZVZpZXcgPSB0aGlzLl9wZW5kaW5nTWVzc2FnZXMubGFz dFZhbHVlOwotICAgICAgICBsZXQgaXNDb21tYW5kVmlldyA9IGxhc3RNZXNzYWdlVmlldyBpbnN0 YW5jZW9mIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFZpZXc7Ci0gICAgICAgIGxldCBzaG91 bGRTY3JvbGxUb0JvdHRvbSA9IGlzQ29tbWFuZFZpZXcgfHwgbGFzdE1lc3NhZ2VWaWV3Lm1lc3Nh Z2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlJlc3Vs dCB8fCB0aGlzLmlzU2Nyb2xsZWRUb0JvdHRvbSgpOwotCi0gICAgICAgIGZvciAobGV0IG1lc3Nh Z2VWaWV3IG9mIHRoaXMuX3BlbmRpbmdNZXNzYWdlcykgewotICAgICAgICAgICAgbWVzc2FnZVZp ZXcucmVuZGVyKCk7Ci0gICAgICAgICAgICB0aGlzLl9kaWRSZW5kZXJDb25zb2xlTWVzc2FnZVZp ZXcobWVzc2FnZVZpZXcpOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fcGVuZGluZ01lc3Nh Z2VzID0gW107Ci0KLSAgICAgICAgaWYgKHNob3VsZFNjcm9sbFRvQm90dG9tKQotICAgICAgICAg ICAgdGhpcy5zY3JvbGxUb0JvdHRvbSgpOwotICAgIH0KLQotICAgIHJlbmRlclBlbmRpbmdNZXNz YWdlc1Nvb24oKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3NjaGVkdWxlZFJlbmRlcklkZW50 aWZpZXIpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5fc2NoZWR1bGVkUmVu ZGVySWRlbnRpZmllciA9IHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiB0aGlzLnJlbmRlclBl bmRpbmdNZXNzYWdlcygpKTsKLSAgICB9Ci0KLSAgICBfZGlkUmVuZGVyQ29uc29sZU1lc3NhZ2VW aWV3KG1lc3NhZ2VWaWV3KQotICAgIHsKICAgICAgICAgdmFyIHR5cGUgPSBtZXNzYWdlVmlldyBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFZpZXcgPyBudWxsIDogbWVzc2Fn ZVZpZXcubWVzc2FnZS50eXBlOwogICAgICAgICBpZiAodHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkVuZEdyb3VwKSB7CiAgICAgICAgICAgICB2YXIgcGFy ZW50R3JvdXAgPSB0aGlzLl9jdXJyZW50Q29uc29sZUdyb3VwLnBhcmVudEdyb3VwOwpAQCAtMzIw LDYgKzI3OCw5IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgPSBj bGFzcyBKYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAgICAgICAgICAgICAgICAgdGhp cy5fY3VycmVudENvbnNvbGVHcm91cC5hZGRNZXNzYWdlVmlldyhtZXNzYWdlVmlldyk7CiAgICAg ICAgIH0KIAorICAgICAgICBpZiAodHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl Lk1lc3NhZ2VUeXBlLlJlc3VsdCB8fCB3YXNTY3JvbGxlZFRvQm90dG9tKQorICAgICAgICAgICAg dGhpcy5zY3JvbGxUb0JvdHRvbSgpOworCiAgICAgICAgIGlmICh0aGlzLmRlbGVnYXRlICYmIHR5 cGVvZiB0aGlzLmRlbGVnYXRlLmRpZEFwcGVuZENvbnNvbGVNZXNzYWdlVmlldyA9PT0gImZ1bmN0 aW9uIikKICAgICAgICAgICAgIHRoaXMuZGVsZWdhdGUuZGlkQXBwZW5kQ29uc29sZU1lc3NhZ2VW aWV3KG1lc3NhZ2VWaWV3KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlQ29tbWFuZFZpZXcuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlQ29tbWFuZFZpZXcuanMKaW5k ZXggMzU2ZjEwZGRjYjhjNWFiODIzNTljYjBjMTIwYzVhN2QzN2JjMTEwZS4uOGY4NDMwYzliZjFi OWFiZWNjOWNjMjlkNDQ4MGY0NGRkODFlNmU5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZUNvbW1hbmRWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVDb21tYW5kVmll dy5qcwpAQCAtMzQsMTkgKzM0LDEzIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFZpZXcg PSBjbGFzcyBDb25zb2xlQ29tbWFuZFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAg IHN1cGVyKCk7CiAKICAgICAgICAgdGhpcy5fY29tbWFuZFRleHQgPSBjb21tYW5kVGV4dDsKLSAg ICAgICAgdGhpcy5fY2xhc3NOYW1lID0gY2xhc3NOYW1lIHx8ICIiOwotICAgIH0KLQotICAgIC8v IFB1YmxpYwogCi0gICAgcmVuZGVyKCkKLSAgICB7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJjb25zb2xlLXVzZXItY29tbWFuZCIpOwogICAgICAgICB0aGlzLl9lbGVtZW50 LnNldEF0dHJpYnV0ZSgiZGF0YS1sYWJlbHByZWZpeCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygi SW5wdXQ6ICIpKTsKIAotICAgICAgICBpZiAodGhpcy5fY2xhc3NOYW1lKQotICAgICAgICAgICAg dGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKHRoaXMuX2NsYXNzTmFtZSk7CisgICAgICAgIGlm IChjbGFzc05hbWUpCisgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoY2xh c3NOYW1lKTsKIAogICAgICAgICB0aGlzLl9mb3JtYXR0ZWRDb21tYW5kRWxlbWVudCA9IHRoaXMu X2VsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpKTsKICAg ICAgICAgdGhpcy5fZm9ybWF0dGVkQ29tbWFuZEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29uc29s ZS1tZXNzYWdlLXRleHQiKTsKQEAgLTU2LDYgKzUwLDggQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVD b21tYW5kVmlldyA9IGNsYXNzIENvbnNvbGVDb21tYW5kVmlldyBleHRlbmRzIFdlYkluc3BlY3Rv ci4KICAgICAgICAgdGhpcy5fZWxlbWVudC5fX2NvbW1hbmRWaWV3ID0gdGhpczsKICAgICB9CiAK KyAgICAvLyBQdWJsaWMKKwogICAgIGdldCBlbGVtZW50KCkKICAgICB7CiAgICAgICAgIHJldHVy biB0aGlzLl9lbGVtZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzCmluZGV4IGE3OTJl MmY5YTY1NzQwNGU4MTFiNDFlMThjOWU3NDRjODQ5Y2VlYmIuLjEzY2RlZDk1NTEwMTk3OTU0Zjcw ZWJiNjRlMDEzYjk3YWEyODAzZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKQEAg LTM3LDE4ICszNyw5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcgPSBjbGFzcyBD b25zb2xlTWVzc2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgIGNvbnNvbGUu YXNzZXJ0KG1lc3NhZ2UgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UpOwog CiAgICAgICAgIHRoaXMuX21lc3NhZ2UgPSBtZXNzYWdlOwotICAgICAgICB0aGlzLl9leHBhbmRh YmxlID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX3JlcGVhdENvdW50ID0gbWVzc2FnZS5fcmVwZWF0 Q291bnQgfHwgMDsKLQotICAgICAgICAvLyBUaGVzZSBhcmUgdGhlIHBhcmFtZXRlcnMgdW51c2Vk IGJ5IHRoZSBtZXNzYWdlcydzIG9wdGlvbmFsIGZvcm1hdCBzdHJpbmcuCi0gICAgICAgIC8vIEFu eSBleHRyYSBwYXJhbWV0ZXJzIHdpbGwgYmUgZGlzcGxheWVkIGFzIGNoaWxkcmVuIG9mIHRoaXMg bWVzc2FnZS4KLSAgICAgICAgdGhpcy5fZXh0cmFQYXJhbWV0ZXJzID0gbWVzc2FnZS5wYXJhbWV0 ZXJzOwotICAgIH0KIAotICAgIC8vIFB1YmxpYworICAgICAgICB0aGlzLl9leHBhbmRhYmxlID0g ZmFsc2U7CiAKLSAgICByZW5kZXIoKQotICAgIHsKICAgICAgICAgdGhpcy5fZWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNz TGlzdC5hZGQoImNvbnNvbGUtbWVzc2FnZSIpOwogCkBAIC04NSw2ICs3NiwxMCBAQCBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVu ZHMgV2ViSW5zcGVjdG9yLgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAorICAgICAg ICAvLyBUaGVzZSBhcmUgdGhlIHBhcmFtZXRlcnMgdW51c2VkIGJ5IHRoZSBtZXNzYWdlcydzIG9w dGlvbmFsIGZvcm1hdCBzdHJpbmcuCisgICAgICAgIC8vIEFueSBleHRyYSBwYXJhbWV0ZXJzIHdp bGwgYmUgZGlzcGxheWVkIGFzIGNoaWxkcmVuIG9mIHRoaXMgbWVzc2FnZS4KKyAgICAgICAgdGhp cy5fZXh0cmFQYXJhbWV0ZXJzID0gdGhpcy5fbWVzc2FnZS5wYXJhbWV0ZXJzOworCiAgICAgICAg IC8vIEZJWE1FOiBUaGUgbG9jYXRpb24gbGluayBzaG91bGQgaW5jbHVkZSBzdGFjayB0cmFjZSBp bmZvcm1hdGlvbi4KICAgICAgICAgdGhpcy5fYXBwZW5kTG9jYXRpb25MaW5rKCk7CiAKQEAgLTk3 LDkgKzkyLDExIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcgPSBjbGFzcyBDb25z b2xlTWVzc2FnZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgIHRoaXMuX2FwcGVu ZEV4dHJhUGFyYW1ldGVycygpOwogICAgICAgICB0aGlzLl9hcHBlbmRTdGFja1RyYWNlKCk7CiAK LSAgICAgICAgdGhpcy5fcmVuZGVyUmVwZWF0Q291bnQoKTsKKyAgICAgICAgdGhpcy5yZXBlYXRD b3VudCA9IHRoaXMuX21lc3NhZ2UucmVwZWF0Q291bnQ7CiAgICAgfQogCisgICAgLy8gUHVibGlj CisKICAgICBnZXQgZWxlbWVudCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZWxlbWVu dDsKQEAgLTEyNCwxNCArMTIxLDYgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmlldyA9 IGNsYXNzIENvbnNvbGVNZXNzYWdlVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KIAogICAgICAg ICB0aGlzLl9yZXBlYXRDb3VudCA9IGNvdW50OwogCi0gICAgICAgIGlmICh0aGlzLl9lbGVtZW50 KQotICAgICAgICAgICAgdGhpcy5fcmVuZGVyUmVwZWF0Q291bnQoKTsKLSAgICB9Ci0KLSAgICBf cmVuZGVyUmVwZWF0Q291bnQoKQotICAgIHsKLSAgICAgICAgbGV0IGNvdW50ID0gdGhpcy5fcmVw ZWF0Q291bnQ7Ci0KICAgICAgICAgaWYgKGNvdW50IDw9IDEpIHsKICAgICAgICAgICAgIGlmICh0 aGlzLl9yZXBlYXRDb3VudEVsZW1lbnQpIHsKICAgICAgICAgICAgICAgICB0aGlzLl9yZXBlYXRD b3VudEVsZW1lbnQucmVtb3ZlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4IGIzYzg4OTBk MWViZWNhMGQzNjI0NzdiZGQ1ZTAyNzg5OGEzMDU5OWIuLmU4YTBiMWQyNDU2ODJiZWFiMGJkMmNk ZjU0YzQ3YWQ0ZGIwOTQ5NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0xMjIsMTEgKzEy Miw2IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3 IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAgICAgICAgIHJldHVybiB0aGlzLm1lc3Nh Z2VzRWxlbWVudC5jbGFzc0xpc3QuY29udGFpbnMoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3 LlNlYXJjaEluUHJvZ3Jlc3NTdHlsZUNsYXNzTmFtZSk7CiAgICAgfQogCi0gICAgc2hvd24oKQot ICAgIHsKLSAgICAgICAgdGhpcy5fbG9nVmlld0NvbnRyb2xsZXIucmVuZGVyUGVuZGluZ01lc3Nh Z2VzKCk7Ci0gICAgfQotCiAgICAgZGlkQXBwZW5kQ29uc29sZU1lc3NhZ2VWaWV3KG1lc3NhZ2VW aWV3KQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQobWVzc2FnZVZpZXcgaW5zdGFuY2Vv ZiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VWaWV3IHx8IG1lc3NhZ2VWaWV3IGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kVmlldyk7CkBAIC0xNjAsMTQgKzE1NSw2IEBA IFdlYkluc3BlY3Rvci5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVu ZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAgICAgICAgIC8vIFdlIHdhbnQgdG8gcmVtb3ZlIGZv Y3VzYWJsZSBjaGlsZHJlbiBhZnRlciB0aG9zZSBwZW5kaW5nIGRpc3BhdGNoZXMgdG9vLgogICAg ICAgICBJbnNwZWN0b3JCYWNrZW5kLnJ1bkFmdGVyUGVuZGluZ0Rpc3BhdGNoZXModGhpcy5fY2xl YXJGb2N1c2FibGVDaGlsZHJlbi5iaW5kKHRoaXMpKTsKIAotICAgICAgICBpZiAodHlwZSAmJiB0 eXBlICE9PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuRW5kR3JvdXAp IHsKLSAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG1lc3NhZ2VWaWV3Lm1lc3NhZ2UgaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UpOwotICAgICAgICAgICAgdGhpcy5fbWFy a1Njb3BlQmFySXRlbVVucmVhZChtZXNzYWdlVmlldy5tZXNzYWdlLmxldmVsKTsKLQotICAgICAg ICAgICAgY29uc29sZS5hc3NlcnQobWVzc2FnZVZpZXcuZWxlbWVudCBpbnN0YW5jZW9mIEVsZW1l bnQpOwotICAgICAgICAgICAgdGhpcy5fZmlsdGVyTWVzc2FnZUVsZW1lbnRzKFttZXNzYWdlVmll dy5lbGVtZW50XSk7Ci0gICAgICAgIH0KLQogICAgICAgICAvLyBXZSBvbmx5IGF1dG8gc2hvdyB0 aGUgY29uc29sZSBpZiB0aGUgbWVzc2FnZSBpcyBhIG5vbi1zeW50aGV0aWMgcmVzdWx0LgogICAg ICAgICAvLyBUaGlzIGlzIHdoZW4gdGhlIHVzZXIgZXZhbHVhdGVkIHNvbWV0aGluZyBkaXJlY3Rs eSBpbiB0aGUgcHJvbXB0LgogICAgICAgICBpZiAodHlwZSAhPT0gV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlJlc3VsdCB8fCBtZXNzYWdlVmlldy5tZXNzYWdlLnN5bnRo ZXRpYykKQEAgLTE3NSw2ICsxNjIsOCBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcgPSBj bGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50VgogCiAgICAg ICAgIGlmICghV2ViSW5zcGVjdG9yLmlzU2hvd2luZ0NvbnNvbGVUYWIoKSkKICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5zaG93U3BsaXRDb25zb2xlKCk7CisKKyAgICAgICAgdGhpcy5fbG9nVmll d0NvbnRyb2xsZXIuc2Nyb2xsVG9Cb3R0b20oKTsKICAgICB9CiAKICAgICBnZXQgc3VwcG9ydHNT ZWFyY2goKQpAQCAtMzIwLDcgKzMwOSw3IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50VmlldyA9 IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAgICAg ICAgIHJldHVybiBtZXNzYWdlTGV2ZWw7CiAgICAgfQogCi0gICAgX21hcmtTY29wZUJhckl0ZW1V bnJlYWQobGV2ZWwpCisgICAgX3B1bHNlU2NvcGVCYXJJdGVtQm9yZGVyKGxldmVsKQogICAgIHsK ICAgICAgICAgdmFyIG1lc3NhZ2VMZXZlbCA9IHRoaXMuX3Njb3BlRnJvbU1lc3NhZ2VMZXZlbChs ZXZlbCk7CiAKQEAgLTMzOCwxMyArMzI3LDE3IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmll dyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAg ICAgICAgIGlmICh0aGlzLl9zdGFydGVkUHJvdmlzaW9uYWxMb2FkKQogICAgICAgICAgICAgdGhp cy5fcHJvdmlzaW9uYWxNZXNzYWdlcy5wdXNoKGV2ZW50LmRhdGEubWVzc2FnZSk7CiAKLSAgICAg ICAgdGhpcy5fbG9nVmlld0NvbnRyb2xsZXIuYXBwZW5kQ29uc29sZU1lc3NhZ2UoZXZlbnQuZGF0 YS5tZXNzYWdlKTsKKyAgICAgICAgdGhpcy5fbGFzdE1lc3NhZ2VWaWV3ID0gdGhpcy5fbG9nVmll d0NvbnRyb2xsZXIuYXBwZW5kQ29uc29sZU1lc3NhZ2UoZXZlbnQuZGF0YS5tZXNzYWdlKTsKKyAg ICAgICAgaWYgKHRoaXMuX2xhc3RNZXNzYWdlVmlldy5tZXNzYWdlLnR5cGUgIT09IFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5FbmRHcm91cCkgeworICAgICAgICAgICAg dGhpcy5fcHVsc2VTY29wZUJhckl0ZW1Cb3JkZXIodGhpcy5fbGFzdE1lc3NhZ2VWaWV3Lm1lc3Nh Z2UubGV2ZWwpOworICAgICAgICAgICAgdGhpcy5fZmlsdGVyTWVzc2FnZUVsZW1lbnRzKFt0aGlz Ll9sYXN0TWVzc2FnZVZpZXcuZWxlbWVudF0pOworICAgICAgICB9CiAgICAgfQogCiAgICAgX3By ZXZpb3VzTWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZChldmVudCkKICAgICB7ICAgICAgICAKICAg ICAgICAgaWYgKHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLnVwZGF0ZVByZXZpb3VzTWVzc2FnZVJl cGVhdENvdW50KGV2ZW50LmRhdGEuY291bnQpICYmIHRoaXMuX2xhc3RNZXNzYWdlVmlldykKLSAg ICAgICAgICAgIHRoaXMuX21hcmtTY29wZUJhckl0ZW1VbnJlYWQodGhpcy5fbGFzdE1lc3NhZ2VW aWV3Lm1lc3NhZ2UubGV2ZWwpOworICAgICAgICAgICAgdGhpcy5fcHVsc2VTY29wZUJhckl0ZW1C b3JkZXIodGhpcy5fbGFzdE1lc3NhZ2VWaWV3Lm1lc3NhZ2UubGV2ZWwpOwogICAgIH0KIAogICAg IF9oYW5kbGVDb250ZXh0TWVudUV2ZW50KGV2ZW50KQo=