141780 2015-02-18 16:46:34 -0800 Sufficiently small media controls should remove toolbar elements 2015-02-19 10:38:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino oldest_to_newest 1070281 0 dino 2015-02-18 16:46:34 -0800 Sufficiently small media controls should remove toolbar elements 1070283 1 dino 2015-02-18 16:54:22 -0800 <rdar://problem/16548548> <rdar://problem/17598778> <rdar://problem/18351963> 1070287 2 246861 dino 2015-02-18 17:12:37 -0800 Created attachment 246861 Patch 1070389 3 246861 eric.carlson 2015-02-19 05:58:40 -0800 Comment on attachment 246861 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246861&action=review > Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js:675 > + this.scheduleUpdateLayoutForDisplayedWidth(); Do you mean to call scheduleUpdateFor... twice here? 1070435 4 dino 2015-02-19 10:38:52 -0800 Committed r180347: <http://trac.webkit.org/changeset/180347> 246861 2015-02-18 17:12:37 -0800 2015-02-19 05:58:40 -0800 Patch fix.patch text/plain 10522 dino ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YzJjMDE4Li4xZGMwYTc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcg QEAKKzIwMTUtMDItMTggIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAg IFN1ZmZpY2llbnRseSBzbWFsbCBtZWRpYSBjb250cm9scyBzaG91bGQgcmVtb3ZlIHRvb2xiYXIg ZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0MTc4MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTY1NDg1NDg+CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xNzU5ODc3OD4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4MzUxOTYzPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVu dCBzb21lIGxvZ2ljIHdoZXJlIGVsZW1lbnRzIG9uIHRoZSBtZWRpYSBjb250cm9scyBhcmUKKyAg ICAgICAgaGlkZGVuIHdoZW4gdGhlcmUgaXNuJ3QgZW5vdWdoIHJvb20uIFdlIHN0YXJ0IGJ5IGRy b3BwaW5nCisgICAgICAgIHRoZSBzY3J1YmJlciwgdGhlbiB0aGUgdmFyaW91cyBidXR0b25zIG9u IHRoZSByaWdodCBoYW5kCisgICAgICAgIHNpZGUuCisKKyAgICAgICAgVGhpcyBzb2x1dGlvbiBp c24ndCBwZXJmZWN0LiBJZiB3ZSBoYWQgcGVyZmVjdGlvbiwgaXQgd291bGQKKyAgICAgICAgYmUg YmVjYXVzZSB3ZSBnZXQgcmVzaXplIGV2ZW50cyBhbmQgcmVzcG9uZCBhY2NvcmRpbmdseS4gSW5z dGVhZAorICAgICAgICB3ZSBjaGVjayB0aGUgc2l6ZSB3aGVuIHRoZSB1c2VyIGhhcyBwaW5jaC16 b29tZWQsIG9yIHdoZW4KKyAgICAgICAgd2Ugc3RhcnQvc3RvcCBwbGF5aW5nLgorCisgICAgICAg IFRoaXMgaXMgZ29pbmcgdG8gY2F1c2Ugc29tZSBleHRyYSBsYXlvdXQsIGJlY2F1c2Ugd2UgbmVl ZAorICAgICAgICB0byBrbm93IHRoZSBzaXplIG9mIHRoaW5ncyBiZWZvcmUgd2UgY2FuIHdvcmsg b3V0IHdoaWNoCisgICAgICAgIGJpdHMgdG8gaGlkZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVk aWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzczoKKyAgICAgICAgKDo6LXdlYmtpdC1tZWRp YS1jb250cm9scyk6IFJlbW92ZSB0aGUgbWluaW11bSB3aWR0aC4gVGhpcyBjYW4KKyAgICAgICAg Y2F1c2UgdGhlIGNvbnRyb2xzIHRvIGdldCBjbGlwcGVkLgorICAgICAgICAoYXVkaW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtc3BhY2VyKTogQWRkIHRoaXMgZW1wdHkgZWxlbWVudCB0bworICAg ICAgICByZXBsYWNlIHRoZSBzY3J1YmJlciB3aGVuIGl0IGlzIGhpZGRlbi4KKyAgICAgICAgKGF1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lcik6CisgICAgICAg ICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanM6CisgICAgICAgIChD b250cm9sbGVySU9TKTogUmVtZW1iZXIgb3VyIHNpemUgc28gd2UgZG9uJ3QgY2h1cm4uCisgICAg ICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5jcmVhdGVDb250cm9scyk6IENyZWF0ZSBhIG5l dyBzcGFjZXIgZWxlbWVudC4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLmNvbmZp Z3VyZUlubGluZUNvbnRyb2xzKToKKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnNo b3dDb250cm9scyk6IENoZWNrIGlmIHdlIG5lZWQgdG8gaGlkZSBzdHVmZi4KKyAgICAgICAgKENv bnRyb2xsZXJJT1MucHJvdG90eXBlLnVwZGF0ZUNvbnRyb2xzKToKKyAgICAgICAgKENvbnRyb2xs ZXJJT1MucHJvdG90eXBlLnNldFBsYXlpbmcpOiBEaXR0by4KKyAgICAgICAgKENvbnRyb2xsZXJJ T1MucHJvdG90eXBlLnNldCBwYWdlU2NhbGVGYWN0b3IpOiBEaXR0by4KKyAgICAgICAgKENvbnRy b2xsZXJJT1MucHJvdG90eXBlLnNjaGVkdWxlVXBkYXRlTGF5b3V0Rm9yRGlzcGxheWVkV2lkdGgp OiBUcmlnZ2VyIGFuIHVwZGF0ZQorICAgICAgICBhc2FwLiBJbiB0aGlzIGNhc2UgaXQncyBwcm9i YWJseSBvayB0byBiZSBpbiBhIGJhZCBzdGF0ZSBmb3IgYSBmcmFtZSwgb3IKKyAgICAgICAgd2Ug YXJlIGluc2lkZSBzZXR1cCBhbmQgd2Uga25vdyB0aGF0IHdlJ2xsIGxheW91dCBzb29uLgorICAg ICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUudXBkYXRlTGF5b3V0Rm9yRGlzcGxheWVkV2lk dGgpOiBUaGUgYWN0dWFsIGNvZGUKKyAgICAgICAgdGhhdCBoaWRlcyBlbGVtZW50cy4KKwogMjAx NS0wMi0xNiAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVT U0lPTjogVmlkZW8gY29udHJvbCBmYWlscyB0byBoaWRlIGFmdGVyIHBsYXliYWNrIGJlZ2lucyBp biByZWZsb3dhYmxlIEVQVUIgZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcwppbmRleCAwMzA1ZTlkLi41 ZGRmODk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMv bWVkaWFDb250cm9sc2lPUy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNv bnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3NzCkBAIC01OSw3ICs1OSw2IEBAIHZpZGVvOi13ZWJr aXQtZnVsbC1wYWdlLW1lZGlhOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIHsKICAgICAt d2Via2l0LWZsZXgtZGlyZWN0aW9uOiBjb2x1bW47CiAgICAgZm9udC1mYW1pbHk6IC1hcHBsZS1z eXN0ZW0tZm9udDsKICAgICBvdmVyZmxvdzogaGlkZGVuOwotICAgIG1pbi13aWR0aDogMjYwcHg7 CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIGlucHV0W3R5cGU9ImJ1 dHRvbiJdLApAQCAtMzAxLDYgKzMwMCwxOCBAQCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy1vcHRpbWl6ZWQtZnVsbHNjcmVlbi1idXR0b24gewogICAgIC13ZWJraXQtb3JkZXI6IDU7CiB9 CiAKKy8qID09PT09PT09PT09PT09PT09PSBTUEFDRVIgPT09PT09PT09PT09PT09PT09PT09PSAq LworCit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zcGFjZXIsCithdWRpbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1zcGFjZXIgeworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9uZSAh aW1wb3J0YW50OworICAgIC13ZWJraXQtZmxleDogMSAxIDA7IC8qIFNob3VsZCBiZSB0aGUgc2Ft ZSBhcyB0aGUgdGltZWxpbmUgY29udGFpbmVyLiAqLworICAgIC13ZWJraXQtb3JkZXI6IDI7Cisg ICAgaGVpZ2h0OiA4cHg7CisgICAgbWFyZ2luOiAwOworICAgIGJhY2tncm91bmQtY29sb3I6IHRy YW5zcGFyZW50ICFpbXBvcnRhbnQ7Cit9CisKIC8qID09PT09PT09PT09PT09PT09PSBUSU1FTElO RSA9PT09PT09PT09PT09PT09PT09PT09ICovCiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXRpbWVsaW5lLApAQCAtMzk1LDcgKzQwNiw3IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLXRpbWVsaW5lLWNvbnRhaW5lciB7CiAgICAgLXdlYmtpdC1mbGV4LWRpcmVjdGlvbjog cm93OwogICAgIC13ZWJraXQtYWxpZ24taXRlbXM6IGNlbnRlcjsKICAgICAtd2Via2l0LXVzZXIt c2VsZWN0OiBub25lOwotICAgIC13ZWJraXQtZmxleDogMSAxIDA7CisgICAgLXdlYmtpdC1mbGV4 OiAxIDEgMDsgLyogQW55IGNoYW5nZXMgaGVyZSBzaG91bGQgYWxzbyBiZSBtYWRlIG9uIHRoZSBz cGFjZXIuICovCiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIHBhZGRpbmc6IDA7CiAgICAg LXdlYmtpdC1vcmRlcjogMjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKaW5kZXggNjFlMThjZC4uNTA4OWM2ZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNpT1MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNpT1MuanMKQEAgLTE4LDEwICsxOCwxOCBAQCBmdW5jdGlvbiBDb250cm9sbGVy SU9TKHJvb3QsIHZpZGVvLCBob3N0KQogICAgIHRoaXMudXBkYXRlV2lyZWxlc3NQbGF5YmFja1N0 YXR1cygpOwogICAgIHRoaXMuc2V0TmVlZHNUaW1lbGluZU1ldHJpY3NVcGRhdGUoKTsKIAorICAg IHRoaXMuX3RpbWVsaW5lSXNIaWRkZW4gPSBmYWxzZTsKKyAgICB0aGlzLl9jdXJyZW50RGlzcGxh eVdpZHRoID0gMDsKKyAgICB0aGlzLnNjaGVkdWxlVXBkYXRlTGF5b3V0Rm9yRGlzcGxheWVkV2lk dGgoKTsKKwogICAgIGhvc3QuY29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvciA9IHRydWU7 CiAgICAgdGhpcy5kb2luZ1NldHVwID0gZmFsc2U7CiB9OwogCisvKiBDb25zdGFudHMgKi8KK0Nv bnRyb2xsZXJJT1MuTWluaW11bVRpbWVsaW5lV2lkdGggPSAyMDA7CitDb250cm9sbGVySU9TLkJ1 dHRvbldpZHRoID0gNDI7CisKIC8qIEVudW1zICovCiBDb250cm9sbGVySU9TLlN0YXJ0UGxheWJh Y2tDb250cm9scyA9IDI7CiAKQEAgLTE1MSw2ICsxNTksMTAgQEAgQ29udHJvbGxlcklPUy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBwYW5lbENvbXBvc2l0ZWRQYXJlbnQgPSB0aGlzLmNvbnRy b2xzLnBhbmVsQ29tcG9zaXRlZFBhcmVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2Rpdicp OwogICAgICAgICBwYW5lbENvbXBvc2l0ZWRQYXJlbnQuc2V0QXR0cmlidXRlKCdwc2V1ZG8nLCAn LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbC1jb21wb3NpdGVkLXBhcmVudCcpOwogCisgICAg ICAgIHZhciBzcGFjZXIgPSB0aGlzLmNvbnRyb2xzLnNwYWNlciA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoJ2RpdicpOworICAgICAgICBzcGFjZXIuc2V0QXR0cmlidXRlKCdwc2V1ZG8nLCAnLXdl YmtpdC1tZWRpYS1jb250cm9scy1zcGFjZXInKTsKKyAgICAgICAgc3BhY2VyLmNsYXNzTGlzdC5h ZGQodGhpcy5DbGFzc05hbWVzLmhpZGRlbik7CisKICAgICAgICAgdmFyIGlubGluZVBsYXliYWNr UGxhY2Vob2xkZXIgPSB0aGlzLmNvbnRyb2xzLmlubGluZVBsYXliYWNrUGxhY2Vob2xkZXIgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKICAgICAgICAgaW5saW5lUGxheWJhY2tQbGFj ZWhvbGRlci5zZXRBdHRyaWJ1dGUoJ3BzZXVkbycsICctd2Via2l0LW1lZGlhLWNvbnRyb2xzLWlu bGluZS1wbGF5YmFjay1wbGFjZWhvbGRlcicpOwogICAgICAgICBpZiAoIUNvbnRyb2xsZXJJT1Mu Z1NpbXVsYXRlT3B0aW1pemVkRnVsbHNjcmVlbkF2YWlsYWJsZSkKQEAgLTIyMSw2ICsyMzMsNyBA QCBDb250cm9sbGVySU9TLnByb3RvdHlwZSA9IHsKICAgICBjb25maWd1cmVJbmxpbmVDb250cm9s czogZnVuY3Rpb24oKSB7CiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBwZW5kQ2hpbGQo dGhpcy5jb250cm9scy5wbGF5QnV0dG9uKTsKICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5h cHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLnN0YXR1c0Rpc3BsYXkpOworICAgICAgICB0aGlzLmNv bnRyb2xzLnBhbmVsLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMuc3BhY2VyKTsKICAgICAgICAg dGhpcy5jb250cm9scy5wYW5lbC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLnRpbWVsaW5lQm94 KTsKICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xz LndpcmVsZXNzVGFyZ2V0UGlja2VyKTsKICAgICAgICAgaWYgKCF0aGlzLmlzTGl2ZSkgewpAQCAt MjQ4LDYgKzI2MSw3IEBAIENvbnRyb2xsZXJJT1MucHJvdG90eXBlID0gewogICAgIH0sCiAKICAg ICBzaG93Q29udHJvbHM6IGZ1bmN0aW9uKCkgeworICAgICAgICB0aGlzLnVwZGF0ZUxheW91dEZv ckRpc3BsYXllZFdpZHRoKCk7CiAgICAgICAgIHRoaXMudXBkYXRlVGltZSh0cnVlKTsKICAgICAg ICAgdGhpcy51cGRhdGVQcm9ncmVzcyh0cnVlKTsKICAgICAgICAgQ29udHJvbGxlci5wcm90b3R5 cGUuc2hvd0NvbnRyb2xzLmNhbGwodGhpcyk7CkBAIC0yNjksNiArMjgzLDcgQEAgQ29udHJvbGxl cklPUy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuc2V0Q29u dHJvbHNUeXBlKENvbnRyb2xsZXIuSW5saW5lQ29udHJvbHMpOwogCisgICAgICAgIHRoaXMudXBk YXRlTGF5b3V0Rm9yRGlzcGxheWVkV2lkdGgoKTsKICAgICAgICAgdGhpcy5zZXROZWVkc1RpbWVs aW5lTWV0cmljc1VwZGF0ZSgpOwogICAgIH0sCiAKQEAgLTYwNSw4ICs2MjAsMTAgQEAgQ29udHJv bGxlcklPUy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy51cGRhdGVDb250cm9scygpOwog Ci0gICAgICAgIGlmIChpc1BsYXlpbmcgJiYgdGhpcy5pc0F1ZGlvKCkpCisgICAgICAgIGlmIChp c1BsYXlpbmcgJiYgdGhpcy5pc0F1ZGlvKCkgJiYgIXRoaXMuX3RpbWVsaW5lSXNIaWRkZW4pIHsK ICAgICAgICAgICAgIHRoaXMuY29udHJvbHMudGltZWxpbmVCb3guY2xhc3NMaXN0LnJlbW92ZSh0 aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKKyAgICAgICAgICAgIHRoaXMuY29udHJvbHMuc3BhY2Vy LmNsYXNzTGlzdC5hZGQodGhpcy5DbGFzc05hbWVzLmhpZGRlbik7CisgICAgICAgIH0KIAogICAg ICAgICBpZiAoaXNQbGF5aW5nKQogICAgICAgICAgICAgdGhpcy5oYXNQbGF5ZWQgPSB0cnVlOwpA QCAtNjUyLDggKzY2OSwxMCBAQCBDb250cm9sbGVySU9TLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLnN0eWxlLnBhZGRpbmdCb3R0b20gPSAtKG5ld1Nj YWxlRmFjdG9yICogYm90dG9tQWxpZ21lbnQpICsgInB4IjsKICAgICAgICAgICAgICAgICB0aGlz LmNvbnRyb2xzLnBhbmVsLnN0eWxlLndpZHRoID0gTWF0aC5jZWlsKG5ld1NjYWxlRmFjdG9yICog MTAwKSArICIlIjsKICAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLnN0eWxlLndl YmtpdFRyYW5zZm9ybSA9IHNjYWxlVHJhbnNmb3JtOworICAgICAgICAgICAgICAgIHRoaXMuc2No ZWR1bGVVcGRhdGVMYXlvdXRGb3JEaXNwbGF5ZWRXaWR0aCgpOwogICAgICAgICAgICAgICAgIHRo aXMuc2V0TmVlZHNUaW1lbGluZU1ldHJpY3NVcGRhdGUoKTsKICAgICAgICAgICAgICAgICB0aGlz LnVwZGF0ZVByb2dyZXNzKCk7CisgICAgICAgICAgICAgICAgdGhpcy5zY2hlZHVsZVVwZGF0ZUxh eW91dEZvckRpc3BsYXllZFdpZHRoKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9 LApAQCAtNjg2LDYgKzcwNSw2OSBAQCBDb250cm9sbGVySU9TLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5oYW5kbGVQcmVzZW50YXRpb25Nb2RlQ2hhbmdlKGV2ZW50KTsKICAgICB9LAogCisg ICAgc2NoZWR1bGVVcGRhdGVMYXlvdXRGb3JEaXNwbGF5ZWRXaWR0aDogZnVuY3Rpb24gKCkKKyAg ICB7CisgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgdGhpcy51 cGRhdGVMYXlvdXRGb3JEaXNwbGF5ZWRXaWR0aCgpOworICAgICAgICB9LmJpbmQodGhpcyksIDAp OworICAgIH0sCisKKyAgICB1cGRhdGVMYXlvdXRGb3JEaXNwbGF5ZWRXaWR0aDogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLmNvbnRyb2xzIHx8ICF0aGlzLmNvbnRyb2xzLnBh bmVsKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHZhciB2aXNpYmxlV2lkdGggPSB0 aGlzLmNvbnRyb2xzLnBhbmVsLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoICogdGhpcy5f cGFnZVNjYWxlRmFjdG9yOworICAgICAgICBpZiAodmlzaWJsZVdpZHRoIDw9IDAgfHwgdmlzaWJs ZVdpZHRoID09IHRoaXMuX2N1cnJlbnREaXNwbGF5V2lkdGgpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgdGhpcy5fY3VycmVudERpc3BsYXlXaWR0aCA9IHZpc2libGVXaWR0aDsKKwor ICAgICAgICAvLyBXZSBuZWVkIHRvIHdvcmsgb3V0IGhvdyBtYW55IHJpZ2h0LWhhbmQgc2lkZSBi dXR0b25zIGFyZSBhdmFpbGFibGUuCisgICAgICAgIHRoaXMudXBkYXRlV2lyZWxlc3NUYXJnZXRB dmFpbGFibGUoKTsKKyAgICAgICAgdGhpcy51cGRhdGVGdWxsc2NyZWVuQnV0dG9ucygpOworCisg ICAgICAgIHZhciB2aXNpYmxlQnV0dG9uV2lkdGggPSBDb250cm9sbGVySU9TLkJ1dHRvbldpZHRo OyAvLyBXZSBhbHdheXMgdHJ5IHRvIHNob3cgdGhlIGZ1bGxzY3JlZW4gYnV0dG9uLgorCisgICAg ICAgIGlmICghdGhpcy5jb250cm9scy53aXJlbGVzc1RhcmdldFBpY2tlci5jbGFzc0xpc3QuY29u dGFpbnModGhpcy5DbGFzc05hbWVzLmhpZGRlbikpCisgICAgICAgICAgICB2aXNpYmxlQnV0dG9u V2lkdGggKz0gQ29udHJvbGxlcklPUy5CdXR0b25XaWR0aDsKKyAgICAgICAgaWYgKCF0aGlzLmNv bnRyb2xzLm9wdGltaXplZEZ1bGxzY3JlZW5CdXR0b24uY2xhc3NMaXN0LmNvbnRhaW5zKHRoaXMu Q2xhc3NOYW1lcy5oaWRkZW4pKQorICAgICAgICAgICAgdmlzaWJsZUJ1dHRvbldpZHRoICs9IENv bnRyb2xsZXJJT1MuQnV0dG9uV2lkdGg7CisKKyAgICAgICAgLy8gQ2hlY2sgaWYgdGhlcmUgaXMg ZW5vdWdoIHJvb20gZm9yIHRoZSBzY3J1YmJlci4KKyAgICAgICAgaWYgKCh2aXNpYmxlV2lkdGgg LSB2aXNpYmxlQnV0dG9uV2lkdGgpIDwgQ29udHJvbGxlcklPUy5NaW5pbXVtVGltZWxpbmVXaWR0 aCkgeworICAgICAgICAgICAgdGhpcy5jb250cm9scy50aW1lbGluZUJveC5jbGFzc0xpc3QuYWRk KHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOworICAgICAgICAgICAgdGhpcy5jb250cm9scy5zcGFj ZXIuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKKyAgICAgICAgICAg IHRoaXMuX3RpbWVsaW5lSXNIaWRkZW4gPSB0cnVlOworICAgICAgICB9IGVsc2UgeworICAgICAg ICAgICAgaWYgKCF0aGlzLmlzQXVkaW8oKSB8fCB0aGlzLmhhc1BsYXllZCkgeworICAgICAgICAg ICAgICAgIHRoaXMuY29udHJvbHMudGltZWxpbmVCb3guY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNs YXNzTmFtZXMuaGlkZGVuKTsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnNwYWNlci5j bGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOworICAgICAgICAgICAgICAgIHRo aXMuX3RpbWVsaW5lSXNIaWRkZW4gPSBmYWxzZTsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAg ICAgICAgICAgIHRoaXMuY29udHJvbHMuc3BhY2VyLmNsYXNzTGlzdC5yZW1vdmUodGhpcy5DbGFz c05hbWVzLmhpZGRlbik7CisgICAgICAgIH0KKworICAgICAgICAvLyBEcm9wIHRoZSBhaXJwbGF5 IGJ1dHRvbiBpZiB0aGVyZSBpc24ndCBlbm91Z2ggc3BhY2UuCisgICAgICAgIGlmICh2aXNpYmxl V2lkdGggPCB2aXNpYmxlQnV0dG9uV2lkdGgpIHsKKyAgICAgICAgICAgIHRoaXMuY29udHJvbHMu d2lyZWxlc3NUYXJnZXRQaWNrZXIuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuaGlkZGVu KTsKKyAgICAgICAgICAgIHZpc2libGVCdXR0b25XaWR0aCAtPSBDb250cm9sbGVySU9TLkJ1dHRv bldpZHRoOworICAgICAgICB9CisKKyAgICAgICAgLy8gRHJvcCB0aGUgb3B0aW1pemVkIGZ1bGxz Y3JlZW4gYnV0dG9uIGlmIHRoZXJlIHN0aWxsIGlzbid0IGVub3VnaCBzcGFjZS4KKyAgICAgICAg aWYgKHZpc2libGVXaWR0aCA8IHZpc2libGVCdXR0b25XaWR0aCkgeworICAgICAgICAgICAgdGhp cy5jb250cm9scy5vcHRpbWl6ZWRGdWxsc2NyZWVuQnV0dG9uLmNsYXNzTGlzdC5hZGQodGhpcy5D bGFzc05hbWVzLmhpZGRlbik7CisgICAgICAgICAgICB2aXNpYmxlQnV0dG9uV2lkdGggLT0gQ29u dHJvbGxlcklPUy5CdXR0b25XaWR0aDsKKyAgICAgICAgfQorCisgICAgICAgIC8vIEFuZCBmaW5h bGx5LCBkcm9wIHRoZSBmdWxsc2NyZWVuIGJ1dHRvbiBhcyBhIGxhc3QgcmVzb3J0LgorICAgICAg ICBpZiAodmlzaWJsZVdpZHRoIDwgdmlzaWJsZUJ1dHRvbldpZHRoKSB7CisgICAgICAgICAgICB0 aGlzLmNvbnRyb2xzLmZ1bGxzY3JlZW5CdXR0b24uY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFt ZXMuaGlkZGVuKTsKKyAgICAgICAgICAgIHZpc2libGVCdXR0b25XaWR0aCAtPSBDb250cm9sbGVy SU9TLkJ1dHRvbldpZHRoOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHRoaXMuY29udHJv bHMuZnVsbHNjcmVlbkJ1dHRvbi5jbGFzc0xpc3QucmVtb3ZlKHRoaXMuQ2xhc3NOYW1lcy5oaWRk ZW4pOworICAgIH0sCisKIH07CiAKIE9iamVjdC5jcmVhdGUoQ29udHJvbGxlci5wcm90b3R5cGUp LmV4dGVuZChDb250cm9sbGVySU9TLnByb3RvdHlwZSk7Cg==