168224 2017-02-12 22:57:38 -0800 Address ESLint warnings in modern-media-controls 2017-02-14 01:13:02 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck commit-queue dino graouts oldest_to_newest 1276110 0 joepeck 2017-02-12 22:57:38 -0800 Address ESLint warnings in modern-media-controls All were pedantic (trailing whitespace, semicolons, === vs ==). Nothing to be concerned about! 1276111 1 301334 joepeck 2017-02-12 22:58:42 -0800 Created attachment 301334 [PATCH] Proposed Fix 1276572 2 301334 commit-queue 2017-02-13 21:59:22 -0800 Comment on attachment 301334 [PATCH] Proposed Fix Clearing flags on attachment: 301334 Committed r212276: <http://trac.webkit.org/changeset/212276> 1276573 3 commit-queue 2017-02-13 21:59:27 -0800 All reviewed patches have been landed. Closing bug. 1276644 4 graouts 2017-02-14 01:13:02 -0800 Thanks for the cleanup JoePeck! 301334 2017-02-12 22:58:42 -0800 2017-02-13 21:59:22 -0800 [PATCH] Proposed Fix eslint-1.patch text/plain 15273 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ODNmYzNjZDUyMS4uOGIxZTIyNmI2ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxNy0wMi0xMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIEFkZHJlc3MgRVNMaW50IHdhcm5pbmdzIGluIG1vZGVybi1tZWRpYS1j b250cm9scworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY4MjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9jb250cm9scy1iYXIuanM6 CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvZnVsbHNj cmVlbi1idXR0b24uanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv Y29udHJvbHMvbGF5b3V0LW5vZGUuanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvY29udHJvbHMvbWFjb3MtZnVsbHNjcmVlbi1tZWRpYS1jb250cm9scy5qczoKKyAg ICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tZWRpYS1jb250 cm9scy5qczoKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9s cy9zY2hlZHVsZXIuanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv Y29udHJvbHMvc2Vlay1idXR0b24uanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvY29udHJvbHMvdHJhY2tzLXBhbmVsLmpzOgorICAgICAgICAqIE1vZHVsZXMvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3ZvbHVtZS1zbGlkZXIuanM6CisgICAgICAgICog TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvZ2VzdHVyZS1yZWNvZ25pemVycy9nZXN0dXJl LXJlY29nbml6ZXIuanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv Z2VzdHVyZS1yZWNvZ25pemVycy9waW5jaC5qczoKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS9mdWxsc2NyZWVuLXN1cHBvcnQuanM6CisgICAgICAgICogTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qczoKKyAg ICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9wbGFjYXJkLXN1cHBv cnQuanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvc3Rh dHVzLXN1cHBvcnQuanM6CisgICAgICAgIEFkZHJlc3MgcGVkYW50aWMgd2FybmluZ3MuCisKIDIw MTctMDItMTIgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBUcmll ZCB0byBmaXggVVNFKEFQUExFX0lOVEVSTkFMX1NESykgYnVpbGRzIGFmdGVyIHIyMTIyMTEuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9jb250cm9scy1iYXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9jb250cm9scy9jb250cm9scy1iYXIuanMKaW5kZXggMmE4OTk1OTQyMWQu LjI1MTQ2YjgzMzEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9jb250cm9scy9jb250cm9scy1iYXIuanMKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvY29udHJvbHMtYmFyLmpz CkBAIC01Miw3ICs1Miw3IEBAIGNsYXNzIENvbnRyb2xzQmFyIGV4dGVuZHMgTGF5b3V0Tm9kZQog ICAgIHNldCB0cmFuc2xhdGlvbihwb2ludCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl90cmFu c2xhdGlvbi54ID09PSBwb2ludC54ICYmIHRoaXMuX3RyYW5zbGF0aW9uLnkgPT09IHBvaW50Lnkp Ci0gICAgICAgICAgICByZXR1cm4KKyAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlz Ll90cmFuc2xhdGlvbiA9IG5ldyBET01Qb2ludChwb2ludC54LCBwb2ludC55KTsKICAgICAgICAg dGhpcy5tYXJrRGlydHlQcm9wZXJ0eSgidHJhbnNsYXRpb24iKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2Z1bGxzY3Jl ZW4tYnV0dG9uLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvZnVsbHNjcmVlbi1idXR0b24uanMKaW5kZXggYjUxMTZjNjlkYTQuLjljN2Jm ZDc5MjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9jb250cm9scy9mdWxsc2NyZWVuLWJ1dHRvbi5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9mdWxsc2NyZWVuLWJ1dHRv bi5qcwpAQCAtMzIsNyArMzIsNyBAQCBjbGFzcyBGdWxsc2NyZWVuQnV0dG9uIGV4dGVuZHMgSWNv bkJ1dHRvbgogICAgICAgICAgICAgY3NzQ2xhc3NOYW1lOiAiZnVsbHNjcmVlbiIsCiAgICAgICAg ICAgICBsYXlvdXREZWxlZ2F0ZQogICAgICAgICB9KTsKLSAgICAgICAgCisKICAgICAgICAgdGhp cy5pY29uTmFtZSA9IHRoaXMubGF5b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRzLkZ1bGxzY3JlZW4g PyBJY29ucy5FeGl0RnVsbHNjcmVlbiA6IEljb25zLkVudGVyRnVsbHNjcmVlbjsKICAgICB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L2NvbnRyb2xzL2xheW91dC1ub2RlLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvY29udHJvbHMvbGF5b3V0LW5vZGUuanMKaW5kZXggMjJjOTRhNzFhMmIu LjJhODdmMjdkNjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9jb250cm9scy9sYXlvdXQtbm9kZS5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9sYXlvdXQtbm9kZS5qcwpA QCAtMjMsNyArMjMsNyBAQCBjbGFzcyBMYXlvdXROb2RlCiAgICAgICAgIHRoaXMuX3dpZHRoID0g MDsKICAgICAgICAgdGhpcy5faGVpZ2h0ID0gMDsKICAgICAgICAgdGhpcy5fdmlzaWJsZSA9IHRy dWU7Ci0gICAgCisKICAgICAgICAgdGhpcy5fbmVlZHNMYXlvdXQgPSBmYWxzZTsKICAgICAgICAg dGhpcy5fZGlydHlQcm9wZXJ0aWVzID0gbmV3IFNldDsKIApAQCAtMTI4LDcgKzEyOCw3IEBAIGNs YXNzIExheW91dE5vZGUKICAgICB7CiAgICAgICAgIHdoaWxlICh0aGlzLl9jaGlsZHJlbi5sZW5n dGgpCiAgICAgICAgICAgICB0aGlzLnJlbW92ZUNoaWxkKHRoaXMuX2NoaWxkcmVuWzBdKTsKLSAg ICAgICAgCisKICAgICAgICAgZm9yIChsZXQgY2hpbGQgb2YgY2hpbGRyZW4pCiAgICAgICAgICAg ICB0aGlzLmFkZENoaWxkKGNoaWxkKTsKICAgICB9CkBAIC0yNjgsNyArMjY4LDcgQEAgY2xhc3Mg TGF5b3V0Tm9kZQogICAgICAgICBmb3IgKGxldCBpID0gdGhpcy5jaGlsZHJlbi5sZW5ndGggLSAx OyBpID49IDA7IC0taSkgewogICAgICAgICAgICAgbGV0IGNoaWxkID0gdGhpcy5jaGlsZHJlbltp XTsKICAgICAgICAgICAgIGxldCBjaGlsZEVsZW1lbnQgPSBjaGlsZC5lbGVtZW50OwotICAgICAg ICAKKwogICAgICAgICAgICAgaWYgKGNoaWxkLl9wZW5kaW5nRE9NTWFuaXB1bGF0aW9uID09PSBM YXlvdXROb2RlLkRPTU1hbmlwdWxhdGlvbi5BZGRpdGlvbikgewogICAgICAgICAgICAgICAgIGVs ZW1lbnQuaW5zZXJ0QmVmb3JlKGNoaWxkRWxlbWVudCwgbmV4dENoaWxkRWxlbWVudCk7CiAgICAg ICAgICAgICAgICAgY2hpbGQuX3BlbmRpbmdET01NYW5pcHVsYXRpb24gPSBMYXlvdXROb2RlLkRP TU1hbmlwdWxhdGlvbi5Ob25lOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtZnVsbHNjcmVlbi1tZWRpYS1jb250 cm9scy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL21hY29zLWZ1bGxzY3JlZW4tbWVkaWEtY29udHJvbHMuanMKaW5kZXggYzY2ZjE2YmZj NWQuLmM4MmUzNDJkNGE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVy bi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1mdWxsc2NyZWVuLW1lZGlhLWNvbnRyb2xz LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL21hY29zLWZ1bGxzY3JlZW4tbWVkaWEtY29udHJvbHMuanMKQEAgLTE0OSw3ICsxNDks NyBAQCBjbGFzcyBNYWNPU0Z1bGxzY3JlZW5NZWRpYUNvbnRyb2xzIGV4dGVuZHMgTWFjT1NNZWRp YUNvbnRyb2xzCiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzQmFyLnRyYW5zbGF0aW9uLnggKyBj dXJyZW50RHJhZ1BvaW50LnggLSB0aGlzLl9sYXN0RHJhZ1BvaW50LngsCiAgICAgICAgICAgICB0 aGlzLmNvbnRyb2xzQmFyLnRyYW5zbGF0aW9uLnkgKyBjdXJyZW50RHJhZ1BvaW50LnkgLSB0aGlz Ll9sYXN0RHJhZ1BvaW50LnkKICAgICAgICAgKTsKLSAgICAgICAgCisKICAgICAgICAgdGhpcy5f bGFzdERyYWdQb2ludCA9IGN1cnJlbnREcmFnUG9pbnQ7CiAgICAgfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tZWRp YS1jb250cm9scy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmpzCmluZGV4IDdmMTNhOWQ4MGNkLi4zMDY4N2M1 ZWE0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvY29udHJvbHMvbWVkaWEtY29udHJvbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWVkaWEtY29udHJvbHMuanMKQEAg LTQ0LDcgKzQ0LDcgQEAgY2xhc3MgTWVkaWFDb250cm9scyBleHRlbmRzIExheW91dE5vZGUKICAg ICAgICAgdGhpcy5waXBCdXR0b24gPSBuZXcgUGlQQnV0dG9uKHRoaXMpOwogICAgICAgICB0aGlz LmZ1bGxzY3JlZW5CdXR0b24gPSBuZXcgRnVsbHNjcmVlbkJ1dHRvbih0aGlzKTsKIAotICAgICAg ICB0aGlzLnN0YXR1c0xhYmVsID0gbmV3IFN0YXR1c0xhYmVsKHRoaXMpCisgICAgICAgIHRoaXMu c3RhdHVzTGFiZWwgPSBuZXcgU3RhdHVzTGFiZWwodGhpcyk7CiAgICAgICAgIHRoaXMudGltZUNv bnRyb2wgPSBuZXcgVGltZUNvbnRyb2wodGhpcyk7CiAKICAgICAgICAgdGhpcy5jb250cm9sc0Jh ciA9IG5ldyBDb250cm9sc0Jhcih0aGlzKTsKQEAgLTY3LDcgKzY3LDcgQEAgY2xhc3MgTWVkaWFD b250cm9scyBleHRlbmRzIExheW91dE5vZGUKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9zaG93 c1N0YXJ0QnV0dG9uID09PSBmbGFnKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgIAorCiAg ICAgICAgIHRoaXMuX3Nob3dzU3RhcnRCdXR0b24gPSBmbGFnOwogICAgICAgICB0aGlzLl9pbnZh bGlkYXRlQ2hpbGRyZW4oKTsKICAgICB9CkBAIC04NiwxMiArODYsMTIgQEAgY2xhc3MgTWVkaWFD b250cm9scyBleHRlbmRzIExheW91dE5vZGUKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9z Y2FsZUZhY3RvcjsKICAgICB9Ci0gICAgCisKICAgICBzZXQgc2NhbGVGYWN0b3Ioc2NhbGVGYWN0 b3IpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fc2NhbGVGYWN0b3IgPT09IHNjYWxlRmFjdG9y KQogICAgICAgICAgICAgcmV0dXJuOwotICAgIAorCiAgICAgICAgIHRoaXMuX3NjYWxlRmFjdG9y ID0gc2NhbGVGYWN0b3I7CiAgICAgICAgIHRoaXMubWFya0RpcnR5UHJvcGVydHkoInNjYWxlRmFj dG9yIik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvY29udHJvbHMvc2NoZWR1bGVyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvc2NoZWR1bGVyLmpzCmluZGV4IDI1 MWQ4MDRhYWVmLi5mODViZWIwMzcxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvc2NoZWR1bGVyLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3NjaGVkdWxl ci5qcwpAQCAtNDcsNyArNDcsNyBAQCBjb25zdCBzY2hlZHVsZXIgPSBuZXcgY2xhc3MKIAogICAg ICAgICB0aGlzLl9sYXlvdXQoKTsKICAgICAgICAgdGhpcy5fZnJhbWVJRCA9IC0xOwotICAgICAg ICB0aGlzLl9yZXF1ZXN0RnJhbWVJZk5lZWRlZCgpOyAgIAorICAgICAgICB0aGlzLl9yZXF1ZXN0 RnJhbWVJZk5lZWRlZCgpOwogCiAgICAgICAgIGlmICh0eXBlb2Ygc2NoZWR1bGVyLmZyYW1lRGlk RmlyZSA9PT0gImZ1bmN0aW9uIikKICAgICAgICAgICAgIHNjaGVkdWxlci5mcmFtZURpZEZpcmUo KTsKQEAgLTYzLDQgKzYzLDQgQEAgY29uc3Qgc2NoZWR1bGVyID0gbmV3IGNsYXNzCiAgICAgICAg ICAgICBjYWxsYmFjaygpOwogICAgIH0KIAotfQorfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3NlZWstYnV0dG9uLmpz IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMv c2Vlay1idXR0b24uanMKaW5kZXggMzY3NDUyOTA0YzIuLmM3MmMxZjE2NTNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9z ZWVrLWJ1dHRvbi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9jb250cm9scy9zZWVrLWJ1dHRvbi5qcwpAQCAtNTIsNyArNTIsNyBAQCBjbGFzcyBT ZWVrQnV0dG9uIGV4dGVuZHMgSWNvbkJ1dHRvbgogICAgICAgICBjb25zdCBtZWRpYUNvbnRyb2xz ID0gdGhpcy5wYXJlbnRPZlR5cGUoTWVkaWFDb250cm9scyk7CiAgICAgICAgIGlmICghbWVkaWFD b250cm9scykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIAorCiAgICAgICAgIHRo aXMuX21vdXNldXBUYXJnZXQgPSBtZWRpYUNvbnRyb2xzLmVsZW1lbnQ7CiAgICAgICAgIHRoaXMu X21vdXNldXBUYXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V1cCIsIHRoaXMsIHRydWUpOwog ICAgICAgICB0aGlzLl9ub3RpZnlEZWxlZ2F0ZU9mUHJlc3NpbmdTdGF0ZSh0cnVlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRy b2xzL3RyYWNrcy1wYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL3RyYWNrcy1wYW5lbC5qcwppbmRleCBhZjk5ZGYzZDBlNi4uMTQ2 YzZjMWU3MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL3RyYWNrcy1wYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90cmFja3MtcGFuZWwuanMKQEAg LTQ1LDcgKzQ1LDcgQEAgY2xhc3MgVHJhY2tzUGFuZWwgZXh0ZW5kcyBMYXlvdXROb2RlCiAgICAg ICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJ0cmFuc2l0aW9uZW5kIiwgdGhpcyk7 CiAKICAgICAgICAgLy8gRW5zdXJlIGEgdHJhbnNpdGlvbiB3aWxsIGluZGVlZCBoYXBwZW4gYnkg c3RhcnRpbmcgaXQgb25seSBvbiB0aGUgbmV4dCBmcmFtZS4KLSAgICAgICAgd2luZG93LnJlcXVl c3RBbmltYXRpb25GcmFtZSgoKSA9PiB7IHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJmYWRl LW91dCIpIH0pOworICAgICAgICB3aW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IHsg dGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImZhZGUtb3V0Iik7IH0pOwogICAgIH0KIAogICAg IGdldCBib3R0b21ZKCkKQEAgLTEzNSwxMyArMTM1LDEzIEBAIGNsYXNzIFRyYWNrc1BhbmVsIGV4 dGVuZHMgTGF5b3V0Tm9kZQogICAgICAgICBjb25zdCBjaGlsZHJlbiA9IFtdOwogCiAgICAgICAg IHRoaXMuX3RyYWNrTm9kZXMgPSBbXTsKLSAgICAgICAgCisKICAgICAgICAgY29uc3QgZGF0YVNv dXJjZSA9IHRoaXMuZGF0YVNvdXJjZTsKICAgICAgICAgaWYgKCFkYXRhU291cmNlKQogICAgICAg ICAgICAgcmV0dXJuIGNoaWxkcmVuOwotICAgICAgICAKKwogICAgICAgICBjb25zdCBudW1iZXJP ZlNlY3Rpb25zID0gZGF0YVNvdXJjZS50cmFja3NQYW5lbE51bWJlck9mU2VjdGlvbnMoKTsKLSAg ICAgICAgaWYgKG51bWJlck9mU2VjdGlvbnMgPT0gMCkKKyAgICAgICAgaWYgKG51bWJlck9mU2Vj dGlvbnMgPT09IDApCiAgICAgICAgICAgICByZXR1cm4gY2hpbGRyZW47CiAKICAgICAgICAgZm9y IChsZXQgc2VjdGlvbkluZGV4ID0gMDsgc2VjdGlvbkluZGV4IDwgbnVtYmVyT2ZTZWN0aW9uczsg KytzZWN0aW9uSW5kZXgpIHsKQEAgLTE1MiwxMyArMTUyLDEzIEBAIGNsYXNzIFRyYWNrc1BhbmVs IGV4dGVuZHMgTGF5b3V0Tm9kZQogICAgICAgICAgICAgbGV0IG51bWJlck9mVHJhY2tzID0gZGF0 YVNvdXJjZS50cmFja3NQYW5lbE51bWJlck9mVHJhY2tzSW5TZWN0aW9uKHNlY3Rpb25JbmRleCk7 CiAgICAgICAgICAgICBmb3IgKGxldCB0cmFja0luZGV4ID0gMDsgdHJhY2tJbmRleCA8IG51bWJl ck9mVHJhY2tzOyArK3RyYWNrSW5kZXgpIHsKICAgICAgICAgICAgICAgICBsZXQgdHJhY2tUaXRs ZSA9IGRhdGFTb3VyY2UudHJhY2tzUGFuZWxUaXRsZUZvclRyYWNrSW5TZWN0aW9uKHRyYWNrSW5k ZXgsIHNlY3Rpb25JbmRleCk7Ci0gICAgICAgICAgICAgICAgbGV0IHRyYWNrU2VsZWN0ZWQgPSBk YXRhU291cmNlLnRyYWNrc1BhbmVsSXNUcmFja0luU2VjdGlvblNlbGVjdGVkKHRyYWNrSW5kZXgs IHNlY3Rpb25JbmRleCkKKyAgICAgICAgICAgICAgICBsZXQgdHJhY2tTZWxlY3RlZCA9IGRhdGFT b3VyY2UudHJhY2tzUGFuZWxJc1RyYWNrSW5TZWN0aW9uU2VsZWN0ZWQodHJhY2tJbmRleCwgc2Vj dGlvbkluZGV4KTsKICAgICAgICAgICAgICAgICBsZXQgdHJhY2tOb2RlID0gdHJhY2tzTGlzdE5v ZGUuYWRkQ2hpbGQobmV3IFRyYWNrTm9kZSh0cmFja0luZGV4LCBzZWN0aW9uSW5kZXgsIHRyYWNr VGl0bGUsIHRyYWNrU2VsZWN0ZWQsIHRoaXMpKTsKICAgICAgICAgICAgICAgICB0aGlzLl90cmFj a05vZGVzLnB1c2godHJhY2tOb2RlKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNoaWxk cmVuLnB1c2goc2VjdGlvbk5vZGUpOwogICAgICAgICB9Ci0gICAgICAgIAorCiAgICAgICAgIHJl dHVybiBjaGlsZHJlbjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3ZvbHVtZS1zbGlkZXIuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy92b2x1bWUt c2xpZGVyLmpzCmluZGV4IDI5YjZkZmYwNGUxLi45MWViZTRlNzYwNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdm9sdW1l LXNsaWRlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250 cm9scy9jb250cm9scy92b2x1bWUtc2xpZGVyLmpzCkBAIC0yNSw3ICsyNSw3IEBACiAKIGNsYXNz IFZvbHVtZVNsaWRlciBleHRlbmRzIFNsaWRlcgogewotICAgIAorCiAgICAgY29uc3RydWN0b3Io KQogICAgIHsKICAgICAgICAgc3VwZXIoInZvbHVtZSIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvZ2VzdHVyZS1yZWNvZ25pemVycy9n ZXN0dXJlLXJlY29nbml6ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9nZXN0dXJlLXJlY29nbml6ZXJzL2dlc3R1cmUtcmVjb2duaXplci5qcwppbmRl eCA3NjBmOTQ2ZmU0Yi4uYzFlYzg1NzJhZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2dlc3R1cmUtcmVjb2duaXplcnMvZ2VzdHVyZS1y ZWNvZ25pemVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2dlc3R1cmUtcmVjb2duaXplcnMvZ2VzdHVyZS1yZWNvZ25pemVyLmpzCkBAIC02MCw3 ICs2MCw3IEBAIGNsYXNzIEdlc3R1cmVSZWNvZ25pemVyCiAgICAgewogICAgICAgICByZXR1cm4g dGhpcy5fZW5hYmxlZDsKICAgICB9Ci0gICAgCisKICAgICBzZXQgZW5hYmxlZChlbmFibGVkKQog ICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2VuYWJsZWQgPT09IGVuYWJsZWQpCkBAIC0yOTksMTQg KzI5OSwxNCBAQCBjbGFzcyBHZXN0dXJlUmVjb2duaXplcgogICAgICAgICAgICAgaWYgKGV2ZW50 LnR5cGUgPT09IEdlc3R1cmVSZWNvZ25pemVyLkV2ZW50cy5Ub3VjaEVuZCkKICAgICAgICAgICAg ICAgICB0aGlzLl90YXJnZXRUb3VjaGVzID0gW107CiAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgdGhpcy5fdGFyZ2V0VG91Y2hlcyA9IFtldmVudF0KKyAgICAgICAgICAgICAgICB0 aGlzLl90YXJnZXRUb3VjaGVzID0gW2V2ZW50XTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQogCiAgICAgICAgIGlmICghKGV2ZW50IGluc3RhbmNlb2YgVG91Y2hFdmVudCkpCiAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgLy8gV2l0aCBhIHRvdWNoc3RhcnQgZXZlbnQsIGV2 ZW50LnRhcmdldFRvdWNoZXMgaXMgYWNjdXJhdGUgc28gCisgICAgICAgIC8vIFdpdGggYSB0b3Vj aHN0YXJ0IGV2ZW50LCBldmVudC50YXJnZXRUb3VjaGVzIGlzIGFjY3VyYXRlIHNvCiAgICAgICAg IC8vIHdlIHNpbXBseSBhZGQgYWxsIG9mIHRob3NlLgogICAgICAgICBpZiAoZXZlbnQudHlwZSA9 PT0gR2VzdHVyZVJlY29nbml6ZXIuRXZlbnRzLlRvdWNoU3RhcnQpIHsKICAgICAgICAgICAgIHRo aXMuX3RhcmdldFRvdWNoZXMgPSBbXTsKQEAgLTM1Miw3ICszNTIsNyBAQCBjbGFzcyBHZXN0dXJl UmVjb2duaXplcgogICAgICAgICB0aGlzLm1vZGlmaWVyS2V5cy5tZXRhID0gZXZlbnQubWV0YUtl eTsKICAgICAgICAgdGhpcy5tb2RpZmllcktleXMuc2hpZnQgPSBldmVudC5zaGlmdEtleTsKICAg ICB9Ci0gICAgCisKIH0KIAogR2VzdHVyZVJlY29nbml6ZXIuU3VwcG9ydHNUb3VjaGVzID0gImNy ZWF0ZVRvdWNoIiBpbiBkb2N1bWVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2dlc3R1cmUtcmVjb2duaXplcnMvcGluY2guanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9nZXN0dXJlLXJlY29n bml6ZXJzL3BpbmNoLmpzCmluZGV4IDczNTllOTMyZWQ2Li4xMmJmMDcxM2ExMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvZ2VzdHVyZS1y ZWNvZ25pemVycy9waW5jaC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9nZXN0dXJlLXJlY29nbml6ZXJzL3BpbmNoLmpzCkBAIC00Niw3ICs0Niw3 IEBAIGNsYXNzIFBpbmNoR2VzdHVyZVJlY29nbml6ZXIgZXh0ZW5kcyBHZXN0dXJlUmVjb2duaXpl cgogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg Ly8gV2UgY2FuIG9ubHkgc3RhcnQgdHJhY2tpbmcgdG91Y2hlcyB3aXRoIDIgZmluZ2Vycy4gCisg ICAgICAgICAgICAvLyBXZSBjYW4gb25seSBzdGFydCB0cmFja2luZyB0b3VjaGVzIHdpdGggMiBm aW5nZXJzLgogICAgICAgICAgICAgaWYgKHRoaXMubnVtYmVyT2ZUb3VjaGVzICE9PSAyKQogICAg ICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMTkzLDcgKzE5Myw3IEBAIGNsYXNzIFBpbmNoR2Vz dHVyZVJlY29nbml6ZXIgZXh0ZW5kcyBHZXN0dXJlUmVjb2duaXplcgogICAgIHsKICAgICAgICAg Y29uc29sZS5hc3NlcnQodGhpcy5udW1iZXJPZlRvdWNoZXMgPT09IDIpOwogCi0gICAgICAgIGNv bnN0IGZpcnN0VG91Y2ggPSB0aGlzLl90YXJnZXRUb3VjaGVzWzBdCisgICAgICAgIGNvbnN0IGZp cnN0VG91Y2ggPSB0aGlzLl90YXJnZXRUb3VjaGVzWzBdOwogICAgICAgICBjb25zdCBmaXJzdFRv dWNoUG9pbnQgPSBuZXcgRE9NUG9pbnQoZmlyc3RUb3VjaC5wYWdlWCwgZmlyc3RUb3VjaC5wYWdl WSk7CiAKICAgICAgICAgY29uc3Qgc2Vjb25kVG91Y2ggPSB0aGlzLl90YXJnZXRUb3VjaGVzWzFd OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvbWVkaWEvZnVsbHNjcmVlbi1zdXBwb3J0LmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvZnVsbHNjcmVlbi1zdXBwb3J0LmpzCmluZGV4IGEx OGFlN2EzMGRlLi41NmY5OThjNDAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvZnVsbHNjcmVlbi1zdXBwb3J0LmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL2Z1bGxz Y3JlZW4tc3VwcG9ydC5qcwpAQCAtNjQsNyArNjQsNyBAQCBjbGFzcyBGdWxsc2NyZWVuU3VwcG9y dCBleHRlbmRzIE1lZGlhQ29udHJvbGxlclN1cHBvcnQKICAgICB7CiAgICAgICAgIHRoaXMubWVk aWFDb250cm9sbGVyLm1lZGlhLndlYmtpdEVudGVyRnVsbHNjcmVlbigpOwogICAgIH0KLSAgICAK KwogICAgIHN5bmNDb250cm9sKCkKICAgICB7CiAgICAgICAgIGNvbnN0IGNvbnRyb2wgPSB0aGlz LmNvbnRyb2w7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qcwppbmRl eCBjNzBjNmYzZWZkZS4uNDViOWU3MzNmZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVk aWEtY29udHJvbGxlci5qcwpAQCAtMTQ2LDcgKzE0Niw3IEBAIGNsYXNzIE1lZGlhQ29udHJvbGxl cgogICAgICAgICAgICAgdGhpcy5jb250YWluZXIucmVwbGFjZUNoaWxkKHRoaXMuY29udHJvbHMu ZWxlbWVudCwgcHJldmlvdXNDb250cm9scy5lbGVtZW50KTsKICAgICAgICAgICAgIHRoaXMuY29u dHJvbHMudXNlc0xUUlVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24gPSBwcmV2aW91c0NvbnRy b2xzLnVzZXNMVFJVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uOwogICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgIHRoaXMuY29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMuZWxl bWVudCk7ICAgICAgICAKKyAgICAgICAgICAgIHRoaXMuY29udGFpbmVyLmFwcGVuZENoaWxkKHRo aXMuY29udHJvbHMuZWxlbWVudCk7CiAKICAgICAgICAgdGhpcy5jb250cm9scy5sYXlvdXRUcmFp dHMgPSBsYXlvdXRUcmFpdHM7CiAgICAgICAgIHRoaXMuX3VwZGF0ZUNvbnRyb2xzU2l6ZSgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv bWVkaWEvcGxhY2FyZC1zdXBwb3J0LmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvbWVkaWEvcGxhY2FyZC1zdXBwb3J0LmpzCmluZGV4IDI1Y2NhMjg2ODZi Li41ZWY0MDFjMjZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvbWVkaWEvcGxhY2FyZC1zdXBwb3J0LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3BsYWNhcmQtc3VwcG9ydC5q cwpAQCAtNTgsNyArNTgsNyBAQCBjbGFzcyBQbGFjYXJkU3VwcG9ydCBleHRlbmRzIE1lZGlhQ29u dHJvbGxlclN1cHBvcnQKICAgICAgICAgZWxzZSBpZiAobWVkaWEgaW5zdGFuY2VvZiBIVE1MVmlk ZW9FbGVtZW50ICYmIG1lZGlhLmVycm9yICE9PSBudWxsICYmIG1lZGlhLnBsYXllZC5sZW5ndGgg PT09IDApCiAgICAgICAgICAgICBjb250cm9scy5zaG93UGxhY2FyZChjb250cm9scy5pbnZhbGlk UGxhY2FyZCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNvbnRyb2xzLmhpZGVQbGFjYXJk KCk7ICAgIAorICAgICAgICAgICAgY29udHJvbHMuaGlkZVBsYWNhcmQoKTsKICAgICB9CiAKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L21lZGlhL3N0YXR1cy1zdXBwb3J0LmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvbWVkaWEvc3RhdHVzLXN1cHBvcnQuanMKaW5kZXggMDRiNTU0ZTdhZmIu LjIyNzY3ZDg4YTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS9zdGF0dXMtc3VwcG9ydC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9zdGF0dXMtc3VwcG9ydC5qcwpA QCAtNTMsNCArNTMsMyBAQCBjbGFzcyBTdGF0dXNTdXBwb3J0IGV4dGVuZHMgTWVkaWFDb250cm9s bGVyU3VwcG9ydAogICAgIH0KIAogfQotIApcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK