27047 2009-07-07 16:12:51 -0700 Sometimes the media controller remaining time disappear. 2009-07-07 18:28:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://iphone.akamai.com InRadar P2 Normal --- 1 pdherbemont pdherbemont oldest_to_newest 130299 0 pdherbemont 2009-07-07 16:12:51 -0700 Sometimes the media controller remaining time disappear. - Go to http://iphone.akamai.com - Click and load a video - Load an other video -> Remaining and Elapsed time text field are gone <rdar://problem/7036201> 130319 1 32407 pdherbemont 2009-07-07 18:02:34 -0700 Created attachment 32407 patch v1. 130321 2 32407 simon.fraser 2009-07-07 18:13:35 -0700 Comment on attachment 32407 patch v1. > +2009-07-07 Pierre d'Herbemont <pdherbemont@apple.com> > + > + (WebCore::MediaControlElement::styleForElement): Shortcut. Utility method, or "code factoring" would be a better description. > diff --git a/WebCore/rendering/MediaControlElements.cpp b/WebCore/rendering/MediaControlElements.cpp > + return NULL; WebCore code uses 0 instead of NULL. 130325 3 pdherbemont 2009-07-07 18:28:11 -0700 http://trac.webkit.org/changeset/45614 32407 2009-07-07 18:02:34 -0700 2009-07-07 18:13:34 -0700 patch v1. patch-v1.diff text/plain 18196 pdherbemont Y29tbWl0IDYzNDhiYWQwMzczMTU3OWZkNWU4YTk3M2RiYWUwYmNkZTYxMzQ5N2UKQXV0aG9yOiBQ aWVycmUgZCdIZXJiZW1vbnQgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KRGF0ZTogICBUdWUgSnVs IDcgMTg6MDE6NDEgMjAwOSAtMDcwMAoKICAgIFdlYkNvcmU6CiAgICAKICAgIDIwMDktMDctMDcg IFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KICAgIAogICAgICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KICAgIAogICAgICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcwNDcKICAgIAogICAgICAgICAgICBX ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0IHdoZW4gd2UgcmVhdHRhY2gsIHdlIGFsc28gcmVhdHRh Y2gKICAgICAgICAgICAgdGhlIGNoaWxkcmVuIGluIGV2ZXJ5IE1lZGlhQ29udHJvbEVsZW1lbnQu IEVsc2Ugd2UgbWF5IGVuZCB1cAogICAgICAgICAgICBoYXZpbmcgbm8gcmVtYWluaW5nIG9yIGVs YXBzZWQgdGltZS4KICAgIAogICAgICAgICAgICBXZSBoYXZlIHRvIGhhbmRsZSB0aGF0LCBiZWNh dXNlIHdlIGFyZSB1c2luZyBhIHNwZWNpYWwgc2hhZG93CiAgICAgICAgICAgIHRyZWUgaW4gdGhl IERPTSwgYW5kIHRoYXQgd2UgYXJlIG91cnNlbHZlcyBoYW5kbGluZwogICAgICAgICAgICBhdHRh Y2hpbmcvZGV0YWNoaW5nIHRoZSByZW5kZXJlci4KICAgIAogICAgICAgICAgICBUaGUgc3RyYXRl Z3kgaGVyZSBpcyB0byB0cnkgdG8gaW1wbGVtZW50IDo6YXR0YWNoKCksIGFuZCB0cnkKICAgICAg ICAgICAgdG8gcmV1c2UgYXMgbXVjaCBjb2RlIGFzIHdlIGNhbiBmcm9tIHRoZSBzdXBlciBjbGFz cywgaW5jbHVkaW5nCiAgICAgICAgICAgIGNoaWxkcmVuIGF0dGFjaGVtZW50LgogICAgCiAgICAg ICAgICAgIFRlc3Q6IG1lZGlhL2NvbnRyb2xzLWFmdGVyLXJlbG9hZC5odG1sCiAgICAKICAgICAg ICAgICAgKiByZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgogICAgICAgICAgICAo V2ViQ29yZTo6TWVkaWFDb250cm9sRWxlbWVudDo6c3R5bGVGb3JFbGVtZW50KTogU2hvcnRjdXQu CiAgICAgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xFbGVtZW50OjpyZW5kZXJlcklzTmVl ZGVkKTogU2hvcnRjdXQuCiAgICAgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xFbGVtZW50 OjphdHRhY2gpOiBJbXBsZW1lbnQgYXR0YWNoCiAgICAgICAgICAgIGFuZCBjYWxsIHN1cGVyIGNs YXNzIHNvIHRoYXQgY2hpbGRyZW4gYXJlIGFsc28gYXR0YWNoZWQuCiAgICAgICAgICAgIChXZWJD b3JlOjpNZWRpYUNvbnRyb2xFbGVtZW50Ojp1cGRhdGVTdHlsZSk6IFVzZSBhdHRhY2goKQogICAg ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sSW5wdXRFbGVtZW50OjpzdHlsZUZvckVsZW1l bnQpOiBTaG9ydGN1dC4KICAgICAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbElucHV0RWxl bWVudDo6cmVuZGVyZXJJc05lZWRlZCk6IFNob3J0Y3V0LgogICAgICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sSW5wdXRFbGVtZW50OjphdHRhY2gpOiBTZWUgYWJvdmUuCiAgICAgICAgICAg IChXZWJDb3JlOjpNZWRpYUNvbnRyb2xJbnB1dEVsZW1lbnQ6OnVwZGF0ZVN0eWxlKTogVXNlIGF0 dGFjaCgpCiAgICAgICAgICAgICogcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmg6CiAg ICAgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcDoKICAgICAgICAgICAgKFdlYkNv cmU6OlJlbmRlck1lZGlhOjp1cGRhdGVDb250cm9scyk6IERpcmVjdGx5IHJ1biBhdHRhY2goKSBv bgogICAgICAgICAgICB0aGUgbV9wYW5lbCwgd2hpY2ggaXMgYSByb290IG5vZGUgZm9yIG91ciBz aGFkb3cgdHJlZS4KICAgIAogICAgTGF5b3V0VGVzdHM6CiAgICAKICAgIDIwMDktMDctMDcgIFBp ZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KICAgIAogICAgICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KICAgIAogICAgICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcwNDcKICAgIAogICAgICAgICAgICBNYWtl IHN1cmUgbm90aGluZyBjaGFuZ2luZyB0aGUgc3JjIGFuZCByZWxvYWRpbmcgZG9lc24ndAogICAg ICAgICAgICBjaGFuZ2UgdGhlIGxvb2sgb2YgdGhlIGNvbnRyb2xsZXIuCiAgICAKICAgICAgICAg ICAgKiBtZWRpYS9jb250cm9scy1hZnRlci1yZWxvYWQuaHRtbDogQWRkZWQuCiAgICAgICAgICAg ICogcGxhdGZvcm0vbWFjLWxlb3BhcmQvbWVkaWEvY29udHJvbHMtYWZ0ZXItcmVsb2FkLWV4cGVj dGVkLnR4dDogQWRkZWQuCiAgICAgICAgICAgICogcGxhdGZvcm0vbWFjL21lZGlhL2NvbnRyb2xz LWFmdGVyLXJlbG9hZC1leHBlY3RlZC50eHQ6IEFkZGVkLgoKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlNGMyNDZmLi44NTg0 NzA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMDktMDctMDcgIFBpZXJyZSBkJ0hlcmJlbW9u dCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjcwNDcKKworICAgICAgICBNYWtlIHN1cmUgbm90aGluZyBjaGFuZ2luZyB0aGUgc3JjIGFu ZCByZWxvYWRpbmcgZG9lc24ndAorICAgICAgICBjaGFuZ2UgdGhlIGxvb2sgb2YgdGhlIGNvbnRy b2xsZXIuCisKKyAgICAgICAgKiBtZWRpYS9jb250cm9scy1hZnRlci1yZWxvYWQuaHRtbDogQWRk ZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjLWxlb3BhcmQvbWVkaWEvY29udHJvbHMtYWZ0ZXIt cmVsb2FkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL21lZGlh L2NvbnRyb2xzLWFmdGVyLXJlbG9hZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorCisyMDA5LTA3LTA3 ICBQaWVycmUgZCdIZXJiZW1vbnQgIDxwZGhlcmJlbW9udEBhcHBsZS5jb20+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgogCiAgICAgICAgIEFkZCBhIHNwZWNpZmljIGxlb3Bh cmQgcmVzdWx0IGZvciBjb250cm9scy1zdHlsaW5nLmh0bWwsIGdpdmVuIHRoYXQgaXQgZG9lc24n dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMtYWZ0ZXItcmVsb2FkLmh0 bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9jb250cm9scy1hZnRlci1yZWxvYWQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kZDk5ZjJhCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMtYWZ0ZXItcmVsb2FkLmh0bWwKQEAgLTAsMCArMSwz NyBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8c2NyaXB0PgorICAgIHZhciB2aWRlbzsKKyAgICB2 YXIgbG9hZGVkQ291bnQgPSAwOworCisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl cikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworCisgICAg ZnVuY3Rpb24gY2FucGxheXRocm91Z2goKQorICAgIHsKKyAgICAgICAgbG9hZGVkQ291bnQrKzsK KyAgICAgICAgaWYgKGxvYWRlZENvdW50ID09IDIpIHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xs ZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAg IAorICAgICAgICB2aWRlby5zcmMgPSAiY29udGVudC90ZXN0Lm1wNCI7CisgICAgICAgIHZpZGVv LmxvYWQoKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICB7CisgICAgICAgIHZp ZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3ZpZGVvJylbMF07CisgICAgICAg IHZpZGVvLmFkZEV2ZW50TGlzdGVuZXIoImNhbnBsYXl0aHJvdWdoIiwgY2FucGxheXRocm91Z2gp OworICAgICAgICAKKyAgICAgICAgdmlkZW8uc3JjID0gImNvbnRlbnQvc2NhbGVkLW1hdHJpeC5t b3YiOworICAgICAgICB2aWRlby5sb2FkKCk7CisgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHkgb25sb2FkPSJ0ZXN0KCkiPgorPHA+TWFraW5nIHN1cmUgdGhlIGNvbnRyb2xsZXIg bG9va3Mgb2sgYWZ0ZXIgYSBzZWNvbmQgbG9hZCgpLjwvcD4KKzx2aWRlbyBjb250cm9scz48L3Zp ZGVvPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLWxlb3BhcmQvbWVkaWEvY29udHJvbHMtYWZ0ZXItcmVsb2FkLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy1sZW9wYXJkL21lZGlhL2NvbnRyb2xzLWFmdGVyLXJlbG9h ZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTE4M2Y3 YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1sZW9wYXJkL21l ZGlhL2NvbnRyb2xzLWFmdGVyLXJlbG9hZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyNiBAQAor bGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4 MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9 IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNp emUgNzg0eDU4NAorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDE4Cisg ICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDM2MHgxOAorICAgICAgICAg IHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDM2MDogIk1ha2luZyBzdXJlIHRoZSBjb250cm9sbGVy IGxvb2tzIG9rIGFmdGVyIGEgc2Vjb25kIGxvYWQoKS4iCisgICAgICBSZW5kZXJCbG9jayAoYW5v bnltb3VzKSBhdCAoMCwzNCkgc2l6ZSA3ODR4MjQwCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0 fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkg c2l6ZSAweDAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCits YXllciBhdCAoOCw0Mikgc2l6ZSAzMjB4MjQwCisgIFJlbmRlclZpZGVvIHtWSURFT30gYXQgKDAs MCkgc2l6ZSAzMjB4MjQwCitsYXllciBhdCAoOCw0Mikgc2l6ZSAzMjB4MjQwCisgIFJlbmRlckJs b2NrIChyZWxhdGl2ZSBwb3NpdGlvbmVkKSB7RElWfSBhdCAoMCwwKSBzaXplIDMyMHgyNDAKK2xh eWVyIGF0ICg4LDI2Nikgc2l6ZSAzMjB4MTYKKyAgUmVuZGVyRmxleGlibGVCb3ggKHBvc2l0aW9u ZWQpIHtESVZ9IGF0ICgwLDIyNCkgc2l6ZSAzMjB4MTYKKyAgICBSZW5kZXJCdXR0b24ge0lOUFVU fSBhdCAoMCwwKSBzaXplIDE2eDE2CisgICAgUmVuZGVyQnV0dG9uIHtJTlBVVH0gYXQgKDE2LDAp IHNpemUgMTZ4MTYKKyAgICBSZW5kZXJGbGV4aWJsZUJveCB7RElWfSBhdCAoMzIsMCkgc2l6ZSAy NTZ4MTYKKyAgICAgIFJlbmRlclNsaWRlciB7SU5QVVR9IGF0ICgwLDApIHNpemUgMjU2eDE2Cisg ICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgyLDEpIHNpemUgMTN4MTQKKyAgICBSZW5kZXJC dXR0b24ge0lOUFVUfSBhdCAoMjg4LDApIHNpemUgMTZ4MTYKKyAgICBSZW5kZXJCdXR0b24ge0lO UFVUfSBhdCAoMzA0LDApIHNpemUgMTZ4MTYKKyAgICAKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBm aWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvbWVkaWEvY29udHJvbHMt YWZ0ZXItcmVsb2FkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9tZWRp YS9jb250cm9scy1hZnRlci1yZWxvYWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAuLjNhMzI3NzAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvbWVkaWEvY29udHJvbHMtYWZ0ZXItcmVsb2FkLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDM0IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBh dCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5k ZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgICAgUmVuZGVyQm9keSB7Qk9E WX0gYXQgKDgsOCkgc2l6ZSA3ODR4NTg0CisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsMCkg c2l6ZSA3ODR4MTgKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzYw eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzYwOiAiTWFraW5nIHN1cmUg dGhlIGNvbnRyb2xsZXIgbG9va3Mgb2sgYWZ0ZXIgYSBzZWNvbmQgbG9hZCgpLiIKKyAgICAgIFJl bmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgwLDM0KSBzaXplIDc4NHgyNDAKKyAgICAgICAgUmVu ZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCisgICAgICAgIFJlbmRlclRleHQgeyN0 ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAs MCkgc2l6ZSAweDAKK2xheWVyIGF0ICg4LDQyKSBzaXplIDMyMHgyNDAKKyAgUmVuZGVyVmlkZW8g e1ZJREVPfSBhdCAoMCwwKSBzaXplIDMyMHgyNDAKK2xheWVyIGF0ICg4LDQyKSBzaXplIDMyMHgy NDAKKyAgUmVuZGVyQmxvY2sgKHJlbGF0aXZlIHBvc2l0aW9uZWQpIHtESVZ9IGF0ICgwLDApIHNp emUgMzIweDI0MAorbGF5ZXIgYXQgKDgsMjU3KSBzaXplIDMyMHgyNQorICBSZW5kZXJGbGV4aWJs ZUJveCAocG9zaXRpb25lZCkge0RJVn0gYXQgKDAsMjE1KSBzaXplIDMyMHgyNQorICAgIFJlbmRl ckJ1dHRvbiB7SU5QVVR9IGF0ICg3LDQpIHNpemUgMTZ4MTYKKyAgICBSZW5kZXJCdXR0b24ge0lO UFVUfSBhdCAoMjk3LDQpIHNpemUgMTZ4MTYKKyAgICBSZW5kZXJCdXR0b24ge0lOUFVUfSBhdCAo MzcsNCkgc2l6ZSAxNngxNgorICAgIFJlbmRlckZsZXhpYmxlQm94IHtESVZ9IGF0ICg2MCw2KSBz aXplIDIzMHgxMworICAgICAgUmVuZGVyU2xpZGVyIHtJTlBVVH0gYXQgKDQ1LDApIHNpemUgMTQw eDEzCisgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDIpIHNpemUgMTF4OQorbGF5ZXIg YXQgKDY4LDI2Mykgc2l6ZSA0NXgxMworICBSZW5kZXJGbGV4aWJsZUJveCB7RElWfSBhdCAoMCww KSBzaXplIDQ1eDEzCisgICAgUmVuZGVyQmxvY2sgKGFub255bW91cykgYXQgKDksMSkgc2l6ZSAy NngxMQorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMjZ4MTEKKyAgICAg ICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMjY6ICIwMDowMCIKK2xheWVyIGF0ICgyNTMsMjYz KSBzaXplIDQ1eDEzCisgIFJlbmRlckZsZXhpYmxlQm94IHtESVZ9IGF0ICgxODUsMCkgc2l6ZSA0 NXgxMworICAgIFJlbmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICg2LDEpIHNpemUgMzJ4MTEKKyAg ICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDMyeDExCisgICAgICAgIHRleHQg cnVuIGF0ICgwLDApIHdpZHRoIDMyOiAiLTAwOjA2IgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFu Z2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NzBlOGJhLi4yNGMxNjA4IDEwMDY0NAot LS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDM4IEBACisyMDA5LTA3LTA3ICBQaWVycmUgZCdIZXJiZW1vbnQgIDxwZGhlcmJlbW9udEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MDQ3CisKKyAgICAgICAg V2UgbmVlZCB0byBtYWtlIHN1cmUgdGhhdCB3aGVuIHdlIHJlYXR0YWNoLCB3ZSBhbHNvIHJlYXR0 YWNoCisgICAgICAgIHRoZSBjaGlsZHJlbiBpbiBldmVyeSBNZWRpYUNvbnRyb2xFbGVtZW50LiBF bHNlIHdlIG1heSBlbmQgdXAKKyAgICAgICAgaGF2aW5nIG5vIHJlbWFpbmluZyBvciBlbGFwc2Vk IHRpbWUuCisKKyAgICAgICAgV2UgaGF2ZSB0byBoYW5kbGUgdGhhdCwgYmVjYXVzZSB3ZSBhcmUg dXNpbmcgYSBzcGVjaWFsIHNoYWRvdworICAgICAgICB0cmVlIGluIHRoZSBET00sIGFuZCB0aGF0 IHdlIGFyZSBvdXJzZWx2ZXMgaGFuZGxpbmcKKyAgICAgICAgYXR0YWNoaW5nL2RldGFjaGluZyB0 aGUgcmVuZGVyZXIuCisKKyAgICAgICAgVGhlIHN0cmF0ZWd5IGhlcmUgaXMgdG8gdHJ5IHRvIGlt cGxlbWVudCA6OmF0dGFjaCgpLCBhbmQgdHJ5CisgICAgICAgIHRvIHJldXNlIGFzIG11Y2ggY29k ZSBhcyB3ZSBjYW4gZnJvbSB0aGUgc3VwZXIgY2xhc3MsIGluY2x1ZGluZworICAgICAgICBjaGls ZHJlbiBhdHRhY2hlbWVudC4KKworICAgICAgICBUZXN0OiBtZWRpYS9jb250cm9scy1hZnRlci1y ZWxvYWQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbEVsZW1lbnQ6OnN0eWxlRm9yRWxlbWVu dCk6IFNob3J0Y3V0LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sRWxlbWVudDo6cmVu ZGVyZXJJc05lZWRlZCk6IFNob3J0Y3V0LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9s RWxlbWVudDo6YXR0YWNoKTogSW1wbGVtZW50IGF0dGFjaAorICAgICAgICBhbmQgY2FsbCBzdXBl ciBjbGFzcyBzbyB0aGF0IGNoaWxkcmVuIGFyZSBhbHNvIGF0dGFjaGVkLgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sRWxlbWVudDo6dXBkYXRlU3R5bGUpOiBVc2UgYXR0YWNoKCkKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbElucHV0RWxlbWVudDo6c3R5bGVGb3JFbGVtZW50 KTogU2hvcnRjdXQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xJbnB1dEVsZW1lbnQ6 OnJlbmRlcmVySXNOZWVkZWQpOiBTaG9ydGN1dC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29u dHJvbElucHV0RWxlbWVudDo6YXR0YWNoKTogU2VlIGFib3ZlLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sSW5wdXRFbGVtZW50Ojp1cGRhdGVTdHlsZSk6IFVzZSBhdHRhY2goKQorICAg ICAgICAqIHJlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJNZWRpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNZWRpYTo6dXBk YXRlQ29udHJvbHMpOiBEaXJlY3RseSBydW4gYXR0YWNoKCkgb24KKyAgICAgICAgdGhlIG1fcGFu ZWwsIHdoaWNoIGlzIGEgcm9vdCBub2RlIGZvciBvdXIgc2hhZG93IHRyZWUuCisKIDIwMDktMDct MDcgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRy b2xFbGVtZW50cy5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5j cHAKaW5kZXggNmZlOWJlYS4uM2E5MzI2MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcv TWVkaWFDb250cm9sRWxlbWVudHMuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL01lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcApAQCAtNzUsNyArNzUsNiBAQCB2b2lkIE1lZGlhQ29udHJvbFNoYWRv d1Jvb3RFbGVtZW50Ojp1cGRhdGVTdHlsZSgpCiAgICAgfQogfQogCi0KIC8vIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KICAgICAKIApAQCAtOTksMzggKzk4LDYzIEBAIHZvaWQgTWVkaWFD b250cm9sRWxlbWVudDo6dXBkYXRlKCkKICAgICB1cGRhdGVTdHlsZSgpOwogfQogCi12b2lkIE1l ZGlhQ29udHJvbEVsZW1lbnQ6OnVwZGF0ZVN0eWxlKCkKK1JlbmRlclN0eWxlKiBNZWRpYUNvbnRy b2xFbGVtZW50OjpzdHlsZUZvckVsZW1lbnQoKQogewotICAgIGlmICghbV9tZWRpYUVsZW1lbnQg fHwgIW1fbWVkaWFFbGVtZW50LT5yZW5kZXJlcigpKQotICAgICAgICByZXR1cm47Ci0KICAgICBS ZW5kZXJTdHlsZSogc3R5bGUgPSBtX21lZGlhRWxlbWVudC0+cmVuZGVyZXIoKS0+Z2V0Q2FjaGVk UHNldWRvU3R5bGUobV9wc2V1ZG9TdHlsZUlkKTsKICAgICBpZiAoIXN0eWxlKQotICAgICAgICBy ZXR1cm47Ci0KKyAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgCiAgICAgLy8gdGV4dC1kZWNvcmF0 aW9uIGNhbid0IGJlIG92ZXJyaWRlZCBmcm9tIENTUy4gU28gd2UgZG8gaXQgaGVyZS4KICAgICAv LyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MDE1CiAgICAg c3R5bGUtPnNldFRleHREZWNvcmF0aW9uKFRETk9ORSk7CiAgICAgc3R5bGUtPnNldFRleHREZWNv cmF0aW9uc0luRWZmZWN0KFRETk9ORSk7CiAKKyAgICByZXR1cm4gc3R5bGU7Cit9CisKK2Jvb2wg TWVkaWFDb250cm9sRWxlbWVudDo6cmVuZGVyZXJJc05lZWRlZChSZW5kZXJTdHlsZSogc3R5bGUp Cit7CisgICAgcmV0dXJuIEhUTUxEaXZFbGVtZW50OjpyZW5kZXJlcklzTmVlZGVkKHN0eWxlKSAm JiBwYXJlbnQoKSAmJiBwYXJlbnQoKS0+cmVuZGVyZXIoKTsKK30KKyAgICAKK3ZvaWQgTWVkaWFD b250cm9sRWxlbWVudDo6YXR0YWNoKCkKK3sKKyAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSBzdHls ZUZvckVsZW1lbnQoKTsKKyAgICBpZiAoIXN0eWxlKQorICAgICAgICByZXR1cm47CisgICAgYm9v bCBuZWVkc1JlbmRlcmVyID0gcmVuZGVyZXJJc05lZWRlZChzdHlsZSk7CisgICAgaWYgKCFuZWVk c1JlbmRlcmVyKQorICAgICAgICByZXR1cm47CisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9 IGNyZWF0ZVJlbmRlcmVyKG1fbWVkaWFFbGVtZW50LT5yZW5kZXJlcigpLT5yZW5kZXJBcmVuYSgp LCBzdHlsZSk7CisgICAgaWYgKCFyZW5kZXJlcikKKyAgICAgICAgcmV0dXJuOworICAgIHJlbmRl cmVyLT5zZXRTdHlsZShzdHlsZSk7CisgICAgc2V0UmVuZGVyZXIocmVuZGVyZXIpOworICAgIGlm IChwYXJlbnQoKSAmJiBwYXJlbnQoKS0+cmVuZGVyZXIoKSkgeworICAgICAgICAvLyBGaW5kIG5l eHQgc2libGluZyB3aXRoIGEgcmVuZGVyZXIgdG8gZGV0ZXJtaW5lIHdoZXJlIHRvIGluc2VydC4K KyAgICAgICAgTm9kZSogc2libGluZyA9IG5leHRTaWJsaW5nKCk7CisgICAgICAgIHdoaWxlIChz aWJsaW5nICYmICFzaWJsaW5nLT5yZW5kZXJlcigpKQorICAgICAgICAgICAgc2libGluZyA9IHNp YmxpbmctPm5leHRTaWJsaW5nKCk7CisgICAgICAgIHBhcmVudCgpLT5yZW5kZXJlcigpLT5hZGRD aGlsZChyZW5kZXJlciwgc2libGluZyA/IHNpYmxpbmctPnJlbmRlcmVyKCkgOiAwKTsKKyAgICB9 CisgICAgQ29udGFpbmVyTm9kZTo6YXR0YWNoKCk7Cit9CisKK3ZvaWQgTWVkaWFDb250cm9sRWxl bWVudDo6dXBkYXRlU3R5bGUoKQoreworICAgIGlmICghbV9tZWRpYUVsZW1lbnQgfHwgIW1fbWVk aWFFbGVtZW50LT5yZW5kZXJlcigpKQorICAgICAgICByZXR1cm47CisKKyAgICBSZW5kZXJTdHls ZSogc3R5bGUgPSBzdHlsZUZvckVsZW1lbnQoKTsKKyAgICBpZiAoIXN0eWxlKQorICAgICAgICBy ZXR1cm47CisKICAgICBib29sIG5lZWRzUmVuZGVyZXIgPSByZW5kZXJlcklzTmVlZGVkKHN0eWxl KSAmJiBwYXJlbnQoKSAmJiBwYXJlbnQoKS0+cmVuZGVyZXIoKTsKICAgICBpZiAocmVuZGVyZXIo KSAmJiAhbmVlZHNSZW5kZXJlcikKICAgICAgICAgZGV0YWNoKCk7Ci0gICAgZWxzZSBpZiAoIXJl bmRlcmVyKCkgJiYgbmVlZHNSZW5kZXJlcikgewotICAgICAgICBSZW5kZXJPYmplY3QqIHJlbmRl cmVyID0gY3JlYXRlUmVuZGVyZXIobV9tZWRpYUVsZW1lbnQtPnJlbmRlcmVyKCktPnJlbmRlckFy ZW5hKCksIHN0eWxlKTsKLSAgICAgICAgaWYgKCFyZW5kZXJlcikKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgcmVuZGVyZXItPnNldFN0eWxlKHN0eWxlKTsKLSAgICAgICAgc2V0UmVuZGVy ZXIocmVuZGVyZXIpOwotICAgICAgICBzZXRBdHRhY2hlZCgpOwotICAgICAgICBpZiAocGFyZW50 KCkgJiYgcGFyZW50KCktPnJlbmRlcmVyKCkpIHsKLSAgICAgICAgICAgIC8vIEZpbmQgbmV4dCBz aWJsaW5nIHdpdGggYSByZW5kZXJlciB0byBkZXRlcm1pbmUgd2hlcmUgdG8gaW5zZXJ0LgotICAg ICAgICAgICAgTm9kZSogc2libGluZyA9IG5leHRTaWJsaW5nKCk7Ci0gICAgICAgICAgICB3aGls ZSAoc2libGluZyAmJiAhc2libGluZy0+cmVuZGVyZXIoKSkKLSAgICAgICAgICAgICAgICBzaWJs aW5nID0gc2libGluZy0+bmV4dFNpYmxpbmcoKTsKLSAgICAgICAgICAgIHBhcmVudCgpLT5yZW5k ZXJlcigpLT5hZGRDaGlsZChyZW5kZXJlciwgc2libGluZyA/IHNpYmxpbmctPnJlbmRlcmVyKCkg OiAwKTsKLSAgICAgICAgfQotICAgIH0gZWxzZSBpZiAocmVuZGVyZXIoKSkgeworICAgIGVsc2Ug aWYgKCFyZW5kZXJlcigpICYmIG5lZWRzUmVuZGVyZXIpCisgICAgICAgIGF0dGFjaCgpOworICAg IGVsc2UgaWYgKHJlbmRlcmVyKCkpIHsKICAgICAgICAgcmVuZGVyZXIoKS0+c2V0U3R5bGUoc3R5 bGUpOwogCiAgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGF0IGlmIHRoZXJlIGlzIGFueSBpbm5lclRl eHQgcmVuZGVyZXIsIGl0IGlzIHVwZGF0ZWQgYXMgd2VsbC4KQEAgLTIzMywzNiArMjU3LDU4IEBA IHZvaWQgTWVkaWFDb250cm9sSW5wdXRFbGVtZW50Ojp1cGRhdGUoKQogICAgIHVwZGF0ZVN0eWxl KCk7CiB9CiAKK1JlbmRlclN0eWxlKiBNZWRpYUNvbnRyb2xJbnB1dEVsZW1lbnQ6OnN0eWxlRm9y RWxlbWVudCgpCit7CisgICAgcmV0dXJuIG1fbWVkaWFFbGVtZW50LT5yZW5kZXJlcigpLT5nZXRD YWNoZWRQc2V1ZG9TdHlsZShtX3BzZXVkb1N0eWxlSWQpOworfQorCitib29sIE1lZGlhQ29udHJv bElucHV0RWxlbWVudDo6cmVuZGVyZXJJc05lZWRlZChSZW5kZXJTdHlsZSogc3R5bGUpCit7Cisg ICAgcmV0dXJuIEhUTUxJbnB1dEVsZW1lbnQ6OnJlbmRlcmVySXNOZWVkZWQoc3R5bGUpICYmIHBh cmVudCgpICYmIHBhcmVudCgpLT5yZW5kZXJlcigpOworfQorCit2b2lkIE1lZGlhQ29udHJvbElu cHV0RWxlbWVudDo6YXR0YWNoKCkKK3sKKyAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSBzdHlsZUZv ckVsZW1lbnQoKTsKKyAgICBpZiAoIXN0eWxlKQorICAgICAgICByZXR1cm47CisgICAgCisgICAg Ym9vbCBuZWVkc1JlbmRlcmVyID0gcmVuZGVyZXJJc05lZWRlZChzdHlsZSk7CisgICAgaWYgKCFu ZWVkc1JlbmRlcmVyKQorICAgICAgICByZXR1cm47CisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJl ciA9IGNyZWF0ZVJlbmRlcmVyKG1fbWVkaWFFbGVtZW50LT5yZW5kZXJlcigpLT5yZW5kZXJBcmVu YSgpLCBzdHlsZSk7CisgICAgaWYgKCFyZW5kZXJlcikKKyAgICAgICAgcmV0dXJuOworICAgIHJl bmRlcmVyLT5zZXRTdHlsZShzdHlsZSk7CisgICAgc2V0UmVuZGVyZXIocmVuZGVyZXIpOworICAg IGlmIChwYXJlbnQoKSAmJiBwYXJlbnQoKS0+cmVuZGVyZXIoKSkgeworICAgICAgICAvLyBGaW5k IG5leHQgc2libGluZyB3aXRoIGEgcmVuZGVyZXIgdG8gZGV0ZXJtaW5lIHdoZXJlIHRvIGluc2Vy dC4KKyAgICAgICAgTm9kZSogc2libGluZyA9IG5leHRTaWJsaW5nKCk7CisgICAgICAgIHdoaWxl IChzaWJsaW5nICYmICFzaWJsaW5nLT5yZW5kZXJlcigpKQorICAgICAgICAgICAgc2libGluZyA9 IHNpYmxpbmctPm5leHRTaWJsaW5nKCk7CisgICAgICAgIHBhcmVudCgpLT5yZW5kZXJlcigpLT5h ZGRDaGlsZChyZW5kZXJlciwgc2libGluZyA/IHNpYmxpbmctPnJlbmRlcmVyKCkgOiAwKTsKKyAg ICB9ICAKKyAgICBDb250YWluZXJOb2RlOjphdHRhY2goKTsKK30KKwogdm9pZCBNZWRpYUNvbnRy b2xJbnB1dEVsZW1lbnQ6OnVwZGF0ZVN0eWxlKCkKIHsKICAgICBpZiAoIW1fbWVkaWFFbGVtZW50 IHx8ICFtX21lZGlhRWxlbWVudC0+cmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuOwotCi0gICAg UmVuZGVyU3R5bGUqIHN0eWxlID0gbV9tZWRpYUVsZW1lbnQtPnJlbmRlcmVyKCktPmdldENhY2hl ZFBzZXVkb1N0eWxlKG1fcHNldWRvU3R5bGVJZCk7CisgICAgCisgICAgUmVuZGVyU3R5bGUqIHN0 eWxlID0gc3R5bGVGb3JFbGVtZW50KCk7CiAgICAgaWYgKCFzdHlsZSkKICAgICAgICAgcmV0dXJu OwotCisgICAgCiAgICAgYm9vbCBuZWVkc1JlbmRlcmVyID0gcmVuZGVyZXJJc05lZWRlZChzdHls ZSkgJiYgcGFyZW50KCkgJiYgcGFyZW50KCktPnJlbmRlcmVyKCk7CiAgICAgaWYgKHJlbmRlcmVy KCkgJiYgIW5lZWRzUmVuZGVyZXIpCiAgICAgICAgIGRldGFjaCgpOwotICAgIGVsc2UgaWYgKCFy ZW5kZXJlcigpICYmIG5lZWRzUmVuZGVyZXIpIHsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5k ZXJlciA9IGNyZWF0ZVJlbmRlcmVyKG1fbWVkaWFFbGVtZW50LT5yZW5kZXJlcigpLT5yZW5kZXJB cmVuYSgpLCBzdHlsZSk7Ci0gICAgICAgIGlmICghcmVuZGVyZXIpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIHJlbmRlcmVyLT5zZXRTdHlsZShzdHlsZSk7Ci0gICAgICAgIHNldFJlbmRl cmVyKHJlbmRlcmVyKTsKLSAgICAgICAgc2V0QXR0YWNoZWQoKTsKLSAgICAgICAgaWYgKHBhcmVu dCgpICYmIHBhcmVudCgpLT5yZW5kZXJlcigpKSB7Ci0gICAgICAgICAgICAvLyBGaW5kIG5leHQg c2libGluZyB3aXRoIGEgcmVuZGVyZXIgdG8gZGV0ZXJtaW5lIHdoZXJlIHRvIGluc2VydC4KLSAg ICAgICAgICAgIE5vZGUqIHNpYmxpbmcgPSBuZXh0U2libGluZygpOwotICAgICAgICAgICAgd2hp bGUgKHNpYmxpbmcgJiYgIXNpYmxpbmctPnJlbmRlcmVyKCkpCi0gICAgICAgICAgICAgICAgc2li bGluZyA9IHNpYmxpbmctPm5leHRTaWJsaW5nKCk7Ci0gICAgICAgICAgICBwYXJlbnQoKS0+cmVu ZGVyZXIoKS0+YWRkQ2hpbGQocmVuZGVyZXIsIHNpYmxpbmcgPyBzaWJsaW5nLT5yZW5kZXJlcigp IDogMCk7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgaWYgKHJlbmRlcmVyKCkpCisgICAgZWxzZSBp ZiAoIXJlbmRlcmVyKCkgJiYgbmVlZHNSZW5kZXJlcikKKyAgICAgICAgYXR0YWNoKCk7CisgICAg ZWxzZSBpZiAocmVuZGVyZXIoKSkKICAgICAgICAgcmVuZGVyZXIoKS0+c2V0U3R5bGUoc3R5bGUp OwogfQotCisgICAgCiBib29sIE1lZGlhQ29udHJvbElucHV0RWxlbWVudDo6aGl0VGVzdChjb25z dCBJbnRQb2ludCYgYWJzUG9pbnQpCiB7CiAgICAgaWYgKHJlbmRlcmVyKCkgJiYgcmVuZGVyZXIo KS0+c3R5bGUoKS0+aGFzQXBwZWFyYW5jZSgpKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJp bmcvTWVkaWFDb250cm9sRWxlbWVudHMuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL01lZGlhQ29udHJv bEVsZW1lbnRzLmgKaW5kZXggNGI4Y2E2NC4uOTQ4MDY5MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9y ZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5oCkBAIC04Miw5ICs4MiwxNCBAQCBjbGFzcyBNZWRpYUNvbnRy b2xFbGVtZW50IDogcHVibGljIEhUTUxEaXZFbGVtZW50CiB7CiBwdWJsaWM6CiAgICAgTWVkaWFD b250cm9sRWxlbWVudChEb2N1bWVudCosIFBzZXVkb0lkLCBIVE1MTWVkaWFFbGVtZW50Kik7Cisg ICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOworICAgIHZpcnR1YWwgYm9vbCByZW5kZXJlcklzTmVl ZGVkKFJlbmRlclN0eWxlKik7CisKKyAgICBSZW5kZXJTdHlsZSogc3R5bGVGb3JFbGVtZW50KCk7 CiAgICAgdm9pZCBhdHRhY2hUb1BhcmVudChFbGVtZW50Kik7CiAgICAgdm9pZCB1cGRhdGUoKTsK LSAgICB2b2lkIHVwZGF0ZVN0eWxlKCk7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0eWxlKCk7 CisKIHByb3RlY3RlZDoKICAgICBIVE1MTWVkaWFFbGVtZW50KiBtX21lZGlhRWxlbWVudDsgICAK ICAgICBQc2V1ZG9JZCBtX3BzZXVkb1N0eWxlSWQ7CkBAIC05NSw3ICsxMDAsNyBAQCBwcm90ZWN0 ZWQ6CiBjbGFzcyBNZWRpYUNvbnRyb2xUaW1lbGluZUNvbnRhaW5lckVsZW1lbnQgOiBwdWJsaWMg TWVkaWFDb250cm9sRWxlbWVudCB7CiBwdWJsaWM6CiAgICAgTWVkaWFDb250cm9sVGltZWxpbmVD b250YWluZXJFbGVtZW50KERvY3VtZW50KiwgSFRNTE1lZGlhRWxlbWVudCopOwotICAgIHZpcnR1 YWwgYm9vbCByZW5kZXJlcklzTmVlZGVkKFJlbmRlclN0eWxlKiBzdHlsZSk7CisgICAgdmlydHVh bCBib29sIHJlbmRlcmVySXNOZWVkZWQoUmVuZGVyU3R5bGUqKTsKIH07CiAKIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTEwNCw3ICsxMDksNyBAQCBjbGFzcyBNZWRpYUNvbnRy b2xTdGF0dXNEaXNwbGF5RWxlbWVudCA6IHB1YmxpYyBNZWRpYUNvbnRyb2xFbGVtZW50IHsKIHB1 YmxpYzoKICAgICBNZWRpYUNvbnRyb2xTdGF0dXNEaXNwbGF5RWxlbWVudChEb2N1bWVudCosIEhU TUxNZWRpYUVsZW1lbnQqKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlKCk7Ci0gICAgdmlydHVh bCBib29sIHJlbmRlcmVySXNOZWVkZWQoUmVuZGVyU3R5bGUqIHN0eWxlKTsKKyAgICB2aXJ0dWFs IGJvb2wgcmVuZGVyZXJJc05lZWRlZChSZW5kZXJTdHlsZSopOwogcHJpdmF0ZToKICAgICBlbnVt IFN0YXRlQmVpbmdEaXNwbGF5ZWQgeyBOb3RoaW5nLCBMb2FkaW5nLCBMaXZlQnJvYWRjYXN0IH07 CiAgICAgU3RhdGVCZWluZ0Rpc3BsYXllZCBtX3N0YXRlQmVpbmdEaXNwbGF5ZWQ7CkBAIC0xMTUs OSArMTIwLDE0IEBAIHByaXZhdGU6CiBjbGFzcyBNZWRpYUNvbnRyb2xJbnB1dEVsZW1lbnQgOiBw dWJsaWMgSFRNTElucHV0RWxlbWVudCB7CiBwdWJsaWM6CiAgICAgTWVkaWFDb250cm9sSW5wdXRF bGVtZW50KERvY3VtZW50KiwgUHNldWRvSWQsIGNvbnN0IFN0cmluZyYgdHlwZSwgSFRNTE1lZGlh RWxlbWVudCosIE1lZGlhQ29udHJvbEVsZW1lbnRUeXBlKTsKKyAgICB2aXJ0dWFsIHZvaWQgYXR0 YWNoKCk7CisgICAgdmlydHVhbCBib29sIHJlbmRlcmVySXNOZWVkZWQoUmVuZGVyU3R5bGUqKTsK KworICAgIFJlbmRlclN0eWxlKiBzdHlsZUZvckVsZW1lbnQoKTsKICAgICB2b2lkIGF0dGFjaFRv UGFyZW50KEVsZW1lbnQqKTsKICAgICB2b2lkIHVwZGF0ZSgpOwotICAgIHZpcnR1YWwgdm9pZCB1 cGRhdGVTdHlsZSgpOworICAgIHZvaWQgdXBkYXRlU3R5bGUoKTsKKwogICAgIGJvb2wgaGl0VGVz dChjb25zdCBJbnRQb2ludCYgYWJzUG9pbnQpOwogICAgIE1lZGlhQ29udHJvbEVsZW1lbnRUeXBl IGRpc3BsYXlUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9kaXNwbGF5VHlwZTsgfQogCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHAgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJNZWRpYS5jcHAKaW5kZXggYjJjZmYzOS4uNWY0ZGFjNyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck1lZGlhLmNwcApAQCAtMjkyLDExICsyOTIsMTIgQEAgdm9pZCBSZW5kZXJNZWRpYTo6dXBk YXRlQ29udHJvbHMoKQogICAgICAgICAgICAgY3JlYXRlU2Vla0JhY2tCdXR0b24oKTsKICAgICAg ICAgICAgIGNyZWF0ZVNlZWtGb3J3YXJkQnV0dG9uKCk7CiAgICAgICAgICAgICBjcmVhdGVGdWxs c2NyZWVuQnV0dG9uKCk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKG1fdGltZWxpbmVDb250YWlu ZXIpIHsKLSAgICAgICAgICAgIGNyZWF0ZUN1cnJlbnRUaW1lRGlzcGxheSgpOwotICAgICAgICAg ICAgY3JlYXRlVGltZWxpbmUoKTsKLSAgICAgICAgICAgIGNyZWF0ZVRpbWVSZW1haW5pbmdEaXNw bGF5KCk7CisgICAgICAgICAgICBpZiAobV90aW1lbGluZUNvbnRhaW5lcikgeworICAgICAgICAg ICAgICAgIGNyZWF0ZUN1cnJlbnRUaW1lRGlzcGxheSgpOworICAgICAgICAgICAgICAgIGNyZWF0 ZVRpbWVsaW5lKCk7CisgICAgICAgICAgICAgICAgY3JlYXRlVGltZVJlbWFpbmluZ0Rpc3BsYXko KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIG1fcGFuZWwtPmF0dGFjaCgpOwogICAgICAg ICB9CiAgICAgfQogCg==