158973 2016-06-20 20:10:25 -0700 REGRESSION(r202253): Broke inspector/unit-tests/heap-snapshot-collection-event.html 2016-06-20 20:49:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 157904 1 commit-queue commit-queue bburg joepeck oldest_to_newest 1204017 0 commit-queue 2016-06-20 20:10:25 -0700 http://trac.webkit.org/changeset/202253 broke the build: Broke inspector/unit-tests/heap-snapshot-collection-event.html (Requested by ap 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. 1204019 1 281706 commit-queue 2016-06-20 20:10:53 -0700 Created attachment 281706 ROLLOUT of r202253 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. 1204020 2 281706 joepeck 2016-06-20 20:12:07 -0700 Comment on attachment 281706 ROLLOUT of r202253 cq- while I adjust the test. 1204023 3 joepeck 2016-06-20 20:23:32 -0700 Fixed the test in: <https://trac.webkit.org/changeset/202264> 281706 2016-06-20 20:10:53 -0700 2016-06-20 20:49:18 -0700 ROLLOUT of r202253 bug-158973-20160620201046.patch text/plain 12785 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 MTI4ZjJhZDNjMTAwYjZiODJmOTAxMzFjODc0ZTU5MjNjMDhkNzE2Li5mNzNjOWQ5ODNlYzlhM2Mz MDljNTNkMzg4NmE3YWVjNTVjYmM5OWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNi0wNi0yMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIwMjI1My4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODk3MworCisgICAg ICAgIEJyb2tlIGluc3BlY3Rvci91bml0LXRlc3RzL2hlYXAtc25hcHNob3QtY29sbGVjdGlvbi1l dmVudC5odG1sCisgICAgICAgIChSZXF1ZXN0ZWQgYnkgYXAgb24gI3dlYmtpdCkuCisKKyAgICAg ICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0OgorCisgICAgICAgICJXZWIgSW5zcGVjdG9yOiBTbmFwc2hv dCBMaXN0IHNob3VsZCBzaG93IHRoZSB0b3RhbCBzaXplIGFuZAorICAgICAgICB0aGUgdG90YWwg bGl2ZSBzaXplIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU3OTA0CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzIwMjI1 MworCiAyMDE2LTA2LTIwICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogU25hcHNob3QgTGlzdCBzaG91bGQgc2hvdyB0aGUgdG90 YWwgc2l6ZSBhbmQgdGhlIHRvdGFsIGxpdmUgc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMKaW5kZXggNThjN2QzMWYyN2EzMzFmNzNhYWY4ZGE3ZTZlYmNmMjdhYjEzOWU0MS4uOTdh YjAwMzBmNjg2MmFiYzlhZDJlN2Y2ZDNiNjcyMGUwYjk4OTljZCAxMDA2NDQKR0lUIGJpbmFyeSBw YXRjaApkZWx0YSA1NAp6Y21iUG9mXzJGVykody1WdXFIQW5GcUJSSEZpRFhVJXdrQW4kZUNvVUtV c0RQJipiWTxeZF81NTY1RCl6M1d2I04KSiVhZ1pmMFJTVUI2JTdDWQoKZGVsdGEgNjAKemNtWjIt Zl8ySVgpKHctVloybWpOJDMhYGtwXlBEd0w0aEhkQShOcEIkV21nNjFAZGZ4U2MkPDBDPGNfQjk+ PkxLCkt5NG41WS1CfCFqan1mZl4KCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Qcm94aWVzL0hlYXBTbmFwc2hvdERpZmZQcm94eS5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3hpZXMvSGVhcFNuYXBzaG90RGlmZlByb3h5 LmpzCmluZGV4IGU1YTllYzFiMzExZDc4Y2RhNTVjNmYyMjc0MmE0OTdjOWNlYjk2MTQuLjA3MGMy ODk3NWI4ZDYwOTUwNjA2YWY3YjU2NmUzZjU1N2EzZjY0YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3hpZXMvSGVhcFNuYXBzaG90RGlmZlByb3h5 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3hpZXMvSGVh cFNuYXBzaG90RGlmZlByb3h5LmpzCkBAIC02Nyw3ICs2Nyw3IEBAIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3REaWZmUHJveHkgPSBjbGFzcyBIZWFwU25hcHNob3REaWZmUHJveHkgZXh0ZW5kcyBX ZWJJbnNwCiAgICAgICAgIGlmICghZXZlbnQuZGF0YS5hZmZlY3RlZFNuYXBzaG90cy5pbmNsdWRl cyh0aGlzLl9zbmFwc2hvdDIuX2lkZW50aWZpZXIpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0g ICAgICAgIHRoaXMudXBkYXRlKCgpID0+IHsKKyAgICAgICAgdGhpcy51cGRhdGVDYXRlZ29yaWVz KCgpID0+IHsKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5IZWFwU25hcHNob3RQcm94eS5FdmVudC5Db2xsZWN0ZWROb2RlcywgZXZlbnQuZGF0 YSk7CiAgICAgICAgIH0pOwogICAgIH0KQEAgLTg0LDkgKzg0LDkgQEAgV2ViSW5zcGVjdG9yLkhl YXBTbmFwc2hvdERpZmZQcm94eSA9IGNsYXNzIEhlYXBTbmFwc2hvdERpZmZQcm94eSBleHRlbmRz IFdlYkluc3AKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgdXBkYXRlKGNhbGxiYWNrKQorICAg IHVwZGF0ZUNhdGVnb3JpZXMoY2FsbGJhY2spCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3Iu SGVhcFNuYXBzaG90V29ya2VyUHJveHkuc2luZ2xldG9uKCkuY2FsbE1ldGhvZCh0aGlzLl9wcm94 eU9iamVjdElkLCAidXBkYXRlIiwgKHtsaXZlU2l6ZSwgY2F0ZWdvcmllc30pID0+IHsKKyAgICAg ICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFdvcmtlclByb3h5LnNpbmdsZXRvbigpLmNhbGxN ZXRob2QodGhpcy5fcHJveHlPYmplY3RJZCwgInVwZGF0ZUNhdGVnb3JpZXMiLCAoY2F0ZWdvcmll cykgPT4gewogICAgICAgICAgICAgdGhpcy5fY2F0ZWdvcmllcyA9IE1hcC5mcm9tT2JqZWN0KGNh dGVnb3JpZXMpOwogICAgICAgICAgICAgY2FsbGJhY2soKTsKICAgICAgICAgfSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm94aWVzL0hlYXBTbmFw c2hvdFByb3h5LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJveGll cy9IZWFwU25hcHNob3RQcm94eS5qcwppbmRleCA5OWRhN2VkZjdlYWM4N2U4NjMzZGM2OTRiNWRj ZjRhM2JlNmY3MWQxLi43ZGExNjNjYmJlNWU2YjFiZTIzODc4ZjY1MjhjODhjMWEyOGFlZDkwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm94aWVzL0hl YXBTbmFwc2hvdFByb3h5LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1Byb3hpZXMvSGVhcFNuYXBzaG90UHJveHkuanMKQEAgLTI1LDcgKzI1LDcgQEAKIAogV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb3h5ID0gY2xhc3MgSGVhcFNuYXBzaG90UHJveHkgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiB7Ci0gICAgY29uc3RydWN0b3Ioc25hcHNob3RPYmpl Y3RJZCwgaWRlbnRpZmllciwgdGl0bGUsIHRvdGFsU2l6ZSwgdG90YWxPYmplY3RDb3VudCwgbGl2 ZVNpemUsIGNhdGVnb3JpZXMpCisgICAgY29uc3RydWN0b3Ioc25hcHNob3RPYmplY3RJZCwgaWRl bnRpZmllciwgdGl0bGUsIHRvdGFsU2l6ZSwgdG90YWxPYmplY3RDb3VudCwgY2F0ZWdvcmllcykK ICAgICB7CiAgICAgICAgIHN1cGVyKCk7CiAKQEAgLTM1LDcgKzM1LDYgQEAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdFByb3h5ID0gY2xhc3MgSGVhcFNuYXBzaG90UHJveHkgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuT2IKICAgICAgICAgdGhpcy5fdGl0bGUgPSB0aXRsZTsKICAgICAgICAgdGhpcy5f dG90YWxTaXplID0gdG90YWxTaXplOwogICAgICAgICB0aGlzLl90b3RhbE9iamVjdENvdW50ID0g dG90YWxPYmplY3RDb3VudDsKLSAgICAgICAgdGhpcy5fbGl2ZVNpemUgPSBsaXZlU2l6ZTsKICAg ICAgICAgdGhpcy5fY2F0ZWdvcmllcyA9IE1hcC5mcm9tT2JqZWN0KGNhdGVnb3JpZXMpOwogICAg IH0KIApAQCAtNDMsOCArNDIsOCBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJveHkgPSBj bGFzcyBIZWFwU25hcHNob3RQcm94eSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYgogCiAgICAgc3Rh dGljIGRlc2VyaWFsaXplKG9iamVjdElkLCBzZXJpYWxpemVkU25hcHNob3QpCiAgICAgewotICAg ICAgICBsZXQge2lkZW50aWZpZXIsIHRpdGxlLCB0b3RhbFNpemUsIHRvdGFsT2JqZWN0Q291bnQs IGxpdmVTaXplLCBjYXRlZ29yaWVzfSA9IHNlcmlhbGl6ZWRTbmFwc2hvdDsKLSAgICAgICAgcmV0 dXJuIG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJveHkob2JqZWN0SWQsIGlkZW50aWZp ZXIsIHRpdGxlLCB0b3RhbFNpemUsIHRvdGFsT2JqZWN0Q291bnQsIGxpdmVTaXplLCBjYXRlZ29y aWVzKTsKKyAgICAgICAgbGV0IHtpZGVudGlmaWVyLCB0aXRsZSwgdG90YWxTaXplLCB0b3RhbE9i amVjdENvdW50LCBjYXRlZ29yaWVzfSA9IHNlcmlhbGl6ZWRTbmFwc2hvdDsKKyAgICAgICAgcmV0 dXJuIG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJveHkob2JqZWN0SWQsIGlkZW50aWZp ZXIsIHRpdGxlLCB0b3RhbFNpemUsIHRvdGFsT2JqZWN0Q291bnQsIGNhdGVnb3JpZXMpOwogICAg IH0KIAogICAgIC8vIFB1YmxpYwpAQCAtNTQsNyArNTMsNiBAQCBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90UHJveHkgPSBjbGFzcyBIZWFwU25hcHNob3RQcm94eSBleHRlbmRzIFdlYkluc3BlY3Rv ci5PYgogICAgIGdldCB0aXRsZSgpIHsgcmV0dXJuIHRoaXMuX3RpdGxlOyB9CiAgICAgZ2V0IHRv dGFsU2l6ZSgpIHsgcmV0dXJuIHRoaXMuX3RvdGFsU2l6ZTsgfQogICAgIGdldCB0b3RhbE9iamVj dENvdW50KCkgeyByZXR1cm4gdGhpcy5fdG90YWxPYmplY3RDb3VudDsgfQotICAgIGdldCBsaXZl U2l6ZSgpIHsgcmV0dXJuIHRoaXMuX2xpdmVTaXplOyB9CiAgICAgZ2V0IGNhdGVnb3JpZXMoKSB7 IHJldHVybiB0aGlzLl9jYXRlZ29yaWVzOyB9CiAKICAgICB1cGRhdGVGb3JDb2xsZWN0aW9uRXZl bnQoZXZlbnQpCkBAIC02Miw3ICs2MCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQcm94 eSA9IGNsYXNzIEhlYXBTbmFwc2hvdFByb3h5IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iCiAgICAg ICAgIGlmICghZXZlbnQuZGF0YS5hZmZlY3RlZFNuYXBzaG90cy5pbmNsdWRlcyh0aGlzLl9pZGVu dGlmaWVyKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLnVwZGF0ZSgoKSA9 PiB7CisgICAgICAgIHRoaXMudXBkYXRlQ2F0ZWdvcmllcygoKSA9PiB7CiAgICAgICAgICAgICB0 aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJv eHkuRXZlbnQuQ29sbGVjdGVkTm9kZXMsIGV2ZW50LmRhdGEpOwogICAgICAgICB9KTsKICAgICB9 CkBAIC03OSwxMCArNzcsOSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJveHkgPSBjbGFz cyBIZWFwU25hcHNob3RQcm94eSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYgogICAgICAgICB9KTsK ICAgICB9CiAKLSAgICB1cGRhdGUoY2FsbGJhY2spCisgICAgdXBkYXRlQ2F0ZWdvcmllcyhjYWxs YmFjaykKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RXb3JrZXJQcm94 eS5zaW5nbGV0b24oKS5jYWxsTWV0aG9kKHRoaXMuX3Byb3h5T2JqZWN0SWQsICJ1cGRhdGUiLCAo e2xpdmVTaXplLCBjYXRlZ29yaWVzfSkgPT4gewotICAgICAgICAgICAgdGhpcy5fbGl2ZVNpemUg PSBsaXZlU2l6ZTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFdvcmtlclByb3h5 LnNpbmdsZXRvbigpLmNhbGxNZXRob2QodGhpcy5fcHJveHlPYmplY3RJZCwgInVwZGF0ZUNhdGVn b3JpZXMiLCAoY2F0ZWdvcmllcykgPT4gewogICAgICAgICAgICAgdGhpcy5fY2F0ZWdvcmllcyA9 IE1hcC5mcm9tT2JqZWN0KGNhdGVnb3JpZXMpOwogICAgICAgICAgICAgY2FsbGJhY2soKTsKICAg ICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9IZWFwQWxsb2NhdGlvbnNUaW1lbGluZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVsaW5l RGF0YUdyaWROb2RlLmpzCmluZGV4IDFjMGRiOGJhOWQxMDI2MWJhMjkzZWNlMGU3MTIyZDQ2ZWVj MDkwN2IuLjA2NmZmNTNiZjYxYWJjOWFlMzA4YmY1MTMzMGQxMjVhODI5ODgyZDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0 aW9uc1RpbWVsaW5lRGF0YUdyaWROb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVsaW5lRGF0YUdyaWROb2RlLmpz CkBAIC0zNiwxMCArMzYsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVE YXRhR3JpZE5vZGUgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNUaW1lbGluZQogICAgICAgICAgICAg bmFtZTogdGhpcy5kaXNwbGF5TmFtZSgpLAogICAgICAgICAgICAgdGltZXN0YW1wOiB6ZXJvVGlt ZSA/IHRoaXMuX3JlY29yZC50aW1lc3RhbXAgLSB6ZXJvVGltZSA6IE5hTiwKICAgICAgICAgICAg IHNpemU6IHRoaXMuX3JlY29yZC5oZWFwU25hcHNob3QudG90YWxTaXplLAotICAgICAgICAgICAg bGl2ZVNpemU6IHRoaXMuX3JlY29yZC5oZWFwU25hcHNob3QubGl2ZVNpemUsCiAgICAgICAgIH07 Ci0KLSAgICAgICAgdGhpcy5fcmVjb3JkLmhlYXBTbmFwc2hvdC5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RQcm94eS5FdmVudC5Db2xsZWN0ZWROb2RlcywgdGhpcy5f aGVhcFNuYXBzaG90Q29sbGVjdGVkTm9kZXMsIHRoaXMpOwogICAgIH0KIAogICAgIC8vIFB1Ymxp YwpAQCAtNjcsOSArNjQsNiBAQCBXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVE YXRhR3JpZE5vZGUgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNUaW1lbGluZQogCiAgICAgICAgIGNh c2UgInNpemUiOgogICAgICAgICAgICAgcmV0dXJuIE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMu X2RhdGEuc2l6ZSk7Ci0KLSAgICAgICAgY2FzZSAibGl2ZVNpemUiOgotICAgICAgICAgICAgcmV0 dXJuIE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuX2RhdGEubGl2ZVNpemUpOwogICAgICAgICB9 CiAKICAgICAgICAgcmV0dXJuIHN1cGVyLmNyZWF0ZUNlbGxDb250ZW50KGNvbHVtbklkZW50aWZp ZXIsIGNlbGwpOwpAQCAtOTEsMTkgKzg1LDQgQEAgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9u c1RpbWVsaW5lRGF0YUdyaWROb2RlID0gY2xhc3MgSGVhcEFsbG9jYXRpb25zVGltZWxpbmUKICAg ICAgICAgdGhpcy5fZGF0YS50aW1lc3RhbXAgPSB0aGlzLl9yZWNvcmQudGltZXN0YW1wIC0gemVy b1RpbWU7CiAgICAgICAgIHRoaXMubmVlZHNSZWZyZXNoKCk7CiAgICAgfQotCi0gICAgLy8gUHJp dmF0ZQotCi0gICAgX2hlYXBTbmFwc2hvdENvbGxlY3RlZE5vZGVzKCkKLSAgICB7Ci0gICAgICAg IGxldCBvbGRTaXplID0gdGhpcy5fZGF0YS5saXZlU2l6ZTsKLSAgICAgICAgbGV0IG5ld1NpemUg PSB0aGlzLl9yZWNvcmQuaGVhcFNuYXBzaG90LmxpdmVTaXplOwotCi0gICAgICAgIGNvbnNvbGUu YXNzZXJ0KG5ld1NpemUgPD0gb2xkU2l6ZSk7Ci0gICAgICAgIGlmIChvbGRTaXplID09PSBuZXdT aXplKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMuX2RhdGEubGl2ZVNpemUg PSBuZXdTaXplOwotICAgICAgICB0aGlzLm5lZWRzUmVmcmVzaCgpOwotICAgIH0KIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxs b2NhdGlvbnNUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcuanMKaW5kZXggMzZiZDc3NmFk MmU2NTRmZTk0M2Y0MjcxODg1OTdjZTU5NWJiYTBjMy4uMTUwNGU5NDExYjEyMDFiNGYzZWFhNjU1 NzRmNWY0OTNmOWJlNTBlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVs aW5lVmlldy5qcwpAQCAtNTEsMTIgKzUxLDYgQEAgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9u c1RpbWVsaW5lVmlldyA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyBleHQKICAg ICAgICAgICAgICAgICBzb3J0YWJsZTogdHJ1ZSwKICAgICAgICAgICAgICAgICBhbGlnbmVkOiAi cmlnaHQiLAogICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIGxpdmVTaXplOiB7Ci0gICAgICAg ICAgICAgICAgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTGl2ZSBTaXplIiksCi0gICAg ICAgICAgICAgICAgd2lkdGg6ICI4MHB4IiwKLSAgICAgICAgICAgICAgICBzb3J0YWJsZTogdHJ1 ZSwKLSAgICAgICAgICAgICAgICBhbGlnbmVkOiAicmlnaHQiLAotICAgICAgICAgICAgfSwKICAg ICAgICAgfTsKIAogICAgICAgICBsZXQgc25hcHNob3RUb29sdGlwID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJUYWtlIHNuYXBzaG90Iik7CkBAIC0yMzksNyArMjMzLDYgQEAgV2ViSW5zcGVjdG9y LkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVs aW5lVmlldyBleHQKIAogICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5jbG9zZUFs bENvbnRlbnRWaWV3cygpOwogCi0gICAgICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5yZW1v dmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwogICAgICAgICBXZWJJbnNwZWN0b3Iu SGVhcFNuYXBzaG90V29ya2VyUHJveHkuc2luZ2xldG9uKCkucmVtb3ZlRXZlbnRMaXN0ZW5lcigi SGVhcFNuYXBzaG90LkNvbGxlY3Rpb25FdmVudCIsIHRoaXMuX2hlYXBTbmFwc2hvdENvbGxlY3Rp b25FdmVudCwgdGhpcyk7CiAgICAgfQogCkBAIC0zMDMsNiArMjk2LDggQEAgV2ViSW5zcGVjdG9y LkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVs aW5lVmlldyBleHQKICAgICAgICAgICAgIHVwZGF0ZUhlYXBTbmFwc2hvdEZvckV2ZW50KHJlY29y ZC5oZWFwU25hcHNob3QpOwogICAgICAgICBpZiAodGhpcy5faGVhcFNuYXBzaG90RGlmZikKICAg ICAgICAgICAgIHVwZGF0ZUhlYXBTbmFwc2hvdEZvckV2ZW50KHRoaXMuX2hlYXBTbmFwc2hvdERp ZmYpOworCisgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTU3OTA0PiBX ZWIgSW5zcGVjdG9yOiBTbmFwc2hvdCBMaXN0IHNob3VsZCBzaG93IHRoZSB0b3RhbCBzaXplIGFu ZCB0aGUgdG90YWwgbGl2ZSBzaXplCiAgICAgfQogCiAgICAgX3NuYXBzaG90TGlzdFBhdGhDb21w b25lbnRDbGlja2VkKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvV29ya2Vycy9IZWFwU25hcHNob3QvSGVhcFNuYXBzaG90LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvV29ya2Vycy9IZWFwU25hcHNob3QvSGVhcFNu YXBzaG90LmpzCmluZGV4IGI5ZTE0ZGQ2NTJmMTEyNTRmZTg4OTJiOTZiMjUwMzRkODRjOTA2OTku LmM3ODZkZmQ4MmE5NTE0MjJiOWJhNzA5OTk0MGNhMWRkNmYzOTMxZDMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dvcmtlcnMvSGVhcFNuYXBzaG90L0hl YXBTbmFwc2hvdC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9X b3JrZXJzL0hlYXBTbmFwc2hvdC9IZWFwU25hcHNob3QuanMKQEAgLTEzMiwxNiArMTMyLDEzIEBA IEhlYXBTbmFwc2hvdCA9IGNsYXNzIEhlYXBTbmFwc2hvdAogCiAgICAgICAgIHRoaXMuX25vZGVP cmRpbmFsSXNEZWFkID0gbmV3IFVpbnQ4QXJyYXkodGhpcy5fbm9kZUNvdW50KTsKIAotICAgICAg ICBsZXQge2xpdmVTaXplLCBjYXRlZ29yaWVzfSA9IEhlYXBTbmFwc2hvdC51cGRhdGVDYXRlZ29y aWVzQW5kTWV0YWRhdGEodGhpcyk7Ci0gICAgICAgIHRoaXMuX2xpdmVTaXplID0gbGl2ZVNpemU7 Ci0gICAgICAgIHRoaXMuX2NhdGVnb3JpZXMgPSBjYXRlZ29yaWVzOworICAgICAgICB0aGlzLl9j YXRlZ29yaWVzID0gSGVhcFNuYXBzaG90LmJ1aWxkQ2F0ZWdvcmllcyh0aGlzKTsKICAgICB9CiAK ICAgICAvLyBTdGF0aWMKIAotICAgIHN0YXRpYyB1cGRhdGVDYXRlZ29yaWVzQW5kTWV0YWRhdGEo c25hcHNob3QsIGFsbG93Tm9kZUlkZW50aWZpZXJDYWxsYmFjaykKKyAgICBzdGF0aWMgYnVpbGRD YXRlZ29yaWVzKHNuYXBzaG90LCBhbGxvd05vZGVJZGVudGlmaWVyQ2FsbGJhY2spCiAgICAgewot ICAgICAgICBsZXQgbGl2ZVNpemUgPSAwOwogICAgICAgICBsZXQgY2F0ZWdvcmllcyA9IHt9Owog CiAgICAgICAgIGxldCBub2RlcyA9IHNuYXBzaG90Ll9ub2RlczsKQEAgLTE3NCwxMSArMTcxLDkg QEAgSGVhcFNuYXBzaG90ID0gY2xhc3MgSGVhcFNuYXBzaG90CiAgICAgICAgICAgICAgICAgY2F0 ZWdvcnkuaW50ZXJuYWxDb3VudCArPSAxOwogICAgICAgICAgICAgaWYgKGRlYWQpCiAgICAgICAg ICAgICAgICAgY2F0ZWdvcnkuZGVhZENvdW50ICs9IDE7Ci0gICAgICAgICAgICBlbHNlCi0gICAg ICAgICAgICAgICAgbGl2ZVNpemUgKz0gc2l6ZTsKICAgICAgICAgfQogCi0gICAgICAgIHJldHVy biB7bGl2ZVNpemUsIGNhdGVnb3JpZXN9OworICAgICAgICByZXR1cm4gY2F0ZWdvcmllczsKICAg ICB9CiAKICAgICBzdGF0aWMgYWxsb2NhdGlvbkJ1Y2tldENvdW50cyhzbmFwc2hvdCwgYnVja2V0 U2l6ZXMsIGFsbG93Tm9kZUlkZW50aWZpZXJDYWxsYmFjaykKQEAgLTI0NCw5ICsyMzksOSBAQCBI ZWFwU25hcHNob3QgPSBjbGFzcyBIZWFwU25hcHNob3QKICAgICAgICAgcmV0dXJuIEhlYXBTbmFw c2hvdC5pbnN0YW5jZXNXaXRoQ2xhc3NOYW1lKHRoaXMsIGNsYXNzTmFtZSk7CiAgICAgfQogCi0g ICAgdXBkYXRlKCkKKyAgICB1cGRhdGVDYXRlZ29yaWVzKCkKICAgICB7Ci0gICAgICAgIHJldHVy biBIZWFwU25hcHNob3QudXBkYXRlQ2F0ZWdvcmllc0FuZE1ldGFkYXRhKHRoaXMpOworICAgICAg ICByZXR1cm4gSGVhcFNuYXBzaG90LmJ1aWxkQ2F0ZWdvcmllcyh0aGlzKTsKICAgICB9CiAKICAg ICBub2RlV2l0aElkZW50aWZpZXIobm9kZUlkZW50aWZpZXIpCkBAIC0zOTUsMTIgKzM5MCwxMyBA QCBIZWFwU25hcHNob3QgPSBjbGFzcyBIZWFwU25hcHNob3QKIAogICAgIHNlcmlhbGl6ZSgpCiAg ICAgeworICAgICAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE1NzkwND4gV2Vi IEluc3BlY3RvcjogU25hcHNob3QgTGlzdCBzaG91bGQgc2hvdyB0aGUgdG90YWwgc2l6ZSBhbmQg dGhlIHRvdGFsIGxpdmUgc2l6ZQorCiAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICBpZGVu dGlmaWVyOiB0aGlzLl9pZGVudGlmaWVyLAogICAgICAgICAgICAgdGl0bGU6IHRoaXMuX3RpdGxl LAogICAgICAgICAgICAgdG90YWxTaXplOiB0aGlzLl90b3RhbFNpemUsCiAgICAgICAgICAgICB0 b3RhbE9iamVjdENvdW50OiB0aGlzLl9ub2RlQ291bnQgLSAxLCAvLyA8cm9vdD4uCi0gICAgICAg ICAgICBsaXZlU2l6ZTogdGhpcy5fbGl2ZVNpemUsCiAgICAgICAgICAgICBjYXRlZ29yaWVzOiB0 aGlzLl9jYXRlZ29yaWVzLAogICAgICAgICB9OwogICAgIH0KQEAgLTc5Niw4ICs3OTIsNyBAQCBI ZWFwU25hcHNob3REaWZmID0gY2xhc3MgSGVhcFNuYXBzaG90RGlmZgogICAgICAgICAgICAgfQog ICAgICAgICB9CiAKLSAgICAgICAgbGV0IHtsaXZlU2l6ZSwgY2F0ZWdvcmllc30gPSBIZWFwU25h cHNob3QudXBkYXRlQ2F0ZWdvcmllc0FuZE1ldGFkYXRhKHRoaXMuX3NuYXBzaG90MiwgKG5vZGVJ ZGVudGlmaWVyKSA9PiB0aGlzLl9hZGRlZE5vZGVJZGVudGlmaWVycy5oYXMobm9kZUlkZW50aWZp ZXIpKTsKLSAgICAgICAgdGhpcy5fY2F0ZWdvcmllcyA9IGNhdGVnb3JpZXM7CisgICAgICAgIHRo aXMuX2NhdGVnb3JpZXMgPSBIZWFwU25hcHNob3QuYnVpbGRDYXRlZ29yaWVzKHRoaXMuX3NuYXBz aG90MiwgKG5vZGVJZGVudGlmaWVyKSA9PiB0aGlzLl9hZGRlZE5vZGVJZGVudGlmaWVycy5oYXMo bm9kZUlkZW50aWZpZXIpKTsKICAgICB9CiAKICAgICAvLyBXb3JrZXIgTWV0aG9kcwpAQCAtODEy LDkgKzgwNyw5IEBAIEhlYXBTbmFwc2hvdERpZmYgPSBjbGFzcyBIZWFwU25hcHNob3REaWZmCiAg ICAgICAgIHJldHVybiBIZWFwU25hcHNob3QuaW5zdGFuY2VzV2l0aENsYXNzTmFtZSh0aGlzLl9z bmFwc2hvdDIsIGNsYXNzTmFtZSwgKG5vZGVJZGVudGlmaWVyKSA9PiB0aGlzLl9hZGRlZE5vZGVJ ZGVudGlmaWVycy5oYXMobm9kZUlkZW50aWZpZXIpKTsKICAgICB9CiAKLSAgICB1cGRhdGUoKQor ICAgIHVwZGF0ZUNhdGVnb3JpZXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIEhlYXBTbmFwc2hv dC51cGRhdGVDYXRlZ29yaWVzQW5kTWV0YWRhdGEodGhpcy5fc25hcHNob3QyLCAobm9kZUlkZW50 aWZpZXIpID0+IHRoaXMuX2FkZGVkTm9kZUlkZW50aWZpZXJzLmhhcyhub2RlSWRlbnRpZmllcikp OworICAgICAgICByZXR1cm4gSGVhcFNuYXBzaG90LmJ1aWxkQ2F0ZWdvcmllcyh0aGlzLl9zbmFw c2hvdDIsIChub2RlSWRlbnRpZmllcikgPT4gdGhpcy5fYWRkZWROb2RlSWRlbnRpZmllcnMuaGFz KG5vZGVJZGVudGlmaWVyKSk7CiAgICAgfQogCiAgICAgbm9kZVdpdGhJZGVudGlmaWVyKG5vZGVJ ZGVudGlmaWVyKSB7IHJldHVybiB0aGlzLl9zbmFwc2hvdDIubm9kZVdpdGhJZGVudGlmaWVyKG5v ZGVJZGVudGlmaWVyKTsgfQo=