223081 2021-03-11 11:36:30 -0800 Video controls stay on screen indefinitely after interacting with time scrubber 2021-03-11 12:33:48 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi eric.carlson ews-watchlist glenn hi jer.noble joepeck philipj sergio webkit-bug-importer oldest_to_newest 1738556 0 hi 2021-03-11 11:36:30 -0800 . 1738557 1 hi 2021-03-11 11:36:44 -0800 <rdar://problem/73935705> 1738560 2 422954 hi 2021-03-11 11:38:07 -0800 Created attachment 422954 Patch 1738578 3 ews-feeder 2021-03-11 12:33:47 -0800 Committed r274293: <https://commits.webkit.org/r274293> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422954. 422954 2021-03-11 11:38:07 -0800 2021-03-11 12:33:47 -0800 Patch bug-223081-20210311123806.patch text/plain 13284 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1YmYyYWRjOTcyYjhlNDkxNDRlYzVkZWQxNjhkMGI1YmRjZDU0OGQ0Li42 MmQwMmUxNDhjYzcyOWFhMzc4ZTE2MGQ1MWEwNjFkYzUzZmUwMmU1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzggQEAKKzIwMjEtMDMtMTAgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFZpZGVvIGNvbnRyb2xzIHN0YXkgb24gc2NyZWVuIGluZGVmaW5pdGVseSBh ZnRlciBpbnRlcmFjdGluZyB3aXRoIHRpbWUgc2NydWJiZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzA4MQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNzM5MzU3MDU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdDogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFj a3MtcGFuZWwtcHJldmVudC1jb250cm9scy1iYXItZnJvbS1mYWRpbmcuaHRtbAorCisgICAgICAg ICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvYXV0by1oaWRlLWNvbnRy b2xsZXIuanM6CisgICAgICAgIChBdXRvSGlkZUNvbnRyb2xsZXIpOgorICAgICAgICAoQXV0b0hp ZGVDb250cm9sbGVyLnByb3RvdHlwZS5zZXQgZmFkZXNXaGlsZUlkbGUpOgorICAgICAgICAoQXV0 b0hpZGVDb250cm9sbGVyLnByb3RvdHlwZS5nZXQgaGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCk6IEFk ZGVkLgorICAgICAgICAoQXV0b0hpZGVDb250cm9sbGVyLnByb3RvdHlwZS5zZXQgaGFzU2Vjb25k YXJ5VUlBdHRhY2hlZCk6IEFkZGVkLgorICAgICAgICAoQXV0b0hpZGVDb250cm9sbGVyLnByb3Rv dHlwZS5oYW5kbGVFdmVudCk6CisgICAgICAgIChBdXRvSGlkZUNvbnRyb2xsZXIucHJvdG90eXBl Lm1lZGlhQ29udHJvbHNGYWRlZFN0YXRlRGlkQ2hhbmdlKToKKyAgICAgICAgKEF1dG9IaWRlQ29u dHJvbGxlci5wcm90b3R5cGUubWVkaWFDb250cm9sc0JlY2FtZUludmlzaWJsZSk6CisgICAgICAg IChBdXRvSGlkZUNvbnRyb2xsZXIucHJvdG90eXBlLmdldCBfY2FuRmFkZUNvbnRyb2xzKTogQWRk ZWQuCisgICAgICAgIChBdXRvSGlkZUNvbnRyb2xsZXIucHJvdG90eXBlLl9yZXNldEF1dG9IaWRl VGltZXIpOgorICAgICAgICAoQXV0b0hpZGVDb250cm9sbGVyLnByb3RvdHlwZS5fYXV0b0hpZGVU aW1lckZpcmVkKToKKyAgICAgICAgKEF1dG9IaWRlQ29udHJvbGxlci5wcm90b3R5cGUuX2NhbmNl bE5vbkVuZm9yY2VkQXV0b0hpZGVUaW1lcik6IERlbGV0ZWQuCisgICAgICAgIFNpbXBsaWZ5IHRo ZSBsb2dpYyBvZiBgQXV0b0hpZGVDb250cm9sbGVyYCB0byBhbHdheXMgbGlzdGVuIGZvciBgInBv aW50ZXIqImAgZXZlbnRzIGluc3RlYWQKKyAgICAgICAgb2YgYWRkaW5nL3JlbW92aW5nIHRoZW0g ZGVwZW5kaW5nIG9uIGBzZXQgZmFkZXNXaGlsZUlkbGVgLiBUaGlzIHdhcyBwcm9ibGVtYXRpYyBi ZWNhdXNlIHdoZW4KKyAgICAgICAgdGhlIG1lZGlhIGlzIHBhdXNlZCwgYENvbnRyb2xzVmlzaWJp bGl0eVN1cHBvcnRgIHdpbGwgZGlzYWJsZSBgZmFkZXNXaGlsZUlkbGVgLCByZW1vdmluZyBhbGwK KyAgICAgICAgYCJwb2ludGVyKiJgIGV2ZW50IGxpc3RlbmVycywgb25seSB0byByZS1hZGQgdGhl bSBhcyBzb29uIGFzIHRoZSBtZWRpYSBpcyByZXN1bWVkICh0aGlzIGlzCisgICAgICAgIGVzcGVj aWFsbHkgYmFkIHdoZW4gY2xpY2tpbmcgb24gdGhlIHRpbWUgc2NydWJiZXIgdHJhY2sgdG8gc2Vl aywgYXMgdGhpcyB3aWxsIHBhdXNlIGFuZCB0aGVuCisgICAgICAgIHJlc3VtZSB0aGUgbWVkaWEg aW4gcmFwaWQgc3VjY2Vzc2lvbikuIFJlbW92ZSBgX2VuZm9yY2VBdXRvSGlkZVRpbWVyYCBhcyB0 aGVyZSdzIG5vIGNhc2UKKyAgICAgICAgd2hlcmUgd2Ugd291bGRuJ3Qgd2FudCB0byBiZSBhYmxl IHRvIGRlbGF5L2NhbmNlbCB0aGUgYXV0by1oaWRlIGJhc2VkIG9uIHVzZXIgaW50ZXJhY3Rpb24u CisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tZWRp YS1jb250cm9scy5qczoKKyAgICAgICAgKE1lZGlhQ29udHJvbHMucHJvdG90eXBlLmhpZGVUcmFj a3NQYW5lbCk6CisgICAgICAgIE5vdyB0aGF0IGBzZXQgaGFzU2Vjb25kYXJ5VUlBdHRhY2hlZGAg YWxzbyBjYWxscyBgX3Jlc2V0QXV0b0hpZGVUaW1lcmAsIGRvbid0IG1hbnVhbGx5IHNldAorICAg ICAgICBgdGhpcy5mYWRlZGAgYW5kIGluc3RlYWQgdXNlIHRoZSBsb2dpYy90aW1pbmcgaW4gYEF1 dG9IaWRlQ29udHJvbGxlcmAuCisKIDIwMjEtMDMtMTEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlh LmNvbT4KIAogICAgICAgICBBcHBseSB0cmFuc2ZlcnJlZCBtaW4vbWF4IHNpemVzIGZvciBpbnRy aW5zaWMgc2l6aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9jb250cm9scy9hdXRvLWhpZGUtY29udHJvbGxlci5qcyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2F1dG8taGlkZS1j b250cm9sbGVyLmpzCmluZGV4IDVkMmRmMzM5MWI4ODFlYjc5NzgzN2RhYzA2MWQ1OGIxMzlkMjdm OTIuLmM4NjEwZjk1YTU0NTg5MTVkODgwZmVjODYzY2QwMzE0NDg5MDE4N2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2F1 dG8taGlkZS1jb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2F1dG8taGlkZS1jb250cm9sbGVyLmpzCkBAIC0zNSw2 ICszNSwxMiBAQCBjbGFzcyBBdXRvSGlkZUNvbnRyb2xsZXIKICAgICAgICAgdGhpcy5fcG9pbnRl cklkZW50aWZpZXJzUHJldmVudGluZ0F1dG9IaWRlID0gbmV3IFNldDsKICAgICAgICAgdGhpcy5f cG9pbnRlcklkZW50aWZpZXJzUHJldmVudGluZ0F1dG9IaWRlRm9ySG92ZXIgPSBuZXcgU2V0Owog CisgICAgICAgIHRoaXMuX21lZGlhQ29udHJvbHMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJw b2ludGVybW92ZSIsIHRoaXMpOworICAgICAgICB0aGlzLl9tZWRpYUNvbnRyb2xzLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigicG9pbnRlcmRvd24iLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fbWVk aWFDb250cm9scy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInBvaW50ZXJ1cCIsIHRoaXMpOwor ICAgICAgICB0aGlzLl9tZWRpYUNvbnRyb2xzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigicG9p bnRlcmxlYXZlIiwgdGhpcyk7CisgICAgICAgIHRoaXMuX21lZGlhQ29udHJvbHMuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJwb2ludGVyb3V0IiwgdGhpcyk7CisKICAgICAgICAgaWYgKEdlc3R1 cmVSZWNvZ25pemVyLlN1cHBvcnRzVG91Y2hlcykKICAgICAgICAgICAgIHRoaXMuX3RhcEdlc3R1 cmVSZWNvZ25pemVyID0gbmV3IFRhcEdlc3R1cmVSZWNvZ25pemVyKHRoaXMuX21lZGlhQ29udHJv bHMuZWxlbWVudCwgdGhpcyk7CiAKQEAgLTU1LDI0ICs2MSwyNSBAQCBjbGFzcyBBdXRvSGlkZUNv bnRyb2xsZXIKIAogICAgICAgICB0aGlzLl9mYWRlc1doaWxlSWRsZSA9IGZsYWc7CiAKLSAgICAg ICAgaWYgKGZsYWcpIHsKLSAgICAgICAgICAgIHRoaXMuX21lZGlhQ29udHJvbHMuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJwb2ludGVybW92ZSIsIHRoaXMpOwotICAgICAgICAgICAgdGhpcy5f bWVkaWFDb250cm9scy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInBvaW50ZXJkb3duIiwgdGhp cyk7Ci0gICAgICAgICAgICB0aGlzLl9tZWRpYUNvbnRyb2xzLmVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigicG9pbnRlcnVwIiwgdGhpcyk7Ci0gICAgICAgICAgICB0aGlzLl9tZWRpYUNvbnRyb2xz LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigicG9pbnRlcmxlYXZlIiwgdGhpcyk7Ci0gICAgICAg ICAgICB0aGlzLl9tZWRpYUNvbnRyb2xzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigicG9pbnRl cm91dCIsIHRoaXMpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5fbWVkaWFD b250cm9scy5lbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInBvaW50ZXJtb3ZlIiwgdGhpcyk7 Ci0gICAgICAgICAgICB0aGlzLl9tZWRpYUNvbnRyb2xzLmVsZW1lbnQucmVtb3ZlRXZlbnRMaXN0 ZW5lcigicG9pbnRlcmRvd24iLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX21lZGlhQ29udHJv bHMuZWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJwb2ludGVydXAiLCB0aGlzKTsKLSAgICAg ICAgICAgIHRoaXMuX21lZGlhQ29udHJvbHMuZWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJw b2ludGVybGVhdmUiLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX21lZGlhQ29udHJvbHMuZWxl bWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJwb2ludGVyb3V0IiwgdGhpcyk7Ci0gICAgICAgIH0K LQotICAgICAgICBpZiAoZmxhZyAmJiAhdGhpcy5fbWVkaWFDb250cm9scy5mYWRlZCkKLSAgICAg ICAgICAgIHRoaXMuX3Jlc2V0QXV0b0hpZGVUaW1lcihmYWxzZSk7Ci0gICAgICAgIGVsc2UgaWYg KCFmbGFnKQorICAgICAgICBpZiAoIXRoaXMuX2ZhZGVzV2hpbGVJZGxlKQogICAgICAgICAgICAg dGhpcy5fbWVkaWFDb250cm9scy5mYWRlZCA9IGZhbHNlOworCisgICAgICAgIHRoaXMuX3Jlc2V0 QXV0b0hpZGVUaW1lcigpOworICAgIH0KKworICAgIGdldCBoYXNTZWNvbmRhcnlVSUF0dGFjaGVk KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9oYXNTZWNvbmRhcnlVSUF0dGFjaGVkOwor ICAgIH0KKworICAgIHNldCBoYXNTZWNvbmRhcnlVSUF0dGFjaGVkKGZsYWcpCisgICAgeworICAg ICAgICBpZiAodGhpcy5faGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCA9PSBmbGFnKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2hhc1NlY29uZGFyeVVJQXR0YWNoZWQgPSBmbGFn OworCisgICAgICAgIHRoaXMuX3Jlc2V0QXV0b0hpZGVUaW1lcigpOwogICAgIH0KIAogICAgIC8v IFByb3RlY3RlZApAQCAtODIsMTcgKzg5LDE5IEBAIGNsYXNzIEF1dG9IaWRlQ29udHJvbGxlcgog ICAgICAgICBpZiAoZXZlbnQuY3VycmVudFRhcmdldCAhPT0gdGhpcy5fbWVkaWFDb250cm9scy5l bGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmIChldmVudC50eXBlID09 PSAicG9pbnRlcm1vdmUiKSB7CisgICAgICAgIHN3aXRjaCAoZXZlbnQudHlwZSkgeworICAgICAg ICBjYXNlICJwb2ludGVybW92ZSI6CiAgICAgICAgICAgICB0aGlzLl9tZWRpYUNvbnRyb2xzLmZh ZGVkID0gZmFsc2U7Ci0gICAgICAgICAgICB0aGlzLl9yZXNldEF1dG9IaWRlVGltZXIodHJ1ZSk7 CiAgICAgICAgICAgICBpZiAodGhpcy5fbWVkaWFDb250cm9scy5pc1BvaW50SW5Db250cm9scyhu ZXcgRE9NUG9pbnQoZXZlbnQuY2xpZW50WCwgZXZlbnQuY2xpZW50WSkpKSB7CiAgICAgICAgICAg ICAgICAgdGhpcy5fcG9pbnRlcklkZW50aWZpZXJzUHJldmVudGluZ0F1dG9IaWRlRm9ySG92ZXIu YWRkKGV2ZW50LnBvaW50ZXJJZCk7Ci0gICAgICAgICAgICAgICAgdGhpcy5fY2FuY2VsTm9uRW5m b3JjZWRBdXRvSGlkZVRpbWVyKCk7CisgICAgICAgICAgICAgICAgdGhpcy5fY2FuY2VsQXV0b0hp ZGVUaW1lcigpOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICB0aGlzLl9w b2ludGVySWRlbnRpZmllcnNQcmV2ZW50aW5nQXV0b0hpZGVGb3JIb3Zlci5kZWxldGUoZXZlbnQu cG9pbnRlcklkKTsKLSAgICAgICAgICAgICAgICB0aGlzLl9yZXNldEF1dG9IaWRlVGltZXIodHJ1 ZSk7CisgICAgICAgICAgICAgICAgdGhpcy5fcmVzZXRBdXRvSGlkZVRpbWVyKCk7CiAgICAgICAg ICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9PT0gInBvaW50ZXJsZWF2ZSIg JiYgdGhpcy5fZmFkZXNXaGlsZUlkbGUgJiYgIXRoaXMuaGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCAm JiAhdGhpcy5fZW5mb3JjZUF1dG9IaWRlVGltZXIpIHsKKyAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICBjYXNlICJwb2ludGVybGVhdmUiOgogICAgICAgICAgICAgdGhpcy5fcG9pbnRlcklk ZW50aWZpZXJzUHJldmVudGluZ0F1dG9IaWRlLmRlbGV0ZShldmVudC5wb2ludGVySWQpOwogICAg ICAgICAgICAgdGhpcy5fcG9pbnRlcklkZW50aWZpZXJzUHJldmVudGluZ0F1dG9IaWRlRm9ySG92 ZXIuZGVsZXRlKGV2ZW50LnBvaW50ZXJJZCk7CiAKQEAgLTEwMSwxOSArMTEwLDIyIEBAIGNsYXNz IEF1dG9IaWRlQ29udHJvbGxlcgogICAgICAgICAgICAgaWYgKGV2ZW50LnBvaW50ZXJUeXBlID09 ICJtb3VzZSIpCiAgICAgICAgICAgICAgICAgdGhpcy5fYXV0b0hpZGVUaW1lckZpcmVkKCk7CiAK LSAgICAgICAgICAgIHRoaXMuX3Jlc2V0QXV0b0hpZGVUaW1lcih0cnVlKTsKLSAgICAgICAgfQor ICAgICAgICAgICAgdGhpcy5fcmVzZXRBdXRvSGlkZVRpbWVyKCk7CisgICAgICAgICAgICByZXR1 cm47CiAKLSAgICAgICAgaWYgKGV2ZW50LnR5cGUgPT09ICJwb2ludGVyZG93biIpIHsKKyAgICAg ICAgY2FzZSAicG9pbnRlcmRvd24iOgogICAgICAgICAgICAgLy8gUmVtZW1iZXIgdGhlIGN1cnJl bnQgZmFkZWQgc3RhdGUgc28gdGhhdCB3ZSBjYW4gZGV0ZXJtaW5lLAogICAgICAgICAgICAgLy8g aWYgd2UgcmVjb2duaXplIGEgdGFwLCBpZiBpdCBzaG91bGQgZmFkZSB0aGUgY29udHJvbHMgb3V0 LgogICAgICAgICAgICAgdGhpcy5fbmV4dFRhcENhbkZhZGVDb250cm9scyA9ICF0aGlzLl9tZWRp YUNvbnRyb2xzLmZhZGVkOwogICAgICAgICAgICAgdGhpcy5fcG9pbnRlcklkZW50aWZpZXJzUHJl dmVudGluZ0F1dG9IaWRlLmFkZChldmVudC5wb2ludGVySWQpOwogICAgICAgICAgICAgdGhpcy5f bWVkaWFDb250cm9scy5mYWRlZCA9IGZhbHNlOwotICAgICAgICAgICAgdGhpcy5fY2FuY2VsTm9u RW5mb3JjZWRBdXRvSGlkZVRpbWVyKCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9 PT0gInBvaW50ZXJ1cCIpIHsKKyAgICAgICAgICAgIHRoaXMuX2NhbmNlbEF1dG9IaWRlVGltZXIo KTsKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBjYXNlICJwb2ludGVydXAiOgogICAg ICAgICAgICAgdGhpcy5fcG9pbnRlcklkZW50aWZpZXJzUHJldmVudGluZ0F1dG9IaWRlLmRlbGV0 ZShldmVudC5wb2ludGVySWQpOwotICAgICAgICAgICAgdGhpcy5fcmVzZXRBdXRvSGlkZVRpbWVy KHRydWUpOworICAgICAgICAgICAgdGhpcy5fcmVzZXRBdXRvSGlkZVRpbWVyKCk7CisgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTEyOCwyMyArMTQwLDE5IEBAIGNs YXNzIEF1dG9IaWRlQ29udHJvbGxlcgogCiAgICAgbWVkaWFDb250cm9sc0ZhZGVkU3RhdGVEaWRD aGFuZ2UoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX21lZGlhQ29udHJvbHMuZmFkZWQpCi0g ICAgICAgICAgICBkZWxldGUgdGhpcy5fZW5mb3JjZUF1dG9IaWRlVGltZXI7Ci0gICAgICAgIGVs c2UKLSAgICAgICAgICAgIHRoaXMuX3Jlc2V0QXV0b0hpZGVUaW1lcih0cnVlKTsKKyAgICAgICAg dGhpcy5fcmVzZXRBdXRvSGlkZVRpbWVyKCk7CiAgICAgfQogCiAgICAgbWVkaWFDb250cm9sc0Jl Y2FtZUludmlzaWJsZSgpCiAgICAgewotICAgICAgICB0aGlzLl9jYW5jZWxOb25FbmZvcmNlZEF1 dG9IaWRlVGltZXIoKTsKKyAgICAgICAgdGhpcy5fY2FuY2VsQXV0b0hpZGVUaW1lcigpOwogICAg IH0KIAogICAgIC8vIFByaXZhdGUKIAotICAgIF9jYW5jZWxOb25FbmZvcmNlZEF1dG9IaWRlVGlt ZXIoKQorICAgIGdldCBfY2FuRmFkZUNvbnRyb2xzKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhp cy5fZW5mb3JjZUF1dG9IaWRlVGltZXIpCi0gICAgICAgICAgICB0aGlzLl9jYW5jZWxBdXRvSGlk ZVRpbWVyKCk7CisgICAgICAgIHJldHVybiB0aGlzLl9mYWRlc1doaWxlSWRsZSAmJiAhdGhpcy5f aGFzU2Vjb25kYXJ5VUlBdHRhY2hlZDsKICAgICB9CiAKICAgICBfY2FuY2VsQXV0b0hpZGVUaW1l cigpCkBAIC0xNTMsMzEgKzE2MSwyMSBAQCBjbGFzcyBBdXRvSGlkZUNvbnRyb2xsZXIKICAgICAg ICAgZGVsZXRlIHRoaXMuX2F1dG9IaWRlVGltZXI7CiAgICAgfQogCi0gICAgX3Jlc2V0QXV0b0hp ZGVUaW1lcihjYW5jZWxhYmxlKQorICAgIF9yZXNldEF1dG9IaWRlVGltZXIoKQogICAgIHsKLSAg ICAgICAgaWYgKGNhbmNlbGFibGUgJiYgdGhpcy5fZW5mb3JjZUF1dG9IaWRlVGltZXIpCi0gICAg ICAgICAgICByZXR1cm47Ci0KICAgICAgICAgdGhpcy5fY2FuY2VsQXV0b0hpZGVUaW1lcigpOwog Ci0gICAgICAgIGlmIChjYW5jZWxhYmxlKQotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2VuZm9y Y2VBdXRvSGlkZVRpbWVyOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl9lbmZvcmNl QXV0b0hpZGVUaW1lciA9IHRydWU7CisgICAgICAgIGlmICh0aGlzLl9tZWRpYUNvbnRyb2xzLmZh ZGVkIHx8ICF0aGlzLl9jYW5GYWRlQ29udHJvbHMpCisgICAgICAgICAgICByZXR1cm47CiAKICAg ICAgICAgdGhpcy5fYXV0b0hpZGVUaW1lciA9IHdpbmRvdy5zZXRUaW1lb3V0KHRoaXMuX2F1dG9I aWRlVGltZXJGaXJlZC5iaW5kKHRoaXMpLCB0aGlzLmF1dG9IaWRlRGVsYXkpOwogICAgIH0KIAog ICAgIF9hdXRvSGlkZVRpbWVyRmlyZWQoKQogICAgIHsKLSAgICAgICAgY29uc3QgZGlzYWJsZUF1 dG9IaWRpbmcgPSB0aGlzLl9wb2ludGVySWRlbnRpZmllcnNQcmV2ZW50aW5nQXV0b0hpZGUuc2l6 ZSB8fCB0aGlzLl9wb2ludGVySWRlbnRpZmllcnNQcmV2ZW50aW5nQXV0b0hpZGVGb3JIb3Zlci5z aXplOworICAgICAgICBkZWxldGUgdGhpcy5fYXV0b0hpZGVUaW1lcjsKIAotICAgICAgICBkZWxl dGUgdGhpcy5fZW5mb3JjZUF1dG9IaWRlVGltZXI7Ci0gICAgICAgIGlmIChkaXNhYmxlQXV0b0hp ZGluZykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9jYW5jZWxBdXRvSGlk ZVRpbWVyKCk7Ci0gICAgICAgIHRoaXMuX21lZGlhQ29udHJvbHMuZmFkZWQgPSB0aGlzLl9mYWRl c1doaWxlSWRsZSAmJiAhdGhpcy5oYXNTZWNvbmRhcnlVSUF0dGFjaGVkOworICAgICAgICB0aGlz Ll9tZWRpYUNvbnRyb2xzLmZhZGVkID0gdGhpcy5fY2FuRmFkZUNvbnRyb2xzICYmICF0aGlzLl9w b2ludGVySWRlbnRpZmllcnNQcmV2ZW50aW5nQXV0b0hpZGUuc2l6ZSAmJiAhdGhpcy5fcG9pbnRl cklkZW50aWZpZXJzUHJldmVudGluZ0F1dG9IaWRlRm9ySG92ZXIuc2l6ZTsKICAgICB9CiAKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L2NvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rl cm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWVkaWEtY29udHJvbHMuanMKaW5kZXggMWFiYThk NDI3MDI3MTJlZGI1NjdjYjljZDU4M2RkOWIyYzdkZjkyZC4uMTVmMTQwNjJjY2ZlOTU5YTFkZGU4 ZWU3Yzk3ZTg4M2Y2NDU2ZGExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWVkaWEtY29udHJvbHMuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWVkaWEt Y29udHJvbHMuanMKQEAgLTE5MSwxNCArMTkxLDkgQEAgY2xhc3MgTWVkaWFDb250cm9scyBleHRl bmRzIExheW91dE5vZGUKICAgICB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QucmVt b3ZlKCJzaG93cy10cmFja3MtcGFuZWwiKTsKIAotICAgICAgICBsZXQgc2hvdWxkRmFkZUNvbnRy b2xzQmFyID0gdHJ1ZTsKLSAgICAgICAgaWYgKHdpbmRvdy5ldmVudCBpbnN0YW5jZW9mIE1vdXNl RXZlbnQpCi0gICAgICAgICAgICBzaG91bGRGYWRlQ29udHJvbHNCYXIgPSAhdGhpcy5pc1BvaW50 SW5Db250cm9scyhuZXcgRE9NUG9pbnQoZXZlbnQuY2xpZW50WCwgZXZlbnQuY2xpZW50WSksIHRy dWUpOwotCiAgICAgICAgIHRoaXMudHJhY2tzQnV0dG9uLm9uID0gZmFsc2U7CiAgICAgICAgIHRo aXMudHJhY2tzQnV0dG9uLmVsZW1lbnQuZm9jdXMoKTsKICAgICAgICAgdGhpcy5hdXRvSGlkZUNv bnRyb2xsZXIuaGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCA9IGZhbHNlOwotICAgICAgICB0aGlzLmZh ZGVkID0gdGhpcy5hdXRvSGlkZUNvbnRyb2xsZXIuZmFkZXNXaGlsZUlkbGUgJiYgc2hvdWxkRmFk ZUNvbnRyb2xzQmFyOwogICAgICAgICB0aGlzLnRyYWNrc1BhbmVsLmhpZGUoKTsKICAgICB9CiAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0NzZiNjc2ZjBiYWRhNDJmMjk0ZTQ4NGMwMmU2ZTg3ZTg0OTQxZTIyLi5iYTFjY2Fm MDYxZGU1Njg1NmE4ZTQ3NGZhZWE3MzhjNGU4YmQ1OTMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMjEtMDMtMTEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAg IFZpZGVvIGNvbnRyb2xzIHN0YXkgb24gc2NyZWVuIGluZGVmaW5pdGVseSBhZnRlciBpbnRlcmFj dGluZyB3aXRoIHRpbWUgc2NydWJiZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMzA4MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzM5MzU3MDU+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRp YS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50 LWNvbnRyb2xzLWJhci1mcm9tLWZhZGluZy5odG1sOgorICAgICAgICAqIG1lZGlhL21vZGVybi1t ZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29udHJvbHMt YmFyLWZyb20tZmFkaW5nLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0wMy0xMSAgUm9iIEJ1aXMgIDxy YnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEFwcGx5IHRyYW5zZmVycmVkIG1pbi9tYXggc2l6 ZXMgZm9yIGludHJpbnNpYyBzaXppbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29u dHJvbHMtYmFyLWZyb20tZmFkaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29u dHJvbHMtYmFyLWZyb20tZmFkaW5nLWV4cGVjdGVkLnR4dAppbmRleCBlOGJkODk2MWVlZmIwZjdk YTI3ZWY1NjUxZDEyZjlmMzhlZjEwNjI1Li5lYzE4YTFlYTIzNjgwMzI1MGUxY2NiYmM0N2NlMDA1 MzhhMTc2YjExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRyb2xzLWJhci1mcm9t LWZhZGluZy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtcHJldmVudC1jb250cm9scy1iYXIt ZnJvbS1mYWRpbmctZXhwZWN0ZWQudHh0CkBAIC0xMyw3ICsxMyw3IEBAIE5vdyBlbnRlciBhbmQg ZXhpdCB0aGUgbWVkaWEgY29udHJvbHMsIHRoZSBjb250cm9scyBiYXIgc2hvdWxkIHJlbWFpbiB2 aXNpYmxlCiBQQVNTIG1lZGlhQ29udHJvbHMuZmFkZWQgaXMgZmFsc2UKIAogbWVkaWFDb250cm9s cy5oaWRlVHJhY2tzUGFuZWwoKQotUEFTUyBtZWRpYUNvbnRyb2xzLmZhZGVkIGlzIHRydWUKK1BB U1MgbWVkaWFDb250cm9scy5mYWRlZCBiZWNhbWUgdHJ1ZQogCiBQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29udHJvbHMtYmFy LWZyb20tZmFkaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJv bHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRyb2xzLWJhci1mcm9tLWZh ZGluZy5odG1sCmluZGV4IDY5ZDdhODNmNzM4ZTVmYWI5NGMzNDkzZDViNWEyODM3YjUzOTI2Yzcu LmY5NjBjNGE0NzJjZTE2MmU5N2U5MzVkNzgwODM2NWQxOTNkYWI4NmQgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tz LXBhbmVsLXByZXZlbnQtY29udHJvbHMtYmFyLWZyb20tZmFkaW5nLmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFu ZWwtcHJldmVudC1jb250cm9scy1iYXItZnJvbS1mYWRpbmcuaHRtbApAQCAtNDcsMTEgKzQ3LDEx IEBAIHNob3VsZEJlY29tZUVxdWFsKCJtZWRpYUNvbnRyb2xzLnRyYWNrc1BhbmVsLmVsZW1lbnQu cGFyZW50Tm9kZSIsICJtZWRpYUNvbnRyb2xzCiAgICAgICAgIGRlYnVnKCIiKTsKICAgICAgICAg ZGVidWcoIm1lZGlhQ29udHJvbHMuaGlkZVRyYWNrc1BhbmVsKCkiKTsKICAgICAgICAgbWVkaWFD b250cm9scy5oaWRlVHJhY2tzUGFuZWwoKTsKLSAgICAgICAgc2hvdWxkQmVUcnVlKCJtZWRpYUNv bnRyb2xzLmZhZGVkIik7Ci0KLSAgICAgICAgZGVidWcoIiIpOwotICAgICAgICBtZWRpYUNvbnRy b2xzLmVsZW1lbnQucmVtb3ZlKCk7Ci0gICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICBz aG91bGRCZWNvbWVFcXVhbCgibWVkaWFDb250cm9scy5mYWRlZCIsICJ0cnVlIiwgKCkgPT4gewor ICAgICAgICAgICAgZGVidWcoIiIpOworICAgICAgICAgICAgbWVkaWFDb250cm9scy5lbGVtZW50 LnJlbW92ZSgpOworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH0pOwogICAg IH0sIG1lZGlhQ29udHJvbHMuYXV0b0hpZGVDb250cm9sbGVyLmF1dG9IaWRlRGVsYXkpOwogfSk7 CiAK