174627 2017-07-18 07:16:15 -0700 [iOS] WebKit media controls are sometimes shown after exiting full screen on vimeo.com 2017-07-18 12:59:18 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified iOS 11 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=174626 InRadar P2 Normal --- 1 graouts graouts commit-queue dino jeremyj-wk webkit-bug-importer oldest_to_newest 1329966 0 graouts 2017-07-18 07:16:15 -0700 Steps to reproduce: 1. go to https://vimeo.com/225249697 2. tap to start the video 3. enter fullscreen 4. exit fullscreen by tapping the X icon Both the WebKit media controls and the Vimeo custom controls appear sometimes, but not always. This is due to https://bugs.webkit.org/show_bug.cgi?id=174626, where the "webkitfullscreenchange" event isn't fired when entering or exiting fullscreen, so depending on when the "play" or "pause" event fires, the ControlsVisibilitySupport object may think that the controls are still in fullscreen and not get an event that we exited fullscreen. 1329968 1 graouts 2017-07-18 07:20:51 -0700 <rdar://problem/33301005> 1329971 2 315794 graouts 2017-07-18 07:44:20 -0700 Created attachment 315794 Patch 1330032 3 315794 jeremyj-wk 2017-07-18 11:37:09 -0700 Comment on attachment 315794 Patch LGTM 1330037 4 315794 jeremyj-wk 2017-07-18 11:44:25 -0700 Comment on attachment 315794 Patch provisional r+ 1330054 5 315814 graouts 2017-07-18 12:21:34 -0700 Created attachment 315814 Patch for landing 1330074 6 315814 commit-queue 2017-07-18 12:59:17 -0700 Comment on attachment 315814 Patch for landing Clearing flags on attachment: 315814 Committed r219621: <http://trac.webkit.org/changeset/219621> 1330075 7 commit-queue 2017-07-18 12:59:18 -0700 All reviewed patches have been landed. Closing bug. 315794 2017-07-18 07:44:20 -0700 2017-07-18 12:21:30 -0700 Patch bug-174627-20170718164414.patch text/plain 6177 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJhZmZkMzViMmM2NGNh MDMwNzFjNWQ2NjY4MjY2YjgzMzI2Y2NiNC4uY2JlYzgwYTM4YzkwZDA1ZTU1MzgyNjkzYmFlZjNh MTg2NDU4MDliMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE3LTA3LTE4ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gV2ViS2l0IG1l ZGlhIGNvbnRyb2xzIGFyZSBzb21ldGltZXMgc2hvd24gYWZ0ZXIgZXhpdGluZyBmdWxsIHNjcmVl biBvbiB2aW1lby5jb20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NDYyNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzMzMDEwMDU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gaU9TIDExLCBib3Ro IHRoZSBXZWJLaXQgbWVkaWEgY29udHJvbHMgYW5kIHRoZSBWaW1lbyBjdXN0b20gY29udHJvbHMg d291bGQgYXBwZWFyIHNvbWV0aW1lcyB3aGVuIGV4aXRpbmcKKyAgICAgICAgZnJvbSBmdWxsc2Ny ZWVuIHdoZW4gdGhlIHZpZGVvIHdhcyBwbGF5aW5nIGFuZCB0aGUgdXNlciB3b3VsZCB0YXAgdGhl IFggYnV0dG9uLCB3aGljaCB3b3VsZCBwYXVzZSB0aGUgdmlkZW8KKyAgICAgICAgYXMgd2VsbCBh cyBleGl0IGZ1bGxzY3JlZW4uCisKKyAgICAgICAgVGhlIHJlYXNvbiB0aGlzIGhhcHBlbnMgaXMg dGhhdCB0aGUgQ29udHJvbHNWaXNpYmlsaXR5U3VwcG9ydCBvYmplY3QsIHdoaWNoIGdvdmVybnMg d2hldGhlciB0aGUgV2ViS2l0IG1lZGlhCisgICAgICAgIGNvbnRyb2xzIHNob3VsZCBiZSBkaXNw bGF5ZWQgZm9yIGEgZ2l2ZW4gdmlkZW8sIHdvdWQgbGlzdGVuIHRvICJwYXVzZSIgYW5kICJ3ZWJr aXRmdWxsc2NyZWVuY2hhbmdlIiBldmVudHMKKyAgICAgICAgYW5kIGRldGVybWluZSB3aGV0aGVy IHRvIHNob3cgdGhlIFdlYktpdCBtZWRpYSBjb250cm9scy4gV2UgbGlzdGVuIHRvIHRoZSAicGF1 c2UiIGV2ZW50IGJlY2F1c2Ugd2hlbiBtZWRpYQorICAgICAgICBwYXVzZXMsIGFuZCB0aGUgdmlk ZW8gaGFzIHRoZSAiY29udHJvbHMiIGF0dHJpYnV0ZSBzZXQsIHdlIHNob3VsZCBzaG93IHRoZSBj b250cm9scyBhbmQgc3VzcGVuZCB0aGUgY29udHJvbHMKKyAgICAgICAgYXV0by1oaWRlIHRpbWVy LiBBbmQgd2UncmUgaW50ZXJlc3RlZCBpbiBrbm93aW5nIHdoZW4gd2UgZW50ZXIgYW5kIGV4aXQg ZnVsbHNjcmVlbiBiZWNhdXNlIHdlIHdhbnQgdG8gb3ZlcnJpZGUKKyAgICAgICAgdGhlICJjb250 cm9scyIgYXR0cmlidXRlIG5vdCBiZWluZyBzZXQgd2hlbiB3ZSBlbnRlciBmdWxsc2NyZWVuLgor CisgICAgICAgIEhvd2V2ZXIsIG9uIGlPUyAxMSwgaXQgYXBwZWFycyB0aGF0IHRoZSAid2Via2l0 ZnVsbHNjcmVlbmNoYW5nZSIgZXZlbnQgaXMgbm90IHJlbGlhYmx5IGZpcmVkIGFzIHRoZSB1c2Vy IGVudGVycworICAgICAgICBhbmQgZXhpdHMgZnVsbHNjcmVlbiwgd2hpY2ggaXMgdHJhY2tlZCBi eSB3ZWJraXQub3JnL2IvMTc0NjI2LiBTbywgd2hlbiB0aGUgdXNlciBleGl0cyBmdWxsc2NyZWVu LCB3ZSB3b3VsZCBiZQorICAgICAgICBpbmZvcm1lZCBvZiB0aGUgdmlkZW8gYmVpbmcgcGF1c2Vk IHZpYSBhICJwYXVzZSIgZXZlbnQsIGJ1dCBub3Qgb2YgdGhlIHZpZGVvIGV4aXRpbmcgZnVsbHNj cmVlbi4gQW5kIGJlY2F1c2UKKyAgICAgICAgbWVkaWEgZXZlbnRzIGFyZSBhc3luY2hyb25vdXMs IHRoZSAicGF1c2UiIGV2ZW50IHdvdWxkIHNvbWV0aW1lcyBiZSBmaXJlZCBiZWZvcmUgd2UgZXhp dGVkIGZ1bGxzY3JlZW4sIGFuZCB3aGVuCisgICAgICAgIHRoZSBfdXBkYXRlQ29udHJvbHMoKSB3 b3VsZCBydW4sIHdlIHdvdWxkIHNvbWV0aW1lcyBkZXRlcm1pbmUgdGhhdCB3ZSBhcmUgaW4gZnVs bHNjcmVlbiBzdGlsbCBhbmQgZGV0ZXJtaW5lCisgICAgICAgIHRoYXQgdGhlIFdlYktpdCBtZWRp YSBjb250cm9scyBzaG91bGQgYmUgc2hvd24uCisKKyAgICAgICAgT2YgY291cnNlLCBvbiBpT1Ms IHRoZSBXZWJLaXQgbWVkaWEgY29udHJvbHMgYXJlIG5vdCBzaG93biBhbmQgaW5zdGVhZCB3ZSBk ZWxlZ2F0ZSB0byBBVktpdCB0byBkaXNwbGF5IG1lZGlhIGNvbnRyb2xzLgorICAgICAgICBTbyB3 ZSBjb3VsZCBzaW1wbHkgZGlzcmVnYXJkIHRoaXMgd2hvbGUgbG9naWMgaW4gaU9TLiBCdXQgd2Ug Y2hvb3NlIHRvIGluc3RlYWQgdXNlIHRoZSAid2Via2l0cHJlc2VudGF0aW9ubW9kZWNoYW5nZWQi CisgICAgICAgIHdoZW4gdGhlIHByZXNlbnRhdGlvbiBtb2RlIEFQSSBpcyBzdXBwb3J0ZWQsIGFz IGlzIHRoZSBjYXNlIG9uIGlPUyAxMSwgdG8gZGV0ZXJtaW5lIGNoYW5nZXMgb2YgbWVkaWEgZnVs bHNjcmVlbiBzdGF0ZS4KKyAgICAgICAgVGhpcyB3YXksIHNob3VsZCB3ZSBldmVyIGNob29zZSB0 byBzdXBwb3J0IGZ1bGxzY3JlZW4gbWVkaWEgY29udHJvbHMgcHJvdmlkZWQgYnkgV2ViS2l0IG9u IGlPUywgdGhpcyBsb2dpYyBpcyBhbHJlYWR5CisgICAgICAgIGNvcnJlY3QgYW5kIHdlIHdyaXRl IGxlc3MgcGxhdGZvcm0tc3BlY2lmaWMgY29kZS4KKworICAgICAgICBUaGlzLCBhbGFzLCBjYW5u b3QgYmUgdGVzdGVkIHNpbmNlIHdlIGNhbid0IGZvcmNlIHRoZSBYIGJ1dHRvbiB0byBiZSB0YXBw ZWQgd2l0aGluIHRoZSBBVktpdCBmdWxsc2NyZWVuIGNvbnRyb2xzLgorCisgICAgICAgICogTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvY29udHJvbHMtdmlzaWJpbGl0eS1zdXBw b3J0LmpzOgorICAgICAgICAoQ29udHJvbHNWaXNpYmlsaXR5U3VwcG9ydC5wcm90b3R5cGUuZ2V0 IG1lZGlhRXZlbnRzKToKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9t ZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzOgorICAgICAgICAoTWVkaWFDb250cm9sbGVyKToKKyAg ICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9zdGFydC1zdXBwb3J0 LmpzOgorICAgICAgICAoU3RhcnRTdXBwb3J0LnByb3RvdHlwZS5nZXQgbWVkaWFFdmVudHMpOgor CiAyMDE3LTA3LTE3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAg ICAgUkVHUkVTU0lPTjogb3JkZXIgb2YgQWlyUGxheSBhbmQgdm9sdW1lIGNvbnRyb2xzIGlzIGlu Y29uc2lzdGVudCBiZXR3ZWVuIDxhdWRpbz4gYW5kIDx2aWRlbz4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL2NvbnRyb2xzLXZp c2liaWxpdHktc3VwcG9ydC5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL21lZGlhL2NvbnRyb2xzLXZpc2liaWxpdHktc3VwcG9ydC5qcwppbmRleCA5N2Ez MzZlMjY0OWMwNDBlOTM0MGUwN2QxNmQ4ZWEwMjRjZGYxODA0Li41MzUwMWQ2MWExNmVkMzRmNWUx NjczMWY0Y2IwM2ZjNWE1NDBmYmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9jb250cm9scy12aXNpYmlsaXR5LXN1cHBvcnQu anMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVk aWEvY29udHJvbHMtdmlzaWJpbGl0eS1zdXBwb3J0LmpzCkBAIC00NSw3ICs0NSw3IEBAIGNsYXNz IENvbnRyb2xzVmlzaWJpbGl0eVN1cHBvcnQgZXh0ZW5kcyBNZWRpYUNvbnRyb2xsZXJTdXBwb3J0 CiAKICAgICBnZXQgbWVkaWFFdmVudHMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIFsibG9hZGVk bWV0YWRhdGEiLCAicGxheSIsICJwYXVzZSIsICJ3ZWJraXRmdWxsc2NyZWVuY2hhbmdlIiwgIndl YmtpdGN1cnJlbnRwbGF5YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkIl07CisgICAgICAgIHJl dHVybiBbImxvYWRlZG1ldGFkYXRhIiwgInBsYXkiLCAicGF1c2UiLCAid2Via2l0Y3VycmVudHBs YXliYWNrdGFyZ2V0aXN3aXJlbGVzc2NoYW5nZWQiLCB0aGlzLm1lZGlhQ29udHJvbGxlci5mdWxs c2NyZWVuQ2hhbmdlRXZlbnRUeXBlXTsKICAgICB9CiAKICAgICBnZXQgdHJhY2tzVG9Nb25pdG9y KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21v ZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCmluZGV4IDU5ZTBi OGUzYzViMzM0ZGM3YjIyOGI4ZGUxMzM2NGFhZGQ4ZmYzYmUuLmYzNTE1NTI2ZmFlNGEwYTk5MTBi MzJjMTg3YWYxZmQ1Y2U5ZGI0MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29u dHJvbGxlci5qcwpAQCAtMzIsNiArMzIsOCBAQCBjbGFzcyBNZWRpYUNvbnRyb2xsZXIKICAgICAg ICAgdGhpcy5tZWRpYSA9IG1lZGlhOwogICAgICAgICB0aGlzLmhvc3QgPSBob3N0OwogCisgICAg ICAgIHRoaXMuZnVsbHNjcmVlbkNoYW5nZUV2ZW50VHlwZSA9IG1lZGlhLndlYmtpdFN1cHBvcnRz UHJlc2VudGF0aW9uTW9kZSA/ICJ3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCIgOiAid2Vi a2l0ZnVsbHNjcmVlbmNoYW5nZSI7CisKICAgICAgICAgdGhpcy5oYXNQbGF5ZWQgPSBmYWxzZTsK IAogICAgICAgICB0aGlzLmNvbnRhaW5lciA9IHNoYWRvd1Jvb3QuYXBwZW5kQ2hpbGQoZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwpAQCAtNTQsMTAgKzU2LDcgQEAgY2xhc3MgTWVkaWFD b250cm9sbGVyCiAgICAgICAgIG1lZGlhLnZpZGVvVHJhY2tzLmFkZEV2ZW50TGlzdGVuZXIoImFk ZHRyYWNrIiwgdGhpcyk7CiAgICAgICAgIG1lZGlhLnZpZGVvVHJhY2tzLmFkZEV2ZW50TGlzdGVu ZXIoInJlbW92ZXRyYWNrIiwgdGhpcyk7CiAKLSAgICAgICAgaWYgKG1lZGlhLndlYmtpdFN1cHBv cnRzUHJlc2VudGF0aW9uTW9kZSkKLSAgICAgICAgICAgIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIo IndlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkIiwgdGhpcyk7Ci0gICAgICAgIGVsc2UKLSAg ICAgICAgICAgIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoIndlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Ui LCB0aGlzKTsKKyAgICAgICAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcih0aGlzLmZ1bGxzY3JlZW5D aGFuZ2VFdmVudFR5cGUsIHRoaXMpOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvc3Rh cnQtc3VwcG9ydC5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL21lZGlhL3N0YXJ0LXN1cHBvcnQuanMKaW5kZXggMDE5MDQ3MDI5MjhlODU5Y2I4Mzg4NmFl ZmY0YmJmZGViMTNjYWIxZC4uOGRhMjFhZjk2N2EwY2FhYzMxYmMzYTY3MmU2YzY2YjRjNTVjNjU2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvbWVkaWEvc3RhcnQtc3VwcG9ydC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21v ZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9zdGFydC1zdXBwb3J0LmpzCkBAIC0zNyw3ICszNyw3 IEBAIGNsYXNzIFN0YXJ0U3VwcG9ydCBleHRlbmRzIE1lZGlhQ29udHJvbGxlclN1cHBvcnQKIAog ICAgIGdldCBtZWRpYUV2ZW50cygpCiAgICAgewotICAgICAgICByZXR1cm4gWyJsb2FkZWRtZXRh ZGF0YSIsICJwbGF5IiwgImVycm9yIiwgIndlYmtpdGZ1bGxzY3JlZW5jaGFuZ2UiXTsKKyAgICAg ICAgcmV0dXJuIFsibG9hZGVkbWV0YWRhdGEiLCAicGxheSIsICJlcnJvciIsIHRoaXMubWVkaWFD b250cm9sbGVyLmZ1bGxzY3JlZW5DaGFuZ2VFdmVudFR5cGVdOwogICAgIH0KIAogICAgIGJ1dHRv bldhc1ByZXNzZWQoY29udHJvbCkK 315814 2017-07-18 12:21:34 -0700 2017-07-18 12:59:17 -0700 Patch for landing bug-174627-20170718212128.patch text/plain 6215 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJhZmZkMzViMmM2NGNh MDMwNzFjNWQ2NjY4MjY2YjgzMzI2Y2NiNC4uNzM3ZWE4NjEwMTc2MmY3ZjdiODFiNGZlZTM1ZDZm MDE3ODM0YWEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE3LTA3LTE4ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gV2ViS2l0IG1l ZGlhIGNvbnRyb2xzIGFyZSBzb21ldGltZXMgc2hvd24gYWZ0ZXIgZXhpdGluZyBmdWxsIHNjcmVl biBvbiB2aW1lby5jb20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NDYyNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzMzMDEwMDU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGVhbiBKYWNrc29uLCBwcm92aXNpb25hbGx5IHJldmlld2VkIGJ5IEpl cmVteSBKb25lcy4KKworICAgICAgICBPbiBpT1MgMTEsIGJvdGggdGhlIFdlYktpdCBtZWRpYSBj b250cm9scyBhbmQgdGhlIFZpbWVvIGN1c3RvbSBjb250cm9scyB3b3VsZCBhcHBlYXIgc29tZXRp bWVzIHdoZW4gZXhpdGluZworICAgICAgICBmcm9tIGZ1bGxzY3JlZW4gd2hlbiB0aGUgdmlkZW8g d2FzIHBsYXlpbmcgYW5kIHRoZSB1c2VyIHdvdWxkIHRhcCB0aGUgWCBidXR0b24sIHdoaWNoIHdv dWxkIHBhdXNlIHRoZSB2aWRlbworICAgICAgICBhcyB3ZWxsIGFzIGV4aXQgZnVsbHNjcmVlbi4K KworICAgICAgICBUaGUgcmVhc29uIHRoaXMgaGFwcGVucyBpcyB0aGF0IHRoZSBDb250cm9sc1Zp c2liaWxpdHlTdXBwb3J0IG9iamVjdCwgd2hpY2ggZ292ZXJucyB3aGV0aGVyIHRoZSBXZWJLaXQg bWVkaWEKKyAgICAgICAgY29udHJvbHMgc2hvdWxkIGJlIGRpc3BsYXllZCBmb3IgYSBnaXZlbiB2 aWRlbywgd291ZCBsaXN0ZW4gdG8gInBhdXNlIiBhbmQgIndlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Ui IGV2ZW50cworICAgICAgICBhbmQgZGV0ZXJtaW5lIHdoZXRoZXIgdG8gc2hvdyB0aGUgV2ViS2l0 IG1lZGlhIGNvbnRyb2xzLiBXZSBsaXN0ZW4gdG8gdGhlICJwYXVzZSIgZXZlbnQgYmVjYXVzZSB3 aGVuIG1lZGlhCisgICAgICAgIHBhdXNlcywgYW5kIHRoZSB2aWRlbyBoYXMgdGhlICJjb250cm9s cyIgYXR0cmlidXRlIHNldCwgd2Ugc2hvdWxkIHNob3cgdGhlIGNvbnRyb2xzIGFuZCBzdXNwZW5k IHRoZSBjb250cm9scworICAgICAgICBhdXRvLWhpZGUgdGltZXIuIEFuZCB3ZSdyZSBpbnRlcmVz dGVkIGluIGtub3dpbmcgd2hlbiB3ZSBlbnRlciBhbmQgZXhpdCBmdWxsc2NyZWVuIGJlY2F1c2Ug d2Ugd2FudCB0byBvdmVycmlkZQorICAgICAgICB0aGUgImNvbnRyb2xzIiBhdHRyaWJ1dGUgbm90 IGJlaW5nIHNldCB3aGVuIHdlIGVudGVyIGZ1bGxzY3JlZW4uCisKKyAgICAgICAgSG93ZXZlciwg b24gaU9TIDExLCBpdCBhcHBlYXJzIHRoYXQgdGhlICJ3ZWJraXRmdWxsc2NyZWVuY2hhbmdlIiBl dmVudCBpcyBub3QgcmVsaWFibHkgZmlyZWQgYXMgdGhlIHVzZXIgZW50ZXJzCisgICAgICAgIGFu ZCBleGl0cyBmdWxsc2NyZWVuLCB3aGljaCBpcyB0cmFja2VkIGJ5IHdlYmtpdC5vcmcvYi8xNzQ2 MjYuIFNvLCB3aGVuIHRoZSB1c2VyIGV4aXRzIGZ1bGxzY3JlZW4sIHdlIHdvdWxkIGJlCisgICAg ICAgIGluZm9ybWVkIG9mIHRoZSB2aWRlbyBiZWluZyBwYXVzZWQgdmlhIGEgInBhdXNlIiBldmVu dCwgYnV0IG5vdCBvZiB0aGUgdmlkZW8gZXhpdGluZyBmdWxsc2NyZWVuLiBBbmQgYmVjYXVzZQor ICAgICAgICBtZWRpYSBldmVudHMgYXJlIGFzeW5jaHJvbm91cywgdGhlICJwYXVzZSIgZXZlbnQg d291bGQgc29tZXRpbWVzIGJlIGZpcmVkIGJlZm9yZSB3ZSBleGl0ZWQgZnVsbHNjcmVlbiwgYW5k IHdoZW4KKyAgICAgICAgdGhlIF91cGRhdGVDb250cm9scygpIHdvdWxkIHJ1biwgd2Ugd291bGQg c29tZXRpbWVzIGRldGVybWluZSB0aGF0IHdlIGFyZSBpbiBmdWxsc2NyZWVuIHN0aWxsIGFuZCBk ZXRlcm1pbmUKKyAgICAgICAgdGhhdCB0aGUgV2ViS2l0IG1lZGlhIGNvbnRyb2xzIHNob3VsZCBi ZSBzaG93bi4KKworICAgICAgICBPZiBjb3Vyc2UsIG9uIGlPUywgdGhlIFdlYktpdCBtZWRpYSBj b250cm9scyBhcmUgbm90IHNob3duIGFuZCBpbnN0ZWFkIHdlIGRlbGVnYXRlIHRvIEFWS2l0IHRv IGRpc3BsYXkgbWVkaWEgY29udHJvbHMuCisgICAgICAgIFNvIHdlIGNvdWxkIHNpbXBseSBkaXNy ZWdhcmQgdGhpcyB3aG9sZSBsb2dpYyBpbiBpT1MuIEJ1dCB3ZSBjaG9vc2UgdG8gaW5zdGVhZCB1 c2UgdGhlICJ3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCIKKyAgICAgICAgd2hlbiB0aGUg cHJlc2VudGF0aW9uIG1vZGUgQVBJIGlzIHN1cHBvcnRlZCwgYXMgaXMgdGhlIGNhc2Ugb24gaU9T IDExLCB0byBkZXRlcm1pbmUgY2hhbmdlcyBvZiBtZWRpYSBmdWxsc2NyZWVuIHN0YXRlLgorICAg ICAgICBUaGlzIHdheSwgc2hvdWxkIHdlIGV2ZXIgY2hvb3NlIHRvIHN1cHBvcnQgZnVsbHNjcmVl biBtZWRpYSBjb250cm9scyBwcm92aWRlZCBieSBXZWJLaXQgb24gaU9TLCB0aGlzIGxvZ2ljIGlz IGFscmVhZHkKKyAgICAgICAgY29ycmVjdCBhbmQgd2Ugd3JpdGUgbGVzcyBwbGF0Zm9ybS1zcGVj aWZpYyBjb2RlLgorCisgICAgICAgIFRoaXMsIGFsYXMsIGNhbm5vdCBiZSB0ZXN0ZWQgc2luY2Ug d2UgY2FuJ3QgZm9yY2UgdGhlIFggYnV0dG9uIHRvIGJlIHRhcHBlZCB3aXRoaW4gdGhlIEFWS2l0 IGZ1bGxzY3JlZW4gY29udHJvbHMuCisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9tZWRpYS9jb250cm9scy12aXNpYmlsaXR5LXN1cHBvcnQuanM6CisgICAgICAgIChD b250cm9sc1Zpc2liaWxpdHlTdXBwb3J0LnByb3RvdHlwZS5nZXQgbWVkaWFFdmVudHMpOgorICAg ICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xs ZXIuanM6CisgICAgICAgIChNZWRpYUNvbnRyb2xsZXIpOgorICAgICAgICAqIE1vZHVsZXMvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3N0YXJ0LXN1cHBvcnQuanM6CisgICAgICAgIChTdGFy dFN1cHBvcnQucHJvdG90eXBlLmdldCBtZWRpYUV2ZW50cyk6CisKIDIwMTctMDctMTcgIEFudG9p bmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBvcmRl ciBvZiBBaXJQbGF5IGFuZCB2b2x1bWUgY29udHJvbHMgaXMgaW5jb25zaXN0ZW50IGJldHdlZW4g PGF1ZGlvPiBhbmQgPHZpZGVvPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvY29udHJvbHMtdmlzaWJpbGl0eS1zdXBwb3J0Lmpz IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvY29u dHJvbHMtdmlzaWJpbGl0eS1zdXBwb3J0LmpzCmluZGV4IDk3YTMzNmUyNjQ5YzA0MGU5MzQwZTA3 ZDE2ZDhlYTAyNGNkZjE4MDQuLjUzNTAxZDYxYTE2ZWQzNGY1ZTE2NzMxZjRjYjAzZmM1YTU0MGZi ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL21lZGlhL2NvbnRyb2xzLXZpc2liaWxpdHktc3VwcG9ydC5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9jb250cm9scy12aXNpYmls aXR5LXN1cHBvcnQuanMKQEAgLTQ1LDcgKzQ1LDcgQEAgY2xhc3MgQ29udHJvbHNWaXNpYmlsaXR5 U3VwcG9ydCBleHRlbmRzIE1lZGlhQ29udHJvbGxlclN1cHBvcnQKIAogICAgIGdldCBtZWRpYUV2 ZW50cygpCiAgICAgewotICAgICAgICByZXR1cm4gWyJsb2FkZWRtZXRhZGF0YSIsICJwbGF5Iiwg InBhdXNlIiwgIndlYmtpdGZ1bGxzY3JlZW5jaGFuZ2UiLCAid2Via2l0Y3VycmVudHBsYXliYWNr dGFyZ2V0aXN3aXJlbGVzc2NoYW5nZWQiXTsKKyAgICAgICAgcmV0dXJuIFsibG9hZGVkbWV0YWRh dGEiLCAicGxheSIsICJwYXVzZSIsICJ3ZWJraXRjdXJyZW50cGxheWJhY2t0YXJnZXRpc3dpcmVs ZXNzY2hhbmdlZCIsIHRoaXMubWVkaWFDb250cm9sbGVyLmZ1bGxzY3JlZW5DaGFuZ2VFdmVudFR5 cGVdOwogICAgIH0KIAogICAgIGdldCB0cmFja3NUb01vbml0b3IoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29u dHJvbGxlci5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMKaW5kZXggNTllMGI4ZTNjNWIzMzRkYzdiMjI4Yjhk ZTEzMzY0YWFkZDhmZjNiZS4uZjM1MTU1MjZmYWU0YTBhOTkxMGIzMmMxODdhZjFmZDVjZTlkYjQx MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCkBAIC0zMiw2 ICszMiw4IEBAIGNsYXNzIE1lZGlhQ29udHJvbGxlcgogICAgICAgICB0aGlzLm1lZGlhID0gbWVk aWE7CiAgICAgICAgIHRoaXMuaG9zdCA9IGhvc3Q7CiAKKyAgICAgICAgdGhpcy5mdWxsc2NyZWVu Q2hhbmdlRXZlbnRUeXBlID0gbWVkaWEud2Via2l0U3VwcG9ydHNQcmVzZW50YXRpb25Nb2RlID8g IndlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkIiA6ICJ3ZWJraXRmdWxsc2NyZWVuY2hhbmdl IjsKKwogICAgICAgICB0aGlzLmhhc1BsYXllZCA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuY29u dGFpbmVyID0gc2hhZG93Um9vdC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKSk7CkBAIC01NCwxMCArNTYsNyBAQCBjbGFzcyBNZWRpYUNvbnRyb2xsZXIKICAgICAgICAg bWVkaWEudmlkZW9UcmFja3MuYWRkRXZlbnRMaXN0ZW5lcigiYWRkdHJhY2siLCB0aGlzKTsKICAg ICAgICAgbWVkaWEudmlkZW9UcmFja3MuYWRkRXZlbnRMaXN0ZW5lcigicmVtb3ZldHJhY2siLCB0 aGlzKTsKIAotICAgICAgICBpZiAobWVkaWEud2Via2l0U3VwcG9ydHNQcmVzZW50YXRpb25Nb2Rl KQotICAgICAgICAgICAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigid2Via2l0cHJlc2VudGF0aW9u bW9kZWNoYW5nZWQiLCB0aGlzKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbWVkaWEuYWRk RXZlbnRMaXN0ZW5lcigid2Via2l0ZnVsbHNjcmVlbmNoYW5nZSIsIHRoaXMpOworICAgICAgICBt ZWRpYS5hZGRFdmVudExpc3RlbmVyKHRoaXMuZnVsbHNjcmVlbkNoYW5nZUV2ZW50VHlwZSwgdGhp cyk7CiAgICAgfQogCiAgICAgLy8gUHVibGljCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9zdGFydC1zdXBwb3J0LmpzIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvc3RhcnQtc3Vw cG9ydC5qcwppbmRleCAwMTkwNDcwMjkyOGU4NTljYjgzODg2YWVmZjRiYmZkZWIxM2NhYjFkLi44 ZGEyMWFmOTY3YTBjYWFjMzFiYzNhNjcyZTZjNjZiNGM1NWM2NTZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9zdGFydC1zdXBw b3J0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L21lZGlhL3N0YXJ0LXN1cHBvcnQuanMKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgU3RhcnRTdXBw b3J0IGV4dGVuZHMgTWVkaWFDb250cm9sbGVyU3VwcG9ydAogCiAgICAgZ2V0IG1lZGlhRXZlbnRz KCkKICAgICB7Ci0gICAgICAgIHJldHVybiBbImxvYWRlZG1ldGFkYXRhIiwgInBsYXkiLCAiZXJy b3IiLCAid2Via2l0ZnVsbHNjcmVlbmNoYW5nZSJdOworICAgICAgICByZXR1cm4gWyJsb2FkZWRt ZXRhZGF0YSIsICJwbGF5IiwgImVycm9yIiwgdGhpcy5tZWRpYUNvbnRyb2xsZXIuZnVsbHNjcmVl bkNoYW5nZUV2ZW50VHlwZV07CiAgICAgfQogCiAgICAgYnV0dG9uV2FzUHJlc3NlZChjb250cm9s KQo=