206772 2020-01-24 15:06:46 -0800 AirPlay placard not visible when AirPlay is entered in fullscreen mode. 2020-01-25 15:54:39 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=206800 InRadar P2 Normal --- 1 jer.noble jer.noble aakash_jain ap commit-queue eric.carlson ews-watchlist glenn graouts joepeck philipj sergio webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1610872 0 jer.noble 2020-01-24 15:06:46 -0800 AirPlay placard not visible when AirPlay is entered in fullscreen mode. 1610873 1 jer.noble 2020-01-24 15:08:53 -0800 <rdar://problem/57098851> 1610879 2 388729 jer.noble 2020-01-24 15:18:50 -0800 Created attachment 388729 Patch 1610903 3 388729 commit-queue 2020-01-24 16:23:38 -0800 Comment on attachment 388729 Patch Clearing flags on attachment: 388729 Committed r255103: <https://trac.webkit.org/changeset/255103> 1610904 4 commit-queue 2020-01-24 16:23:40 -0800 All reviewed patches have been landed. Closing bug. 1611062 5 aakash_jain 2020-01-25 09:41:50 -0800 > Committed r255103: <https://trac.webkit.org/changeset/255103> The newly added test media/modern-media-controls/placard-support/placard-support-airplay-fullscreen-no-controls.html is consistently timing out on iOS. This issue was also indicated by EWS red iOS bubble. Tracked in Bug 206800. 1611104 6 388729 graouts 2020-01-25 13:29:30 -0800 Comment on attachment 388729 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388729&action=review Some belated review comments and a general comment: why wasn't a LayoutTests/ChangeLog generated? > Source/WebCore/Modules/modern-media-controls/media/placard-support.js:50 > + this._isDisabled = false; You should set a default value for `_isDisabled` in the constructor, right now `!_isDisabled` is true even though `enable()` has never been called after construction. Also, it would probably be best to expose it at the `MediaControllerSupport` level since this is where enable()/disable() are exposed. Then we could have an `enabled` property. > Source/WebCore/Modules/modern-media-controls/media/placard-support.js:56 > + // Never disable the plackard, just remeber whether the placard should be visible or not Typos: "plackard" and "remeber". > LayoutTests/media/modern-media-controls/placard-support/placard-support-error-recover.html:4 > +<video src="404.mp4" style="width: 320px; height: 240px;" controls></video> Why was this changed? > LayoutTests/media/modern-media-controls/placard-support/placard-support-error.html:4 > +<video src="404.mp4" style="width: 320px; height: 240px;" controls></video> Why was this changed? 1611115 7 jer.noble 2020-01-25 15:54:39 -0800 (In reply to Antoine Quint from comment #6) > Comment on attachment 388729 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=388729&action=review > > Some belated review comments and a general comment: why wasn't a > LayoutTests/ChangeLog generated? > > > Source/WebCore/Modules/modern-media-controls/media/placard-support.js:50 > > + this._isDisabled = false; > > You should set a default value for `_isDisabled` in the constructor, right > now `!_isDisabled` is true even though `enable()` has never been called > after construction. It looked like enable() was always called immediately after construction, which is correct, since the PiP and AirPlay placards should always be enabled. That said, yes we should probably initialize that property in the constructor. > Also, it would probably be best to expose it at the > `MediaControllerSupport` level since this is where enable()/disable() are > exposed. Then we could have an `enabled` property. Do any other controllers need specialized enabled/disabled behavior? No need to add abstractions where they aren't necessary. > > Source/WebCore/Modules/modern-media-controls/media/placard-support.js:56 > > + // Never disable the plackard, just remeber whether the placard should be visible or not > > Typos: "plackard" and "remeber". Whoops. > > LayoutTests/media/modern-media-controls/placard-support/placard-support-error-recover.html:4 > > +<video src="404.mp4" style="width: 320px; height: 240px;" controls></video> > > Why was this changed? The prior test was incorrect: error placards should only be displayed when controls are enabled, irregardless of fullscreen state. In fact, we should have a negative test that the error placards don't get added when the 'controls' attribute is missing. 388729 2020-01-24 15:18:50 -0800 2020-01-24 16:23:38 -0800 Patch bug-206772-20200124151849.patch text/plain 9511 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWUwN2Y0NjkxZjdmOTI3 ODE3MzE3YTRhODdhOTNhYmEyYmQyNTc4ZS4uNjQyZTRkODRiN2UwYTNkYjRiOWVjZGRjMmZiM2Ji OWM2ZjJhMzZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTI0ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFpclBsYXkgcGxhY2FyZCBu b3QgdmlzaWJsZSB3aGVuIEFpclBsYXkgaXMgZW50ZXJlZCBpbiBmdWxsc2NyZWVuIG1vZGUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY3NzIKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3MDk4ODUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LWFpcnBsYXktZnVsbHNjcmVlbi1uby1j b250cm9scy5odG1sCisKKyAgICAgICAgVGhlIEFpclBsYXkgYW5kIFBpY3R1cmUtaW4tcGljdHVy ZSBwbGFjYXJkcyBzaG91bGQgYWx3YXlzIGJlY29tZSB2aXNpYmxlLCByZWdhcmRsZXNzIG9mCisg ICAgICAgIHdoZXRoZXIgdGhlIDx2aWRlbz4gZWxlbWVudCB1c2VzIHRoZSBuYXRpdmUgbWVkaWEg Y29udHJvbHMuIFNvICJkaXNhYmxpbmciIHRoZSBQbGFjYXJkU3VwcG9ydAorICAgICAgICBvYmpl Y3Qgc2hvdWxkIG5vdCByZW1vdmUgdGhlIGxpc3RlbmVycyBmb3IgcHJlc2VudGF0aW9uIG1vZGUg YW5kIHJvdXRlIGNoYW5nZSBldmVudHMuIEluc3RlYWQKKyAgICAgICAgbWVyZWx5IHJlbWVtYmVy IHdoZXRoZXIgdGhlIG9iamVjdCBpcyBkaXNhYmxlZCwgc28gdGhhdCB0aGUgImVycm9yIHBsYWNh cmQiIHdpbGwgb25seSBiZSBzaG93bgorICAgICAgICBpZiBjb250cm9scyBhcmUgZW5hYmxlZCwg YW5kIFBpUCBhbmQgQWlyUGxheSBwbGFjYXJkcyB3aWxsIGFsd2F5cyBiZSBzaG93bi4KKworICAg ICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3BsYWNhcmQtc3VwcG9y dC5qczoKKyAgICAgICAgKFBsYWNhcmRTdXBwb3J0LnByb3RvdHlwZS5lbmFibGUpOgorICAgICAg ICAoUGxhY2FyZFN1cHBvcnQucHJvdG90eXBlLmRpc2FibGUpOgorICAgICAgICAoUGxhY2FyZFN1 cHBvcnQucHJvdG90eXBlLl91cGRhdGVQbGFjYXJkKToKKwogMjAyMC0wMS0yMSAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbaVBhZF0gWW91VHViZSBkb2VzIG5v dCBhdXRvbWF0aWNhbGx5IEFpclBsYXkgd2hlbiBhIHJvdXRlIGlzIHNlbGVjdGVkIGZyb20gQ29u dHJvbCBDZW50ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL21lZGlhL3BsYWNhcmQtc3VwcG9ydC5qcyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3BsYWNhcmQtc3VwcG9ydC5qcwppbmRl eCAzZTQyMTc1NGY4MTRjM2IzNTY3OGQ1YTE4NzZkYWEwNDBmNWUyNGIyLi45YjA0N2YzMjY2NGY4 YmQwY2JiNTI5MDk2MGFmYjRiMzg1ODQ0MmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9wbGFjYXJkLXN1cHBvcnQuanMKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvcGxh Y2FyZC1zdXBwb3J0LmpzCkBAIC00NCwxMiArNDQsMTggQEAgY2xhc3MgUGxhY2FyZFN1cHBvcnQg ZXh0ZW5kcyBNZWRpYUNvbnRyb2xsZXJTdXBwb3J0CiAgICAgICAgIHRoaXMuX3VwZGF0ZVBsYWNh cmQoKTsKICAgICB9CiAKKyAgICBlbmFibGUoKQorICAgIHsKKyAgICAgICAgc3VwZXIuZW5hYmxl KCk7CisgICAgICAgIHRoaXMuX2lzRGlzYWJsZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fdXBk YXRlUGxhY2FyZCgpOworICAgIH0KKwogICAgIGRpc2FibGUoKQogICAgIHsKLSAgICAgICAgLy8g V2Ugc2hvdWxkIG5vdCBhbGxvdyBkaXNhYmxpbmcgUGxhY2FyZCBzdXBwb3J0IHdoZW4gcGxheWlu ZyBpbmxpbmUgYXMgaXQgd291bGQgcHJldmVudCB0aGUKLSAgICAgICAgLy8gUGlQIHBsYWNhcmQg ZnJvbSBiZWluZyBzaG93biBpZiB0aGUgY29udHJvbHMgYXJlIGRpc2FibGVkLgotICAgICAgICBp ZiAodGhpcy5tZWRpYUNvbnRyb2xsZXIuaXNGdWxsc2NyZWVuKQotICAgICAgICAgICAgc3VwZXIu ZGlzYWJsZSgpOworICAgICAgICAvLyBOZXZlciBkaXNhYmxlIHRoZSBwbGFja2FyZCwganVzdCBy ZW1lYmVyIHdoZXRoZXIgdGhlIHBsYWNhcmQgc2hvdWxkIGJlIHZpc2libGUgb3Igbm90CisgICAg ICAgIHRoaXMuX2lzRGlzYWJsZWQgPSB0cnVlOworICAgICAgICB0aGlzLl91cGRhdGVQbGFjYXJk KCk7CiAgICAgfQogCiAgICAgLy8gUHJpdmF0ZQpAQCAtNjUsNyArNzEsNyBAQCBjbGFzcyBQbGFj YXJkU3VwcG9ydCBleHRlbmRzIE1lZGlhQ29udHJvbGxlclN1cHBvcnQKICAgICAgICAgZWxzZSBp ZiAobWVkaWEud2Via2l0Q3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcykgewogICAgICAg ICAgICAgdGhpcy5fdXBkYXRlQWlyUGxheVBsYWNhcmQoKTsKICAgICAgICAgICAgIHBsYWNhcmQg PSBjb250cm9scy5haXJwbGF5UGxhY2FyZDsKLSAgICAgICAgfSBlbHNlIGlmIChtZWRpYSBpbnN0 YW5jZW9mIEhUTUxWaWRlb0VsZW1lbnQgJiYgbWVkaWEuZXJyb3IgIT09IG51bGwgJiYgbWVkaWEu cGxheWVkLmxlbmd0aCA9PT0gMCkKKyAgICAgICAgfSBlbHNlIGlmICghdGhpcy5faXNEaXNhYmxl ZCAmJiBtZWRpYSBpbnN0YW5jZW9mIEhUTUxWaWRlb0VsZW1lbnQgJiYgbWVkaWEuZXJyb3IgIT09 IG51bGwgJiYgbWVkaWEucGxheWVkLmxlbmd0aCA9PT0gMCkKICAgICAgICAgICAgIHBsYWNhcmQg PSBjb250cm9scy5pbnZhbGlkUGxhY2FyZDsKIAogICAgICAgICBjb250cm9scy5wbGFjYXJkID0g cGxhY2FyZDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250 cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LWFpcnBsYXktZnVsbHNjcmVlbi1u by1jb250cm9scy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvcGxhY2FyZC1zdXBwb3J0L3BsYWNhcmQtc3VwcG9ydC1haXJwbGF5LWZ1bGxzY3Jl ZW4tbm8tY29udHJvbHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJhMjA5ZjU0NDYyNTllYWQ0 Y2E2MTNlYjliYTI5MTExOTliNDA5YzcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9t ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvcGxhY2FyZC1zdXBwb3J0L3BsYWNhcmQtc3VwcG9y dC1haXJwbGF5LWZ1bGxzY3JlZW4tbm8tY29udHJvbHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MTIgQEAKK1Rlc3RpbmcgdGhlIFBsYWNhcmRTdXBwb3J0IGJlaGF2aW9yIHdoZW4gcGxheWluZyBt ZWRpYSB0aHJvdWdoIEFpclBsYXkgaW4gZnVsbHNjcmVlbi4KKworT24gc3VjY2VzcywgeW91IHdp bGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09N UExFVEUiLgorCisKK1BBU1MgbWVkaWFDb250cm9sbGVyLmNvbnRyb2xzLnBsYWNhcmQgaXMgbWVk aWFDb250cm9sbGVyLmNvbnRyb2xzLmFpcnBsYXlQbGFjYXJkCitQQVNTIG1lZGlhQ29udHJvbGxl ci5jb250cm9scy5jaGlsZHJlbi5pbmNsdWRlcyhtZWRpYUNvbnRyb2xsZXIuY29udHJvbHMuYWly cGxheVBsYWNhcmQpIGlzIHRydWUKKworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQor CitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1t ZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LWFpcnBsYXktZnVs bHNjcmVlbi1uby1jb250cm9scy5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3BsYWNhcmQtc3VwcG9ydC9wbGFjYXJkLXN1cHBvcnQtYWlycGxheS1mdWxsc2Ny ZWVuLW5vLWNvbnRyb2xzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjg2ZWY2YzcwN2RjNDcxNTlkNmQ2YWU3 MzgyMWYyN2JmMjYyOTBjZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LWFpcnBs YXktZnVsbHNjcmVlbi1uby1jb250cm9scy5odG1sCkBAIC0wLDAgKzEsOTMgQEAKKzxzY3JpcHQg c3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlw dCBzcmM9Ii4uL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy1sb2FkZXIuanMiIHR5cGU9InRleHQv amF2YXNjcmlwdCI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21lZGlhLWNv bnRyb2xzLXV0aWxzLmpzIiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwvc2NyaXB0PgorPGJvZHk+ Cis8c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgIAorICAgIHZpZGVv LCAjaG9zdCB7CisgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgdG9wOiAwOwor ICAgICAgICBsZWZ0OiAwOworICAgIH0KKworICAgIHZpZGVvIHsKKyAgICAgICAgd2lkdGg6IDgw MHB4OworICAgICAgICBoZWlnaHQ6IDI0MHB4OworICAgIH0KKyAgICAKKzwvc3R5bGU+Cis8dmlk ZW8gc3JjPSIuLi8uLi9jb250ZW50L3Rlc3QubXA0Ij48L3ZpZGVvPgorPGRpdiBpZD0iaG9zdCI+ PC9kaXY+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisKK3dpbmRvdy5qc1Rlc3RJ c0FzeW5jID0gdHJ1ZTsKKworZGVzY3JpcHRpb24oIlRlc3RpbmcgdGhlIDxjb2RlPlBsYWNhcmRT dXBwb3J0PC9jb2RlPiBiZWhhdmlvciB3aGVuIHBsYXlpbmcgbWVkaWEgdGhyb3VnaCBBaXJQbGF5 IGluIGZ1bGxzY3JlZW4uIik7CisKK2NvbnN0IGNvbnRhaW5lciA9IGRvY3VtZW50LnF1ZXJ5U2Vs ZWN0b3IoImRpdiNob3N0Iik7Citjb25zdCBtZWRpYSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3Io InZpZGVvIik7Citjb25zdCBtZWRpYUNvbnRyb2xsZXIgPSBjcmVhdGVDb250cm9scyhjb250YWlu ZXIsIG1lZGlhLCBudWxsKTsKKworY29uc3QgYnV0dG9uID0gZG9jdW1lbnQuYm9keS5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CisKK21lZGlhLmFkZEV2ZW50TGlz dGVuZXIoImNhbnBsYXkiLCBlbnRlckZ1bGxzY3JlZW4pOworCitmdW5jdGlvbiBlbnRlckZ1bGxz Y3JlZW4oKQoreworICAgIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIobWVkaWEud2Via2l0UHJlc2Vu dGF0aW9uTW9kZSA/ICJ3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCIgOiAid2Via2l0ZnVs bHNjcmVlbmNoYW5nZSIsIG1ha2VBaXJQbGF5QXZhaWxhYmxlKTsKKyAgICBidXR0b24uc2V0QXR0 cmlidXRlKCJzdHlsZSIsICJwb3NpdGlvbjogYWJzb2x1dGU7IGxlZnQ6IDA7IHRvcDogMDsiKTsK KyAgICBidXR0b24uaW5uZXJUZXh0ID0gIkVudGVyIGZ1bGxzY3JlZW4iOworICAgIGJ1dHRvbi5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsICgpID0+IG1lZGlhLndlYmtpdEVudGVyRnVsbHNjcmVl bigpKTsKKyAgICBwcmVzc09uRWxlbWVudChidXR0b24pOworfQorCitmdW5jdGlvbiBtYWtlQWly UGxheUF2YWlsYWJsZSgpCit7CisgICAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigid2Via2l0cGxh eWJhY2t0YXJnZXRhdmFpbGFiaWxpdHljaGFuZ2VkIiwgcGxheWJhY2tUYXJnZXRBdmFpbGFiaWxp dHlDaGFuZ2VkT25jZSwgdHJ1ZSk7CisgICAgd2luZG93LmludGVybmFscy5zZXRNb2NrTWVkaWFQ bGF5YmFja1RhcmdldFBpY2tlckVuYWJsZWQodHJ1ZSk7Cit9CisKK2Z1bmN0aW9uIHBsYXliYWNr VGFyZ2V0QXZhaWxhYmlsaXR5Q2hhbmdlZE9uY2UoZXZlbnQpCit7CisgICAgbWVkaWEucmVtb3Zl RXZlbnRMaXN0ZW5lcignd2Via2l0cGxheWJhY2t0YXJnZXRhdmFpbGFiaWxpdHljaGFuZ2VkJywg cGxheWJhY2tUYXJnZXRBdmFpbGFiaWxpdHlDaGFuZ2VkT25jZSwgdHJ1ZSk7CisgICAgbWVkaWEu YWRkRXZlbnRMaXN0ZW5lcignd2Via2l0cGxheWJhY2t0YXJnZXRhdmFpbGFiaWxpdHljaGFuZ2Vk JywgcGxheWJhY2tUYXJnZXRBdmFpbGFiaWxpdHlDaGFuZ2VkQWdhaW4sIHRydWUpOworCisgICAg d2luZG93LmludGVybmFscy5zZXRNb2NrTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlclN0YXRlKCdT bGVlcHkgVFYnLCAnRGV2aWNlQXZhaWxhYmxlJyk7Cit9CisgICAgCitmdW5jdGlvbiBwbGF5YmFj a1RhcmdldEF2YWlsYWJpbGl0eUNoYW5nZWRBZ2FpbihldmVudCkKK3sKKyAgICAvLyBzZXRNb2Nr TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlclN0YXRlIGhhcHBlbnMgYXN5bmNocm9ub3VzbHkgaW4g V0syIGFuZCBhCisgICAgLy8gIndlYmtpdHBsYXliYWNrdGFyZ2V0YXZhaWxhYmlsaXR5Y2hhbmdl ZCIgaXMgYWx3YXlzIHNlbnQgd2hlbiBhbiBldmVudCBsaXN0ZW5lcgorICAgIC8vIGlzIGFkZGVk LCBzbyB3ZSBtYXkgZ2V0IGEgIm5vdCBhdmFpbGFibGUiIGV2ZW50IGZpcnN0LgorICAgIGlmIChl dmVudC5hdmFpbGFiaWxpdHkgPT0gJ25vdC1hdmFpbGFibGUnKQorICAgICAgICByZXR1cm47CisK KyAgICBtZWRpYS5yZW1vdmVFdmVudExpc3RlbmVyKCd3ZWJraXRwbGF5YmFja3RhcmdldGF2YWls YWJpbGl0eWNoYW5nZWQnLCBwbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUNoYW5nZWRBZ2Fpbiwg dHJ1ZSk7CisgICAgZW50ZXJBaXJQbGF5KCk7Cit9CisKK2Z1bmN0aW9uIGVudGVyQWlyUGxheSgp Cit7CisgICAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigid2Via2l0Y3VycmVudHBsYXliYWNrdGFy Z2V0aXN3aXJlbGVzc2NoYW5nZWQiLCBjdXJyZW50UGxheWJhY2tUYXJnZXRJc1dpcmVsZXNzQ2hh bmdlZCk7CisgICAgbWVkaWEud2Via2l0U2hvd1BsYXliYWNrVGFyZ2V0UGlja2VyKCk7Cit9CisK K2Z1bmN0aW9uIGN1cnJlbnRQbGF5YmFja1RhcmdldElzV2lyZWxlc3NDaGFuZ2VkKGV2ZW50KQor eworICAgIGlmICghbWVkaWEud2Via2l0Q3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcykK KyAgICAgICAgcmV0dXJuOworCisgICAgc2hvdWxkQmUoIm1lZGlhQ29udHJvbGxlci5jb250cm9s cy5wbGFjYXJkIiwgIm1lZGlhQ29udHJvbGxlci5jb250cm9scy5haXJwbGF5UGxhY2FyZCIpOwor ICAgIHNob3VsZEJlVHJ1ZSgibWVkaWFDb250cm9sbGVyLmNvbnRyb2xzLmNoaWxkcmVuLmluY2x1 ZGVzKG1lZGlhQ29udHJvbGxlci5jb250cm9scy5haXJwbGF5UGxhY2FyZCkiKTsKKworICAgIGRl YnVnKCIiKTsKKyAgICBjb250YWluZXIucmVtb3ZlKCk7CisgICAgYnV0dG9uLnJlbW92ZSgpOwor ICAgIG1lZGlhLnJlbW92ZSgpOworICAgIGZpbmlzaEpTVGVzdCgpOworfQorCis8L3NjcmlwdD4K KzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3Njcmlw dD4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LWVycm9yLXJlY292ZXIuaHRt bCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBv cnQvcGxhY2FyZC1zdXBwb3J0LWVycm9yLXJlY292ZXIuaHRtbAppbmRleCAwYzUyY2FjZTZmMWY4 NjlmYmI1NGU1NjU5MjAxYjI3ZTU2M2NhMzk3Li41OGEwM2FjZDhmMmY2ODc0YTc5NGM5NmRjNDNl OWE4OGNlYjc0ZTE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvcGxhY2FyZC1zdXBwb3J0L3BsYWNhcmQtc3VwcG9ydC1lcnJvci1yZWNvdmVyLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3BsYWNhcmQt c3VwcG9ydC9wbGFjYXJkLXN1cHBvcnQtZXJyb3ItcmVjb3Zlci5odG1sCkBAIC0xLDcgKzEsNyBA QAogPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp cHQ+CiA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21lZGlhLWNvbnRyb2xzLWxvYWRlci5qcyIg dHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48L3NjcmlwdD4KIDxib2R5PgotPHZpZGVvIHNyYz0iNDA0 Lm1wNCIgc3R5bGU9IndpZHRoOiAzMjBweDsgaGVpZ2h0OiAyNDBweDsiPjwvdmlkZW8+Cis8dmlk ZW8gc3JjPSI0MDQubXA0IiBzdHlsZT0id2lkdGg6IDMyMHB4OyBoZWlnaHQ6IDI0MHB4OyIgY29u dHJvbHM+PC92aWRlbz4KIDxkaXYgaWQ9InNoYWRvdyI+PC9kaXY+CiA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCI+CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1t ZWRpYS1jb250cm9scy9wbGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LWVycm9yLmh0bWwg Yi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvcGxhY2FyZC1zdXBwb3J0 L3BsYWNhcmQtc3VwcG9ydC1lcnJvci5odG1sCmluZGV4IDcwZmM4MGQ3YjVhMjFjNzNhYTIzYWMy MTgwZGJlZjgzZmZjNTQxNDcuLmQ1YjY4MDVkMDkwNjA2MWE4MTBjYjZlZDUxYmVjMGYzMTBiOTNi ZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9w bGFjYXJkLXN1cHBvcnQvcGxhY2FyZC1zdXBwb3J0LWVycm9yLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3BsYWNhcmQtc3VwcG9ydC9wbGFjYXJkLXN1 cHBvcnQtZXJyb3IuaHRtbApAQCAtMSw3ICsxLDcgQEAKIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9y ZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uL3Jlc291 cmNlcy9tZWRpYS1jb250cm9scy1sb2FkZXIuanMiIHR5cGU9InRleHQvamF2YXNjcmlwdCI+PC9z Y3JpcHQ+CiA8Ym9keT4KLTx2aWRlbyBzcmM9IjQwNC5tcDQiIHN0eWxlPSJ3aWR0aDogMzIwcHg7 IGhlaWdodDogMjQwcHg7Ij48L3ZpZGVvPgorPHZpZGVvIHNyYz0iNDA0Lm1wNCIgc3R5bGU9Indp ZHRoOiAzMjBweDsgaGVpZ2h0OiAyNDBweDsiIGNvbnRyb2xzPjwvdmlkZW8+CiA8ZGl2IGlkPSJz aGFkb3ciPjwvZGl2PgogPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgogCg==