165494 2016-12-06 15:11:37 -0800 [Modern Media Controls] Media controls use the fullscreen layout after going from inline to fullscreen to PiP to inline 2016-12-06 15:49:23 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 graouts graouts oldest_to_newest 1257004 0 graouts 2016-12-06 15:11:37 -0800 [Modern Media Controls] Media controls use the fullscreen layout after going from inline to fullscreen to PiP to inline 1257007 1 296332 graouts 2016-12-06 15:17:18 -0800 Created attachment 296332 Patch 1257013 2 296332 dino 2016-12-06 15:19:59 -0800 Comment on attachment 296332 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296332&action=review > Source/WebCore/ChangeLog:8 > + We would only call _updateControlsIfNeeded() when entering or leaving fullscreen, so we going from fullscreen to PiP to Grammar: so we going 1257035 3 graouts 2016-12-06 15:49:23 -0800 https://trac.webkit.org/changeset/209432 296332 2016-12-06 15:17:18 -0800 2016-12-06 15:19:59 -0800 Patch bug-165494-20161206151640.patch text/plain 11522 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5MzkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzcyN2IxOTU4NzYxMjcx NDMzYjFhNzNmNDg4MWVjMTlkNTIzMThjOC4uNzMxNjY5OWIyMWY2MjUzMTE3ZTAxNmZmNjMzZTk3 YzY3MmVjZDYwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTEyLTA2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gTWVkaWEgY29udHJvbHMgdXNlIHRoZSBmdWxsc2NyZWVuIGxheW91dCBhZnRlciBn b2luZyBmcm9tIGlubGluZSB0byBmdWxsc2NyZWVuIHRvIFBpUCB0byBpbmxpbmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTQ5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHdvdWxkIG9ubHkgY2Fs bCBfdXBkYXRlQ29udHJvbHNJZk5lZWRlZCgpIHdoZW4gZW50ZXJpbmcgb3IgbGVhdmluZyBmdWxs c2NyZWVuLCBzbyB3ZSBnb2luZyBmcm9tIGZ1bGxzY3JlZW4gdG8gUGlQIHRvCisgICAgICAgIGlu bGluZSB3b3VsZCByZXRhaW4gZnVsbHNjcmVlbiBjb250cm9scyBzaW5jZSB3ZSB3b3VsZCBub3Qg Y2hlY2sgZm9yIHRoZSBldmVudCB0aGF0IGluZGljYXRlcyB3ZSB3ZW50IGJhY2sgZnJvbSBQaVAg dG8KKyAgICAgICAgaW5saW5lLiBPbiBwbGF0Zm9ybXMgdGhhdCBzdXBwb3J0IGl0LCB3ZSBsaXN0 ZW4gdG8gdGhlICJ3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCIgZXZlbnQKKyAgICAgICAg dG8gdXBkYXRlIHRoZSBjb250cm9scywgYW5kIG9ubHkgIndlYmtpdGZ1bGxzY3JlZW5jaGFuZ2Ui IG9uIG90aGVycyAoaWUuIFlvc2VtaXRlKS4KKworICAgICAgICBUZXN0OiBtZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvbWVkaWEtY29udHJvbGxlci9tZWRpYS1jb250cm9sbGVyLWlubGluZS10 by1mdWxsc2NyZWVuLXRvLXBpcC10by1pbmxpbmUuaHRtbAorCisgICAgICAgICogTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qczoKKyAgICAgICAg KE1lZGlhQ29udHJvbGxlcik6CisgICAgICAgIChNZWRpYUNvbnRyb2xsZXIucHJvdG90eXBlLmhh bmRsZUV2ZW50KToKKyAgICAgICAgKE1lZGlhQ29udHJvbGxlci5wcm90b3R5cGUuX3JldHVybk1l ZGlhTGF5ZXJUb0lubGluZUlmTmVlZGVkKToKKwogMjAxNi0xMi0wNiAgU2FtIFdlaW5pZyAgPHNh bUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXZWJJRExdIEFkZCBzdXBwb3J0IGZvciBjb252ZXJ0 aW5nIGRpY3Rpb25hcmllcyB0byBKUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qcyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRy b2xsZXIuanMKaW5kZXggMGE4MDQwMzM3MWYxNjM5MzZkNmNkZDU5M2FkM2VhZGRiNTNhNGEyZS4u ZjM3NmJhMjllMmI5OTczYzRmMDhmMzhmYzRmYTQ3ZmEzZDljODE5YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29u dHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250 cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCkBAIC0zMiwxNiArMzIsMTcgQEAgY2xhc3Mg TWVkaWFDb250cm9sbGVyCiAgICAgICAgIHRoaXMubWVkaWEgPSBtZWRpYTsKICAgICAgICAgdGhp cy5ob3N0ID0gaG9zdDsKIAotICAgICAgICBpZiAoaG9zdCkgewotICAgICAgICAgICAgbWVkaWEu YWRkRXZlbnRMaXN0ZW5lcigid2Via2l0cHJlc2VudGF0aW9ubW9kZWNoYW5nZWQiLCB0aGlzKTsK KyAgICAgICAgaWYgKGhvc3QpCiAgICAgICAgICAgICBzaGFkb3dSb290LmFwcGVuZENoaWxkKGhv c3QudGV4dFRyYWNrQ29udGFpbmVyKTsKLSAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3VwZGF0 ZUNvbnRyb2xzSWZOZWVkZWQoKTsKIAogICAgICAgICBzaGFkb3dSb290LmFkZEV2ZW50TGlzdGVu ZXIoInJlc2l6ZSIsIHRoaXMpOwogCi0gICAgICAgIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoIndl YmtpdGZ1bGxzY3JlZW5jaGFuZ2UiLCB0aGlzKTsKKyAgICAgICAgaWYgKG1lZGlhLndlYmtpdFN1 cHBvcnRzUHJlc2VudGF0aW9uTW9kZSkKKyAgICAgICAgICAgIG1lZGlhLmFkZEV2ZW50TGlzdGVu ZXIoIndlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkIiwgdGhpcyk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoIndlYmtpdGZ1bGxzY3JlZW5jaGFu Z2UiLCB0aGlzKTsKICAgICB9CiAKICAgICBnZXQgbGF5b3V0VHJhaXRzKCkKQEAgLTY4LDEyICs2 OSwxMSBAQCBjbGFzcyBNZWRpYUNvbnRyb2xsZXIKICAgICB7CiAgICAgICAgIGlmIChldmVudC50 eXBlID09PSAicmVzaXplIiAmJiBldmVudC5jdXJyZW50VGFyZ2V0ID09PSB0aGlzLnNoYWRvd1Jv b3QpCiAgICAgICAgICAgICB0aGlzLl91cGRhdGVDb250cm9sc1NpemUoKTsKLSAgICAgICAgZWxz ZSBpZiAoZXZlbnQuY3VycmVudFRhcmdldCAhPT0gdGhpcy5tZWRpYSkKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgZWxzZSBpZiAoZXZlbnQudHlwZSA9PT0gIndlYmtpdGZ1bGxzY3JlZW5j aGFuZ2UiKQorICAgICAgICBlbHNlIGlmIChldmVudC5jdXJyZW50VGFyZ2V0ID09PSB0aGlzLm1l ZGlhKSB7CiAgICAgICAgICAgICB0aGlzLl91cGRhdGVDb250cm9sc0lmTmVlZGVkKCk7Ci0gICAg ICAgIGVsc2UgaWYgKGV2ZW50LnR5cGUgPT09ICJ3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdl ZCIpCi0gICAgICAgICAgICB0aGlzLl9yZXR1cm5NZWRpYUxheWVyVG9JbmxpbmVJZk5lZWRlZCgp OworICAgICAgICAgICAgaWYgKGV2ZW50LnR5cGUgPT09ICJ3ZWJraXRwcmVzZW50YXRpb25tb2Rl Y2hhbmdlZCIpCisgICAgICAgICAgICAgICAgdGhpcy5fcmV0dXJuTWVkaWFMYXllclRvSW5saW5l SWZOZWVkZWQoKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIFByaXZhdGUKQEAgLTExNiw3 ICsxMTYsOCBAQCBjbGFzcyBNZWRpYUNvbnRyb2xsZXIKIAogICAgIF9yZXR1cm5NZWRpYUxheWVy VG9JbmxpbmVJZk5lZWRlZCgpCiAgICAgewotICAgICAgICB3aW5kb3cucmVxdWVzdEFuaW1hdGlv bkZyYW1lKCgpID0+IHRoaXMuaG9zdC5zZXRQcmVwYXJlZFRvUmV0dXJuVmlkZW9MYXllclRvSW5s aW5lKHRoaXMubWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSAhPT0gUGlQTW9kZSkpOworICAg ICAgICBpZiAodGhpcy5ob3N0KQorICAgICAgICAgICAgd2luZG93LnJlcXVlc3RBbmltYXRpb25G cmFtZSgoKSA9PiB0aGlzLmhvc3Quc2V0UHJlcGFyZWRUb1JldHVyblZpZGVvTGF5ZXJUb0lubGlu ZSh0aGlzLm1lZGlhLndlYmtpdFByZXNlbnRhdGlvbk1vZGUgIT09IFBpUE1vZGUpKTsKICAgICB9 CiAKICAgICBfY29udHJvbHNDbGFzcygpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzFlNGJiYjNiOWZjYWZmOTYwYWQ2NTVm NjYyODk2YmVlZjdiNDA3My4uYmQ2MGM3ZWVjZDkyNDVmMDI4NGM3Mzk3NGI2M2ZhOTA2MWE3YjM1 NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTEyLTA2ICBBbnRvaW5lIFF1aW50ICA8Z3Jh b3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBDb250cm9sc10gTWVkaWEg Y29udHJvbHMgdXNlIHRoZSBmdWxsc2NyZWVuIGxheW91dCBhZnRlciBnb2luZyBmcm9tIGlubGlu ZSB0byBmdWxsc2NyZWVuIHRvIFBpUCB0byBpbmxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTQ5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG5ldyB0ZXN0cyB0aGF0IGdvZXMgZnJvbSBp bmxpbmUgdG8gZnVsbHNjcmVlbiB0byBQaVAgdG8gaW5saW5lIGFuZCBjaGVja3MgdGhlIGNvbnRy b2xzIGhhdmUgdGhlIHJpZ2h0IHR5cGUgb24gdGhlIHdheS4KKworICAgICAgICAqIG1lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXItaW5s aW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL21l ZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlv bnM6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTYtMTIt MDYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbV2ViSURMXSBBZGQg c3VwcG9ydCBmb3IgY29udmVydGluZyBkaWN0aW9uYXJpZXMgdG8gSlMKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL21l ZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEt Y29udHJvbGxlci9tZWRpYS1jb250cm9sbGVyLWlubGluZS10by1mdWxsc2NyZWVuLXRvLXBpcC10 by1pbmxpbmUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ5ZGM5YjM5ZmQ2ZWVmNTZlZmFjYzc3 OTZiZWVmMDVjMzNjOWVkM2MKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9t b2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEtY29udHJvbGxlci9tZWRpYS1jb250cm9sbGVyLWlu bGluZS10by1mdWxsc2NyZWVuLXRvLXBpcC10by1pbmxpbmUtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsMjUgQEAKK1Rlc3RpbmcgdGhhdCBlbnRlcmluZyBmdWxsc2NyZWVuLCB0aGVuIGdvaW5nIGlu dG8gcGljdHVyZS1pbi1waWN0dXJlIGFuZCB0aGVuIGdvaW5nIGJhY2sgdG8gaW5saW5lIHByZXNl bnRzIGlubGluZSBjb250cm9scy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVz IG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKKwor TWVkaWEgc3RhcnRlZCBwbGF5aW5nLCB3ZSBwYXVzZSBpdCBhbmQgZW50ZXIgZnVsbHNjcmVlbiBi eSBjbGlja2luZyBvbiB0aGUgbWF0Y2hpbmcgYnV0dG9uLgorUEFTUyBzaGFkb3dSb290LnF1ZXJ5 U2VsZWN0b3IoJy5tZWRpYS1jb250cm9scycpLmNsYXNzTGlzdC5jb250YWlucygnaW5saW5lJykg aXMgdHJ1ZQorCitNZWRpYSByZWNlaXZlZCBhIHdlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2Vk IGV2ZW50LCBtZWRpYS53ZWJraXRQcmVzZW50YXRpb25Nb2RlID0gZnVsbHNjcmVlbi4KK1BBU1Mg c2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCcubWVkaWEtY29udHJvbHMnKS5jbGFzc0xpc3QuY29u dGFpbnMoJ2Z1bGxzY3JlZW4nKSBpcyB0cnVlCisKK1dlIGVudGVyIHBpY3R1cmUtaW4tcGljdHVy ZSBieSBjbGlja2luZyBvbiB0aGUgbWF0Y2hpbmcgYnV0dG9uLgorCitNZWRpYSByZWNlaXZlZCBh IHdlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkIGV2ZW50LCBtZWRpYS53ZWJraXRQcmVzZW50 YXRpb25Nb2RlID0gcGljdHVyZS1pbi1waWN0dXJlLgorCitXZSBleGl0IHBpY3R1cmUtaW4tcGlj dHVyZS4KKworTWVkaWEgcmVjZWl2ZWQgYSB3ZWJraXRwcmVzZW50YXRpb25tb2RlY2hhbmdlZCBl dmVudCwgbWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSA9IGlubGluZS4KK1BBU1Mgc2hhZG93 Um9vdC5xdWVyeVNlbGVjdG9yKCcubWVkaWEtY29udHJvbHMnKS5jbGFzc0xpc3QuY29udGFpbnMo J2lubGluZScpIGlzIHRydWUKKworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitU RVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL21lZGlhLWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1 bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL21lZGlhLWNvbnRyb2xsZXIvbWVkaWEtY29udHJvbGxlci1pbmxpbmUt dG8tZnVsbHNjcmVlbi10by1waXAtdG8taW5saW5lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZWU4YmE5MTA4 Y2NkNDg3OTFiMzY3Mzk2NzlhNmY0ZWMxYWI1NWFiZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL21lZGlh LWNvbnRyb2xsZXItaW5saW5lLXRvLWZ1bGxzY3JlZW4tdG8tcGlwLXRvLWlubGluZS5odG1sCkBA IC0wLDAgKzEsNzMgQEAKKzwhRE9DVFlQRSBodG1sPjwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsg ZW5hYmxlTW9kZXJuTWVkaWFDb250cm9scz10cnVlIF0gLS0+Cis8c2NyaXB0IHNyYz0iLi4vLi4v Li4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxib2R5PgorPHZpZGVvIHNy Yz0iLi4vLi4vY29udGVudC90ZXN0Lm1wNCIgc3R5bGU9InBvc2l0aW9uOiBhYnNvbHV0ZTsgdG9w OiAwOyBsZWZ0OiAwOyB3aWR0aDogMzIwcHg7IGhlaWdodDogMjQwcHg7IiBjb250cm9scyBhdXRv cGxheT48L3ZpZGVvPgorPGRpdiBpZD0ic2hhZG93Ij48L2Rpdj4KKzxzY3JpcHQgdHlwZT0idGV4 dC9qYXZhc2NyaXB0Ij4KKword2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworCitkZXNjcmlw dGlvbigiVGVzdGluZyB0aGF0IGVudGVyaW5nIGZ1bGxzY3JlZW4sIHRoZW4gZ29pbmcgaW50byBw aWN0dXJlLWluLXBpY3R1cmUgYW5kIHRoZW4gZ29pbmcgYmFjayB0byBpbmxpbmUgcHJlc2VudHMg aW5saW5lIGNvbnRyb2xzLiIpOworCitpZiAod2luZG93LmludGVybmFscykKKyAgICB3aW5kb3cu aW50ZXJuYWxzLnNldHRpbmdzLnNldEFsbG93c1BpY3R1cmVJblBpY3R1cmVNZWRpYVBsYXliYWNr KHRydWUpOworCitjb25zdCBtZWRpYSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoInZpZGVvIik7 Citjb25zdCBzaGFkb3dSb290ID0gd2luZG93LmludGVybmFscy5zaGFkb3dSb290KG1lZGlhKTsK KworbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKKyAgICBkZWJ1ZygiIik7 CisgICAgZGVidWcoIk1lZGlhIHN0YXJ0ZWQgcGxheWluZywgd2UgcGF1c2UgaXQgYW5kIGVudGVy IGZ1bGxzY3JlZW4gYnkgY2xpY2tpbmcgb24gdGhlIG1hdGNoaW5nIGJ1dHRvbi4iKTsKKyAgICBz aG91bGRCZVRydWUoInNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignLm1lZGlhLWNvbnRyb2xzJyku Y2xhc3NMaXN0LmNvbnRhaW5zKCdpbmxpbmUnKSIpOworCisgICAgbWVkaWEucGF1c2UoKTsKKyAg ICB3aW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IGNsaWNrT25FbGVtZW50KHNoYWRv d1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLmZ1bGxzY3JlZW4iKSkpOworfSk7CisKK2xldCBi ZWNhbWVJbmxpbmUgPSBmYWxzZTsKK21lZGlhLmFkZEV2ZW50TGlzdGVuZXIoIndlYmtpdHByZXNl bnRhdGlvbm1vZGVjaGFuZ2VkIiwgZnVuY3Rpb24oKSB7CisgICAgaWYgKGJlY2FtZUlubGluZSkK KyAgICAgICAgcmV0dXJuOworCisgICAgZGVidWcoIiIpOworICAgIGRlYnVnKGBNZWRpYSByZWNl aXZlZCBhIHdlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkIGV2ZW50LCBtZWRpYS53ZWJraXRQ cmVzZW50YXRpb25Nb2RlID0gJHttZWRpYS53ZWJraXRQcmVzZW50YXRpb25Nb2RlfS5gKTsKKwor ICAgIHN3aXRjaCAobWVkaWEud2Via2l0UHJlc2VudGF0aW9uTW9kZSkgeworICAgIGNhc2UgImZ1 bGxzY3JlZW4iOgorICAgICAgICB3aW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IHsK KyAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgic2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCcubWVk aWEtY29udHJvbHMnKS5jbGFzc0xpc3QuY29udGFpbnMoJ2Z1bGxzY3JlZW4nKSIpOworCisgICAg ICAgICAgICBkZWJ1ZygiIik7CisgICAgICAgICAgICBkZWJ1ZygiV2UgZW50ZXIgcGljdHVyZS1p bi1waWN0dXJlIGJ5IGNsaWNraW5nIG9uIHRoZSBtYXRjaGluZyBidXR0b24uIik7CisgICAgICAg ICAgICBjbGlja09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi5waXAi KSk7CisgICAgICAgIH0pOworICAgICAgICBicmVhazsKKyAgICBjYXNlICJwaWN0dXJlLWluLXBp Y3R1cmUiOgorICAgICAgICBkZWJ1ZygiIik7CisgICAgICAgIGRlYnVnKCJXZSBleGl0IHBpY3R1 cmUtaW4tcGljdHVyZS4iKTsKKyAgICAgICAgbWVkaWEud2Via2l0U2V0UHJlc2VudGF0aW9uTW9k ZSgiaW5saW5lIik7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgImlubGluZSI6CisgICAgICAg IGJlY2FtZUlubGluZSA9IHRydWU7CisgICAgICAgIHdpbmRvdy5yZXF1ZXN0QW5pbWF0aW9uRnJh bWUoKCkgPT4geworICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCJzaGFkb3dSb290LnF1ZXJ5U2Vs ZWN0b3IoJy5tZWRpYS1jb250cm9scycpLmNsYXNzTGlzdC5jb250YWlucygnaW5saW5lJykiKTsK KworICAgICAgICAgICAgZGVidWcoIiIpOworICAgICAgICAgICAgbWVkaWEucmVtb3ZlKCk7Cisg ICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgfSk7CisgICAgICAgIGJyZWFrOwor ICAgIH0KK30pOworCitmdW5jdGlvbiBjbGlja09uRWxlbWVudChlbGVtZW50KQoreworICAgIGNv bnN0IGJvdW5kcyA9IGVsZW1lbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgZXZlbnRT ZW5kZXIubW91c2VNb3ZlVG8oYm91bmRzLmxlZnQgKyAxLCBib3VuZHMudG9wICsgMSk7CisgICAg ZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworfQor Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0 LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2lvcy1zaW11bGF0b3IvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lv cy1zaW11bGF0b3IvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxZmZmZWU4ZWVkNTY0MTAxNTZjYWI1 MWJiOTg0MWE3YWI4MzVlMjhjLi4xNGY3NzAxZWE0MDRmMjU3NjNmNjczODQ3MjQyYjRiYmE1MGYy N2I0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rlc3RF eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9UZXN0 RXhwZWN0YXRpb25zCkBAIC0yNzU1LDYgKzI3NTUsNyBAQCBtZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvbWVkaWEtY29udHJvbGxlci9tZWRpYS1jb250cm9sbGVyLWZhZGUtY29udHJvbHMtd2hl bgogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3NlZWstYmFja3dhcmQtc3VwcG9ydC9zZWVr LWJhY2t3YXJkLXN1cHBvcnQuaHRtbCBbIFNraXAgXQogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL3NlZWstZm9yd2FyZC1zdXBwb3J0L3NlZWstZm9yd2FyZC1zdXBwb3J0Lmh0bWwgWyBTa2lw IF0KIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9tYWNvcy1mdWxsc2NyZWVuLW1lZGlhLWNv bnRyb2xzL21hY29zLWZ1bGxzY3JlZW4tbWVkaWEtY29udHJvbHMtZHJhZy5odG1sIFsgU2tpcCBd CittZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEtY29udHJvbGxlci9tZWRpYS1jb250 cm9sbGVyLWlubGluZS10by1mdWxsc2NyZWVuLXRvLXBpcC10by1pbmxpbmUuaHRtbCBbIFNraXAg XQogCiAjIFRoZXNlIHRlc3RzIGFyZSBhbGwgTWFjLXNwZWNpZmljLCB3ZSBuZXZlciBzaG93IHRo ZSB0cmFja3MgbWVudSBvbiBpT1MKIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mt cGFuZWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNmIz NWFkMDg4ZWE0ODY3NWU2ZjNjMjQ4ZmUzNGY1ZTlmOWU1Mzc5MC4uYTZmMWU3OTVmYzk4YTcyY2Qx Y2Q2YzI3YmFiYWJlM2Y3NzYyNzg4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTE0NTgsNiArMTQ1OCw3IEBAIHdlYmtpdC5vcmcvYi8xNjQwODggWyBZ b3NlbWl0ZSBdIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9zY3J1YmJlci1zdXBwb3J0L3Nj CiBbIFlvc2VtaXRlIF0gbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhLWNvbnRyb2xs ZXIvbWVkaWEtY29udHJvbGxlci1mYWRlLWNvbnRyb2xzLXdoZW4tZW50ZXJpbmctZnVsbHNjcmVl bi5odG1sIFsgU2tpcCBdCiBbIFlvc2VtaXRlIF0gbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L3NlZWstYmFja3dhcmQtc3VwcG9ydC9zZWVrLWJhY2t3YXJkLXN1cHBvcnQuaHRtbCBbIFNraXAg XQogWyBZb3NlbWl0ZSBdIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9zZWVrLWZvcndhcmQt c3VwcG9ydC9zZWVrLWZvcndhcmQtc3VwcG9ydC5odG1sIFsgU2tpcCBdCitbIFlvc2VtaXRlIF0g bWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhLWNvbnRyb2xsZXIvbWVkaWEtY29udHJv bGxlci1pbmxpbmUtdG8tZnVsbHNjcmVlbi10by1waXAtdG8taW5saW5lLmh0bWwgWyBTa2lwIF0K IAogd2Via2l0Lm9yZy9iLzE2NDYxNiBodHRwL3Rlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250 cm9scy9za2lwLWJhY2stc3VwcG9ydC9za2lwLWJhY2stc3VwcG9ydC1idXR0b24tY2xpY2suaHRt bCBbIFBhc3MgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTY0MzIzIG1lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy9haXJwbGF5LXN1cHBvcnQvYWlycGxheS1zdXBwb3J0Lmh0bWwgWyBQYXNzIEZh aWx1cmUgXQo=