151283 2015-11-13 16:40:06 -0800 Remove the option for animating using setInterval from the graphics benchmark 2015-11-16 19:29:51 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sabouhallawa sabouhallawa cdumez commit-queue dino rniwa simon.fraser oldest_to_newest 1141984 0 sabouhallawa 2015-11-13 16:40:06 -0800 The setInterval option has never been used in practice and the existing code to support it makes it hard to maintain the requestAnimationFrame option code. 1141988 1 265516 sabouhallawa 2015-11-13 16:45:05 -0800 Created attachment 265516 Patch 1142079 2 265516 darin 2015-11-14 17:23:53 -0800 Comment on attachment 265516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=265516&action=review > PerformanceTests/Animometer/tests/resources/main.js:116 > + // If result == 0, no more requestAnimationFrame() will be invokced. Typo here: "invokced" instead of "invoked". 1142350 3 265626 sabouhallawa 2015-11-16 14:51:39 -0800 Created attachment 265626 Patch 1142385 4 265626 commit-queue 2015-11-16 16:11:43 -0800 Comment on attachment 265626 Patch Rejecting attachment 265626 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 265626, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: 088fd743713948cbc21ed53930b5cc1437c r192490 = 7bcfba0371cd3ecbc45cf6c3cba98bd648e069fe r192491 = 4ac83a2d03fe019772cd95bba9292f33a499ce74 r192492 = b9b3a173e91fefddd8b6e298cf6a9de3f00d43bf r192493 = 1cd9265b3689631010463defad5a28c5ea91f9f3 r192494 = db7a98bbffb81226ed816507a6c1fa08888b5803 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.webkit.org/results/438823 1142423 5 265647 sabouhallawa 2015-11-16 17:41:06 -0800 Created attachment 265647 Patch 1142435 6 commit-queue 2015-11-16 18:45:55 -0800 The commit-queue encountered the following flaky tests while processing attachment 265647: The commit-queue is continuing to process your patch. 1142438 7 commit-queue 2015-11-16 18:46:28 -0800 The commit-queue encountered the following flaky tests while processing attachment 265647: transitions/default-timing-function.html bug 138901 (author: simon.fraser@apple.com) The commit-queue is continuing to process your patch. 1142449 8 265647 commit-queue 2015-11-16 19:29:47 -0800 Comment on attachment 265647 Patch Clearing flags on attachment: 265647 Committed r192505: <http://trac.webkit.org/changeset/192505> 1142450 9 commit-queue 2015-11-16 19:29:51 -0800 All reviewed patches have been landed. Closing bug. 265516 2015-11-13 16:45:05 -0800 2015-11-16 14:51:36 -0800 Patch bug-151283-20151113164458.patch text/plain 2776 sabouhallawa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTI0NDkpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTExLTEzICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVt b3ZlIHRoZSBvcHRpb24gZm9yIGFuaW1hdGluZyB1c2luZyBzZXRJbnRlcnZhbCBmcm9tIHRoZSBn cmFwaGljcyBiZW5jaG1hcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MTI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor ICAgICAgICAKKyAgICAgICAgR2V0IHJpZCBvZiB0aGUgb3B0aW9uIHRvIHJ1biBhbmltYXRpb24g dXNpbmcgc2V0SW50ZXJ2YWwoKS4KKworICAgICAgICAqIEFuaW1vbWV0ZXIvdGVzdHMvcmVzb3Vy Y2VzL21haW4uanM6CisgICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuYW5pbWF0ZSk6CisgICAg ICAgIChCZW5jaG1hcmspOgorICAgICAgICAoQmVuY2htYXJrLnByb3RvdHlwZS5zdGFydCk6Cisg ICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuc3RhcnQpOiBEZWxldGVkLgorCiAyMDE1LTExLTA2 ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAg SW5pdGlhbGl6ZSB0aGUgZ3JhcGhpY3MgYmVuY2htYXJrJ3MgS2FsbWFuIGZpbHRlciB3aXRoIGVz dGltYXRlZCA2MCBGUFMKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9y ZXNvdXJjZXMvbWFpbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0 ZXIvdGVzdHMvcmVzb3VyY2VzL21haW4uanMJKHJldmlzaW9uIDE5MjQwMCkKKysrIFBlcmZvcm1h bmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcwkod29ya2luZyBjb3B5 KQpAQCAtNzIsMTEgKzcyLDYgQEAgZnVuY3Rpb24gQW5pbWF0b3IoYmVuY2htYXJrKQogCiBBbmlt YXRvci5wcm90b3R5cGUgPQogewotICAgIHN0YXJ0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAg ICB0aGlzLl9pbnRlcnZhbElkID0gc2V0SW50ZXJ2YWwodGhpcy5hbmltYXRlLmJpbmQodGhpcyks IDEpOwotICAgIH0sCi0gICAgCiAgICAgdGltZURlbHRhOiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICByZXR1cm4gdGhpcy5fY3VycmVudFRpbWVPZmZzZXQgLSB0aGlzLl9zdGFydFRpbWVPZmZz ZXQ7CkBAIC0xMTUsMTQgKzExMCwxMCBAQCBBbmltYXRvci5wcm90b3R5cGUgPQogICAgICAgICAv LyBBZGp1c3QgdGhlIHRlc3QgdG8gcmVhY2ggdGhlIGRlc2lyZWQgRlBTLgogICAgICAgICB2YXIg cmVzdWx0ID0gdGhpcy5fYmVuY2htYXJrLnVwZGF0ZSh0aGlzLl9jdXJyZW50VGltZU9mZnNldCwg dGhpcy50aW1lRGVsdGEoKSwgY3VycmVudEZyYW1lUmF0ZSk7CiAgICAgICAgIAotICAgICAgICAv LyBTdG9wIHRoZSBhbmltYXRvciBpZiB0aGUgYmVuY2htYXJrIGhhcyBmaW5pc2hlZC4KLSAgICAg ICAgaWYgKCFyZXN1bHQgJiYgdHlwZW9mIHRoaXMuX2ludGVydmFsSWQgIT0gInVuZGVmaW5lZCIp Ci0gICAgICAgICAgICBjbGVhckludGVydmFsKHRoaXMuX2ludGVydmFsSWQpOwotCiAgICAgICAg IC8vIFN0YXJ0IHRoZSBuZXh0IGRyb3AvbWVhc3VyZSBjeWNsZS4KICAgICAgICAgdGhpcy5fZnJh bWVDb3VudCA9IDA7CiAgICAgICAgIAotICAgICAgICAvLyByZXN1bHQgbWF5IHN0b3AgdGhlIGFu aW1hdG9yIGlmIHJlcXVlc3RBbmltYXRpb25GcmFtZSgpIGhhcyBiZWVuIHVzZWQuCisgICAgICAg IC8vIElmIHJlc3VsdCA9PSAwLCBubyBtb3JlIHJlcXVlc3RBbmltYXRpb25GcmFtZSgpIHdpbGwg YmUgaW52b2tjZWQuCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfSwKICAgICAKQEAgLTEz Niw4ICsxMjcsNiBAQCBBbmltYXRvci5wcm90b3R5cGUgPQogZnVuY3Rpb24gQmVuY2htYXJrKG9w dGlvbnMpCiB7CiAgICAgdGhpcy5fb3B0aW9ucyA9IG9wdGlvbnM7Ci0gICAgdGhpcy5fbWV0aG9k ID0gdGhpcy5fb3B0aW9uc1sibWV0aG9kIl0gfHwgInJlcXVlc3RBbmltYXRpb25GcmFtZSI7Ci0K ICAgICB0aGlzLm9wdGlvbnMgPSBvcHRpb25zOwogICAgIHRoaXMuX3JlY29yZEludGVydmFsID0g MjAwOyAgICAKICAgICB0aGlzLl9pc1NhbXBsaW5nID0gZmFsc2U7CkBAIC0xNTYsMTAgKzE0NSw3 IEBAIEJlbmNobWFyay5wcm90b3R5cGUgPQogICAgIC8vIENhbGxlZCBmcm9tIHRoZSBsb2FkIGV2 ZW50IGxpc3RlbmVyIG9yIGZyb20gdGhpcy5ydW4oKS4KICAgICBzdGFydDogZnVuY3Rpb24oKQog ICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX21ldGhvZCA9PSAic2V0SW50ZXJ2YWwiKQotICAgICAg ICAgICAgdGhpcy5fYW5pbWF0b3Iuc3RhcnQoKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAg dGhpcy5fYW5pbWF0b3IuYW5pbWF0ZUxvb3AoKTsKKyAgICAgICAgdGhpcy5fYW5pbWF0b3IuYW5p bWF0ZUxvb3AoKTsKICAgICB9LAogICAgIAogICAgIC8vIENhbGxlZCBmcm9tIHRoZSBhbmltYXRv ciB0byBhZGp1c3QgdGhlIGNvbXBsZXhpdHkgb2YgdGhlIHRlc3QuCg== 265626 2015-11-16 14:51:39 -0800 2015-11-16 17:41:04 -0800 Patch bug-151283-20151116145129.patch text/plain 2798 sabouhallawa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTI0ODcpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTExLTE2ICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVt b3ZlIHRoZSBvcHRpb24gZm9yIGFuaW1hdGluZyB1c2luZyBzZXRJbnRlcnZhbCBmcm9tIHRoZSBn cmFwaGljcyBiZW5jaG1hcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MTI4MworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorICAg ICAgICAKKyAgICAgICAgR2V0IHJpZCBvZiB0aGUgb3B0aW9uIHRvIHJ1biBhbmltYXRpb24gdXNp bmcgc2V0SW50ZXJ2YWwoKS4KKworICAgICAgICAqIEFuaW1vbWV0ZXIvdGVzdHMvcmVzb3VyY2Vz L21haW4uanM6CisgICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuYW5pbWF0ZSk6CisgICAgICAg IChCZW5jaG1hcmspOgorICAgICAgICAoQmVuY2htYXJrLnByb3RvdHlwZS5zdGFydCk6CisgICAg ICAgIChBbmltYXRvci5wcm90b3R5cGUuc3RhcnQpOiBEZWxldGVkLgorCiAyMDE1LTExLTEzICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgRWxp bWluYXRlIGEgcmVxdWVzdCBmb3IgbGF5b3V0IGV2ZXJ5IHRpbWUgYW4gaXRlbSBpcyBhZGRlZCB0 byB0aGUgc3RhZ2Ugb2YgdGhlIGdyYXBoaWNzIGJlbmNobWFyawpJbmRleDogUGVyZm9ybWFuY2VU ZXN0cy9Bbmltb21ldGVyL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBl cmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcwkocmV2aXNp b24gMTkyNDg3KQorKysgUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Rlc3RzL3Jlc291cmNl cy9tYWluLmpzCSh3b3JraW5nIGNvcHkpCkBAIC03MiwxMSArNzIsNiBAQCBmdW5jdGlvbiBBbmlt YXRvcihiZW5jaG1hcmspCiAKIEFuaW1hdG9yLnByb3RvdHlwZSA9CiB7Ci0gICAgc3RhcnQ6IGZ1 bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2ludGVydmFsSWQgPSBzZXRJbnRlcnZhbCh0 aGlzLmFuaW1hdGUuYmluZCh0aGlzKSwgMSk7Ci0gICAgfSwKLSAgICAKICAgICB0aW1lRGVsdGE6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9jdXJyZW50VGltZU9mZnNl dCAtIHRoaXMuX3N0YXJ0VGltZU9mZnNldDsKQEAgLTExNSwxNCArMTEwLDEwIEBAIEFuaW1hdG9y LnByb3RvdHlwZSA9CiAgICAgICAgIC8vIEFkanVzdCB0aGUgdGVzdCB0byByZWFjaCB0aGUgZGVz aXJlZCBGUFMuCiAgICAgICAgIHZhciByZXN1bHQgPSB0aGlzLl9iZW5jaG1hcmsudXBkYXRlKHRo aXMuX2N1cnJlbnRUaW1lT2Zmc2V0LCB0aGlzLnRpbWVEZWx0YSgpLCBjdXJyZW50RnJhbWVSYXRl KTsKICAgICAgICAgCi0gICAgICAgIC8vIFN0b3AgdGhlIGFuaW1hdG9yIGlmIHRoZSBiZW5jaG1h cmsgaGFzIGZpbmlzaGVkLgotICAgICAgICBpZiAoIXJlc3VsdCAmJiB0eXBlb2YgdGhpcy5faW50 ZXJ2YWxJZCAhPSAidW5kZWZpbmVkIikKLSAgICAgICAgICAgIGNsZWFySW50ZXJ2YWwodGhpcy5f aW50ZXJ2YWxJZCk7Ci0KICAgICAgICAgLy8gU3RhcnQgdGhlIG5leHQgZHJvcC9tZWFzdXJlIGN5 Y2xlLgogICAgICAgICB0aGlzLl9mcmFtZUNvdW50ID0gMDsKICAgICAgICAgCi0gICAgICAgIC8v IHJlc3VsdCBtYXkgc3RvcCB0aGUgYW5pbWF0b3IgaWYgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKCkg aGFzIGJlZW4gdXNlZC4KKyAgICAgICAgLy8gSWYgcmVzdWx0ID09IDAsIG5vIG1vcmUgcmVxdWVz dEFuaW1hdGlvbkZyYW1lKCkgd2lsbCBiZSBpbnZva2VkLgogICAgICAgICByZXR1cm4gcmVzdWx0 OwogICAgIH0sCiAgICAgCkBAIC0xMzYsOCArMTI3LDYgQEAgQW5pbWF0b3IucHJvdG90eXBlID0K IGZ1bmN0aW9uIEJlbmNobWFyayhvcHRpb25zKQogewogICAgIHRoaXMuX29wdGlvbnMgPSBvcHRp b25zOwotICAgIHRoaXMuX21ldGhvZCA9IHRoaXMuX29wdGlvbnNbIm1ldGhvZCJdIHx8ICJyZXF1 ZXN0QW5pbWF0aW9uRnJhbWUiOwotCiAgICAgdGhpcy5vcHRpb25zID0gb3B0aW9uczsKICAgICB0 aGlzLl9yZWNvcmRJbnRlcnZhbCA9IDIwMDsgICAgCiAgICAgdGhpcy5faXNTYW1wbGluZyA9IGZh bHNlOwpAQCAtMTU2LDEwICsxNDUsNyBAQCBCZW5jaG1hcmsucHJvdG90eXBlID0KICAgICAvLyBD YWxsZWQgZnJvbSB0aGUgbG9hZCBldmVudCBsaXN0ZW5lciBvciBmcm9tIHRoaXMucnVuKCkuCiAg ICAgc3RhcnQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9tZXRob2QgPT0g InNldEludGVydmFsIikKLSAgICAgICAgICAgIHRoaXMuX2FuaW1hdG9yLnN0YXJ0KCk7Ci0gICAg ICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMuX2FuaW1hdG9yLmFuaW1hdGVMb29wKCk7CisgICAg ICAgIHRoaXMuX2FuaW1hdG9yLmFuaW1hdGVMb29wKCk7CiAgICAgfSwKICAgICAKICAgICAvLyBD YWxsZWQgZnJvbSB0aGUgYW5pbWF0b3IgdG8gYWRqdXN0IHRoZSBjb21wbGV4aXR5IG9mIHRoZSB0 ZXN0Lgo= 265647 2015-11-16 17:41:06 -0800 2015-11-16 19:29:47 -0800 Patch bug-151283-20151116174057.patch text/plain 3250 sabouhallawa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTI1MDApCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTExLTE2ICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVt b3ZlIHRoZSBvcHRpb24gZm9yIGFuaW1hdGluZyB1c2luZyBzZXRJbnRlcnZhbCBmcm9tIHRoZSBn cmFwaGljcyBiZW5jaG1hcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MTI4MworCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorICAg ICAgICAKKyAgICAgICAgR2V0IHJpZCBvZiB0aGUgb3B0aW9uIHRvIHJ1biBhbmltYXRpb24gdXNp bmcgc2V0SW50ZXJ2YWwoKS4KKworICAgICAgICAqIEFuaW1vbWV0ZXIvdGVzdHMvcmVzb3VyY2Vz L21haW4uanM6CisgICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuYW5pbWF0ZSk6CisgICAgICAg IChCZW5jaG1hcmspOgorICAgICAgICAoQmVuY2htYXJrLnByb3RvdHlwZS5zdGFydCk6CisgICAg ICAgIChBbmltYXRvci5wcm90b3R5cGUuc3RhcnQpOiBEZWxldGVkLgorCiAyMDE1LTExLTE2ICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgSGln aGxpZ2h0IHRoZSBhbGFybWluZyB0ZXN0IHJlc3VsdHMgaW4gdGhlIGdyYXBoaWNzIGJlbmNobWFy ayByZXN1bHRzIHBhZ2UKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9y ZXNvdXJjZXMvbWFpbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0 ZXIvdGVzdHMvcmVzb3VyY2VzL21haW4uanMJKHJldmlzaW9uIDE5MjUwMCkKKysrIFBlcmZvcm1h bmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcwkod29ya2luZyBjb3B5 KQpAQCAtNzQsMTEgKzc0LDYgQEAgZnVuY3Rpb24gQW5pbWF0b3IoYmVuY2htYXJrLCBvcHRpb25z KQogCiBBbmltYXRvci5wcm90b3R5cGUgPQogewotICAgIHN0YXJ0OiBmdW5jdGlvbigpCi0gICAg ewotICAgICAgICB0aGlzLl9pbnRlcnZhbElkID0gc2V0SW50ZXJ2YWwodGhpcy5hbmltYXRlLmJp bmQodGhpcyksIDEpOwotICAgIH0sCi0gICAgCiAgICAgdGltZURlbHRhOiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICByZXR1cm4gdGhpcy5fY3VycmVudFRpbWVPZmZzZXQgLSB0aGlzLl9zdGFy dFRpbWVPZmZzZXQ7CkBAIC0xMTcsMTQgKzExMiwxMCBAQCBBbmltYXRvci5wcm90b3R5cGUgPQog ICAgICAgICAvLyBBZGp1c3QgdGhlIHRlc3QgdG8gcmVhY2ggdGhlIGRlc2lyZWQgRlBTLgogICAg ICAgICB2YXIgcmVzdWx0ID0gdGhpcy5fYmVuY2htYXJrLnVwZGF0ZSh0aGlzLl9jdXJyZW50VGlt ZU9mZnNldCwgdGhpcy50aW1lRGVsdGEoKSwgY3VycmVudEZyYW1lUmF0ZSk7CiAgICAgICAgIAot ICAgICAgICAvLyBTdG9wIHRoZSBhbmltYXRvciBpZiB0aGUgYmVuY2htYXJrIGhhcyBmaW5pc2hl ZC4KLSAgICAgICAgaWYgKCFyZXN1bHQgJiYgdHlwZW9mIHRoaXMuX2ludGVydmFsSWQgIT0gInVu ZGVmaW5lZCIpCi0gICAgICAgICAgICBjbGVhckludGVydmFsKHRoaXMuX2ludGVydmFsSWQpOwot CiAgICAgICAgIC8vIFN0YXJ0IHRoZSBuZXh0IGRyb3AvbWVhc3VyZSBjeWNsZS4KICAgICAgICAg dGhpcy5fZnJhbWVDb3VudCA9IDA7CiAgICAgICAgIAotICAgICAgICAvLyByZXN1bHQgbWF5IHN0 b3AgdGhlIGFuaW1hdG9yIGlmIHJlcXVlc3RBbmltYXRpb25GcmFtZSgpIGhhcyBiZWVuIHVzZWQu CisgICAgICAgIC8vIElmIHJlc3VsdCA9PSAwLCBubyBtb3JlIHJlcXVlc3RBbmltYXRpb25GcmFt ZSgpIHdpbGwgYmUgaW52b2tlZC4KICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9LAogICAg IApAQCAtMTM4LDggKzEyOSw2IEBAIEFuaW1hdG9yLnByb3RvdHlwZSA9CiBmdW5jdGlvbiBCZW5j aG1hcmsob3B0aW9ucykKIHsKICAgICB0aGlzLl9vcHRpb25zID0gb3B0aW9uczsKLSAgICB0aGlz Ll9tZXRob2QgPSB0aGlzLl9vcHRpb25zWyJtZXRob2QiXSB8fCAicmVxdWVzdEFuaW1hdGlvbkZy YW1lIjsKLQogICAgIHRoaXMuX3JlY29yZEludGVydmFsID0gMjAwOyAgICAKICAgICB0aGlzLl9p c1NhbXBsaW5nID0gZmFsc2U7CiAKQEAgLTE0Nyw3ICsxMzYsNyBAQCBmdW5jdGlvbiBCZW5jaG1h cmsob3B0aW9ucykKICAgICB2YXIgbG93VmFsdWUgPSAtcGFyc2VJbnQodGhpcy5fb3B0aW9uc1si YWRkTGltaXQiXSkgfHwgMTsKICAgICB2YXIgaGlnaFZhbHVlID0gcGFyc2VJbnQodGhpcy5fb3B0 aW9uc1sicmVtb3ZlTGltaXQiXSkgfHwgMTsKICAgICAKLSAgICB0aGlzLl9jb250cm9sbGVyID0g bmV3IFBJRENvbnRyb2xsZXIoZ2Fpbiwgb3B0aW9uc1siZnJhbWUtcmF0ZSJdLCBsb3dWYWx1ZSwg aGlnaFZhbHVlKTsKKyAgICB0aGlzLl9jb250cm9sbGVyID0gbmV3IFBJRENvbnRyb2xsZXIoZ2Fp biwgdGhpcy5fb3B0aW9uc1siZnJhbWUtcmF0ZSJdLCBsb3dWYWx1ZSwgaGlnaFZhbHVlKTsKICAg ICB0aGlzLl9zYW1wbGVyID0gbmV3IFNhbXBsZXIoMik7CiAgICAgdGhpcy5fc3RhdGUgPSBuZXcg QmVuY2htYXJrU3RhdGUodGhpcy5fb3B0aW9uc1sidGVzdC1pbnRlcnZhbCJdICogMTAwMCk7CiB9 CkBAIC0xNTcsMTAgKzE0Niw3IEBAIEJlbmNobWFyay5wcm90b3R5cGUgPQogICAgIC8vIENhbGxl ZCBmcm9tIHRoZSBsb2FkIGV2ZW50IGxpc3RlbmVyIG9yIGZyb20gdGhpcy5ydW4oKS4KICAgICBz dGFydDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX21ldGhvZCA9PSAic2V0 SW50ZXJ2YWwiKQotICAgICAgICAgICAgdGhpcy5fYW5pbWF0b3Iuc3RhcnQoKTsKLSAgICAgICAg ZWxzZQotICAgICAgICAgICAgdGhpcy5fYW5pbWF0b3IuYW5pbWF0ZUxvb3AoKTsKKyAgICAgICAg dGhpcy5fYW5pbWF0b3IuYW5pbWF0ZUxvb3AoKTsKICAgICB9LAogICAgIAogICAgIC8vIENhbGxl ZCBmcm9tIHRoZSBhbmltYXRvciB0byBhZGp1c3QgdGhlIGNvbXBsZXhpdHkgb2YgdGhlIHRlc3Qu Cg==