149680 2015-09-30 15:18:07 -0700 Web Inspector: Reduce `delete` in TreeElements and DataGridNodes 2015-09-30 17:08:49 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1129678 0 joepeck 2015-09-30 15:18:07 -0700 * SUMMARY Reduce `delete` in TreeElements and DataGridNodes. There are still some instances in the DataGrid base classes, but those are non-trivial to remove. 1129679 1 262193 joepeck 2015-09-30 15:18:41 -0700 Created attachment 262193 [PATCH] Proposed Fix 1129746 2 262193 commit-queue 2015-09-30 17:08:45 -0700 Comment on attachment 262193 [PATCH] Proposed Fix Clearing flags on attachment: 262193 Committed r190376: <http://trac.webkit.org/changeset/190376> 1129747 3 commit-queue 2015-09-30 17:08:49 -0700 All reviewed patches have been landed. Closing bug. 262193 2015-09-30 15:18:41 -0700 2015-09-30 17:08:45 -0700 [PATCH] Proposed Fix reduce.patch text/plain 8264 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcxZDc5OWEuLjRmZDk5MTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTA5LTMwICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVkdWNl IGBkZWxldGVgIGluIFRyZWVFbGVtZW50cyBhbmQgRGF0YUdyaWROb2RlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5NjgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0JyZWFrcG9pbnRUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3Bv aW50VHJlZUVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRUcmVlRWxl bWVudC5wcm90b3R5cGUuX3JlbW92ZVByb2JlU2V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3Rv dHlwZS5fZWRpdGluZ0NvbW1pdHRlZC5tb3ZlVG9OZXh0Q2VsbCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9lZGl0aW5nQ29tbWl0dGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX2VkaXRpbmdDYW5jZWxsZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5yZW1vdmVDb2x1bW4pOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUucmVmcmVzaElmTmVlZGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUucHJvdG90eXBlLnJlZnJlc2gpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuZXhwYW5kKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUucHJvdG90eXBlLnJlc3RvcmVQb3NpdGlv bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGV0YWNoKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90b3R5cGUu cmVmcmVzaCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlRWxlbWVudC5wcm90b3R5cGUuX2ZpcmVEaWRDaGFu Z2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVFbGVtZW50LnByb3RvdHlwZS5leHBhbmQp OgorCiAyMDE1LTA5LTI4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogSW5jbHVkZSBHYXJiYWdlIENvbGxlY3Rpb24gRXZlbnQg aW4gVGltZWxpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVlRWxlbWVudC5qcwppbmRleCAzZDA1 MjliLi5mOWIwMmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzCkBAIC0z NSw2ICszNSw3IEBAIFdlYkluc3BlY3Rvci5CcmVha3BvaW50VHJlZUVsZW1lbnQgPSBjbGFzcyBC cmVha3BvaW50VHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwCiAgICAgICAgIHN1cGVyKFsiYnJl YWtwb2ludCIsIGNsYXNzTmFtZV0sIHRpdGxlLCBudWxsLCBicmVha3BvaW50LCBmYWxzZSk7CiAK ICAgICAgICAgdGhpcy5fYnJlYWtwb2ludCA9IGJyZWFrcG9pbnQ7CisgICAgICAgIHRoaXMuX3By b2JlU2V0ID0gbnVsbDsKIAogICAgICAgICB0aGlzLl9saXN0ZW5lcnMgPSBuZXcgV2ViSW5zcGVj dG9yLkV2ZW50TGlzdGVuZXJTZXQodGhpcywgIkJyZWFrcG9pbnRUcmVlRWxlbWVudCBsaXN0ZW5l cnMiKTsKICAgICAgICAgaWYgKCF0aXRsZSkKQEAgLTE5NCw3ICsxOTUsNyBAQCBXZWJJbnNwZWN0 b3IuQnJlYWtwb2ludFRyZWVFbGVtZW50ID0gY2xhc3MgQnJlYWtwb2ludFRyZWVFbGVtZW50IGV4 dGVuZHMgV2ViSW5zcAogCiAgICAgICAgIHByb2JlU2V0LnJlbW92ZUV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLlByb2JlU2V0LkV2ZW50LlNhbXBsZXNDbGVhcmVkLCB0aGlzLl9zYW1wbGVzQ2xl YXJlZCwgdGhpcyk7CiAgICAgICAgIHByb2JlU2V0LmRhdGFUYWJsZS5yZW1vdmVFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFUYWJsZS5FdmVudC5GcmFtZUluc2VydGVkLCB0 aGlzLl9kYXRhVXBkYXRlZCwgdGhpcyk7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9wcm9iZVNldDsK KyAgICAgICAgdGhpcy5fcHJvYmVTZXQgPSBudWxsOwogICAgIH0KIAogICAgIF9wcm9iZVNldEFk ZGVkKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9EYXRhR3JpZC5qcwppbmRleCA0Y2M0ZTg5Li4zY2JmODE2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcwpA QCAtMzE1LDcgKzMxNSw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlk IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgdmFyIG1vdmVDb21tYW5k ID0gZGV0ZXJtaW5lTmV4dENlbGwuY2FsbCh0aGlzLCB2YWx1ZURpZENoYW5nZSk7CiAgICAgICAg ICAgICBpZiAobW92ZUNvbW1hbmQuc2hvdWxkU29ydCAmJiB0aGlzLl9zb3J0QWZ0ZXJFZGl0aW5n Q2FsbGJhY2spIHsKICAgICAgICAgICAgICAgICB0aGlzLl9zb3J0QWZ0ZXJFZGl0aW5nQ2FsbGJh Y2soKTsKLSAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fc29ydEFmdGVyRWRpdGluZ0NhbGxi YWNrOworICAgICAgICAgICAgICAgIHRoaXMuX3NvcnRBZnRlckVkaXRpbmdDYWxsYmFjayA9IG51 bGw7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAobW92ZUNvbW1hbmQuZWRpdGluZ05v ZGUpCiAgICAgICAgICAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nTm9kZUF0Q29sdW1uSW5kZXgo bW92ZUNvbW1hbmQuZWRpdGluZ05vZGUsIG1vdmVDb21tYW5kLmNvbHVtbkluZGV4KTsKQEAgLTMz NCw3ICszMzQsNyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBleHRl bmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICBfZWRpdGluZ0NhbmNlbGxlZChlbGVtZW50KQog ICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fZWRpdGluZ05vZGUuZWxlbWVudCA9 PT0gZWxlbWVudC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aE5vZGVOYW1lKCJ0ciIpKTsKLSAgICAg ICAgZGVsZXRlIHRoaXMuX2VkaXRpbmc7CisgICAgICAgIHRoaXMuX2VkaXRpbmcgPSBmYWxzZTsK ICAgICAgICAgdGhpcy5fZWRpdGluZ05vZGUgPSBudWxsOwogICAgIH0KIApAQCAtNTE2LDcgKzUx Niw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGNsYXNzIERhdGFHcmlkIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamVjdAogICAgICAgICByZW1vdmVkQ29sdW1uWyJsaXN0ZW5lcnMiXS51bmlu c3RhbGwodHJ1ZSk7CiAKICAgICAgICAgaWYgKHJlbW92ZWRDb2x1bW5bImRpc2Nsb3N1cmUiXSkK LSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLmRpc2Nsb3N1cmVDb2x1bW5JZGVudGlmaWVyOworICAg ICAgICAgICAgdGhpcy5kaXNjbG9zdXJlQ29sdW1uSWRlbnRpZmllciA9IHVuZGVmaW5lZDsKIAog ICAgICAgICBpZiAodGhpcy5zb3J0Q29sdW1uSWRlbnRpZmllciA9PT0gY29sdW1uSWRlbnRpZmll cikKICAgICAgICAgICAgIHRoaXMuc29ydENvbHVtbklkZW50aWZpZXIgPSBudWxsOwpAQCAtMTM5 MSw3ICsxMzkxLDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZSA9IGNsYXNzIERhdGFHcmlk Tm9kZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgaWYgKCF0aGlzLl9uZWVk c1JlZnJlc2gpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgZGVsZXRlIHRoaXMuX25l ZWRzUmVmcmVzaDsKKyAgICAgICAgdGhpcy5fbmVlZHNSZWZyZXNoID0gZmFsc2U7CiAKICAgICAg ICAgdGhpcy5yZWZyZXNoKCk7CiAgICAgfQpAQCAtMTU1MSwxMCArMTU1MSwxMCBAQCBXZWJJbnNw ZWN0b3IuRGF0YUdyaWROb2RlID0gY2xhc3MgRGF0YUdyaWROb2RlIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogCiAgICAgICAgIGlmICh0aGlzLl9zY2hlZHVsZWRSZWZyZXNoSWRlbnRpZmll cikgewogICAgICAgICAgICAgY2FuY2VsQW5pbWF0aW9uRnJhbWUodGhpcy5fc2NoZWR1bGVkUmVm cmVzaElkZW50aWZpZXIpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3NjaGVkdWxlZFJlZnJl c2hJZGVudGlmaWVyOworICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVkUmVmcmVzaElkZW50aWZp ZXIgPSB1bmRlZmluZWQ7CiAgICAgICAgIH0KIAotICAgICAgICBkZWxldGUgdGhpcy5fbmVlZHNS ZWZyZXNoOworICAgICAgICB0aGlzLl9uZWVkc1JlZnJlc2ggPSBmYWxzZTsKIAogICAgICAgICB0 aGlzLl9lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIHRoaXMuY3JlYXRlQ2VsbHMo KTsKQEAgLTE2ODUsNyArMTY4NSw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUgPSBjbGFz cyBEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBkZWxldGUgdGhpcy5fc2hvdWxkUmVm cmVzaENoaWxkcmVuOworICAgICAgICAgICAgdGhpcy5fc2hvdWxkUmVmcmVzaENoaWxkcmVuID0g ZmFsc2U7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5fZWxlbWVudCkKQEAgLTE4OTYs NyArMTg5Niw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUgPSBjbGFzcyBEYXRhR3JpZE5v ZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIGlmICh0aGlzLnBhcmVudCAh PT0gdGhpcy5fc2F2ZWRQb3NpdGlvbi5wYXJlbnQpCiAgICAgICAgICAgICB0aGlzLl9zYXZlZFBv c2l0aW9uLnBhcmVudC5pbnNlcnRDaGlsZCh0aGlzLCB0aGlzLl9zYXZlZFBvc2l0aW9uLmluZGV4 KTsKIAotICAgICAgICBkZWxldGUgdGhpcy5fc2F2ZWRQb3NpdGlvbjsKKyAgICAgICAgdGhpcy5f c2F2ZWRQb3NpdGlvbiA9IG51bGw7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVt ZW50LmpzCmluZGV4IDM3OGFkMDYuLmM2YjBhZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVHJlZUVsZW1l bnQuanMKQEAgLTI1MCw3ICsyNTAsNyBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50 ID0gY2xhc3MgR2VuZXJhbFRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgIHsK ICAgICAgICAgaWYgKHRoaXMuX2JvdW5kQ29udGV4dE1lbnVFdmVudEhhbmRsZXIpIHsKICAgICAg ICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5yZW1vdmVFdmVudExpc3RlbmVyKCJjb250ZXh0bWVu dSIsIHRoaXMuX2JvdW5kQ29udGV4dE1lbnVFdmVudEhhbmRsZXIpOwotICAgICAgICAgICAgZGVs ZXRlIHRoaXMuX2JvdW5kQ29udGV4dE1lbnVFdmVudEhhbmRsZXI7CisgICAgICAgICAgICB0aGlz Ll9ib3VuZENvbnRleHRNZW51RXZlbnRIYW5kbGVyID0gbnVsbDsKICAgICAgICAgfQogICAgIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKaW5kZXgg NWUzZWVkZGMuLmIzOTM1ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1lbGluZURh dGFHcmlkTm9kZS5qcwpAQCAtMTI3LDEwICsxMjcsMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl VGltZWxpbmVEYXRhR3JpZE5vZGUgPSBjbGFzcyBSZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2Rl IGUKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9zY2hlZHVsZWRSZWZyZXNoSWRlbnRpZmllcikg ewogICAgICAgICAgICAgY2FuY2VsQW5pbWF0aW9uRnJhbWUodGhpcy5fc2NoZWR1bGVkUmVmcmVz aElkZW50aWZpZXIpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3NjaGVkdWxlZFJlZnJlc2hJ ZGVudGlmaWVyOworICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVkUmVmcmVzaElkZW50aWZpZXIg PSB1bmRlZmluZWQ7CiAgICAgICAgIH0KIAotICAgICAgICBkZWxldGUgdGhpcy5fY2FjaGVkRGF0 YTsKKyAgICAgICAgdGhpcy5fY2FjaGVkRGF0YSA9IG51bGw7CiAKICAgICAgICAgc3VwZXIucmVm cmVzaCgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKaW5kZXggMGE4MmMxMy4uZjgxOTY5MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91 dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VHJlZU91dGxpbmUuanMKQEAgLTY5MCw3ICs2OTAsNyBAQCBXZWJJbnNwZWN0b3IuVHJlZUVsZW1l bnQgPSBjbGFzcyBUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAg IF9maXJlRGlkQ2hhbmdlKCkKICAgICB7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9kaWRDaGFuZ2VU aW1lb3V0SWRlbnRpZmllcjsKKyAgICAgICAgdGhpcy5fZGlkQ2hhbmdlVGltZW91dElkZW50aWZp ZXIgPSB1bmRlZmluZWQ7CiAKICAgICAgICAgaWYgKHRoaXMudHJlZU91dGxpbmUpCiAgICAgICAg ICAgICB0aGlzLnRyZWVPdXRsaW5lLl90cmVlRWxlbWVudERpZENoYW5nZSh0aGlzKTsKQEAgLTg5 MCw3ICs4OTAsNyBAQCBXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnQgPSBjbGFzcyBUcmVlRWxlbWVu dCBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgdGhpcy5jaGlsZHJlbi5sZW5ndGg7ICsraSkKICAgICAgICAgICAgICAgICB0aGlzLmNo aWxkcmVuW2ldLl9hdHRhY2goKTsKIAotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3Nob3VsZFJl ZnJlc2hDaGlsZHJlbjsKKyAgICAgICAgICAgIHRoaXMuX3Nob3VsZFJlZnJlc2hDaGlsZHJlbiA9 IGZhbHNlOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKHRoaXMuX2xpc3RJdGVtTm9kZSkgewo=