195470 2019-03-08 10:46:23 -0800 [ContentChangeObserver] Cleanup adjustObservedState 2019-03-08 14:12:53 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1514072 0 zalan 2019-03-08 10:46:23 -0800 Move things around a bit. 1514074 1 webkit-bug-importer 2019-03-08 10:47:00 -0800 <rdar://problem/48717823> 1514078 2 364035 zalan 2019-03-08 10:55:21 -0800 Created attachment 364035 Patch 1514081 3 364036 zalan 2019-03-08 10:57:17 -0800 Created attachment 364036 Patch 1514124 4 364036 simon.fraser 2019-03-08 12:10:18 -0800 Comment on attachment 364036 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364036&action=review > Source/WebCore/ChangeLog:9 > + This is in preparation for introducing a observation window from touchStart -> mouseMoved. an observation > Source/WebCore/page/ios/ContentChangeObserver.cpp:102 > + if (!m_domTimerIsBeingExecuted) m_observedDomTimerIsBeingExecuted > Source/WebCore/page/ios/ContentChangeObserver.cpp:123 > + if (!m_styleRecalcIsBeingExecuted) m_isInObservedStyleRecalc? 1514136 5 364051 zalan 2019-03-08 12:43:40 -0800 Created attachment 364051 Patch 1514155 6 364057 zalan 2019-03-08 13:34:34 -0800 Created attachment 364057 Patch 1514173 7 364057 commit-queue 2019-03-08 14:12:51 -0800 Comment on attachment 364057 Patch Clearing flags on attachment: 364057 Committed r242656: <https://trac.webkit.org/changeset/242656> 1514174 8 commit-queue 2019-03-08 14:12:53 -0800 All reviewed patches have been landed. Closing bug. 364035 2019-03-08 10:55:21 -0800 2019-03-08 10:55:59 -0800 Patch bug-195470-20190308105520.patch text/plain 7372 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y2ODM5NDIzNTc5YWM0 NTZkNzQyNGNkMjRhNjMyNGFiOTQ4ODEwZC4uYmM3Njk3YTg5ZTYxN2RiMzNlNTc0ZjUwOTEwNjRl OWJiM2NkOTI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAzLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gQ2xlYW51cCBhZGp1c3RPYnNlcnZlZFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU0NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4NzE3ODIzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGludHJvZHVjaW5nIGEgb2JzZXJ2YXRpb24g d2luZHdvIGZyb20gdG91Y2hTdGFydCAtPiBtb3VzZU1vdmVkLgorICAgICAgICAxLiBDYW5jZWwg cGVuZGluZyBhY3Rpdml0aWVzIHdoZW4gdmlzaWJsZSBjb250ZW50IGNoYW5nZSBpcyBkZXRlY3Rl ZCAoZnV0dXJlIHRpbWVycywgcGVuZGluZyBzdHlsc2hlZXQgcmVjYWxjcykuCisgICAgICAgIDIu IFRoZSBmaXhlZCB0aW1lIHdpbmRvdyB0YWtlcyBjYXJlIG9mIG5vdGlmeWluZyB0aGUgY2xpZW50 ICh0aW1lcnMsIHN0eWxlIHJlY2FsY3MgZHVyaW5nIHRoZSB3aW5kb3cgc2hvdWxkIG5vdCBzaWdu YWwgdGhlbXNlbHZlcykuICAKKyAgICAgICAgMy4gUmVzZXQgbV9pc09ic2VydmluZ1BlbmRpbmdT dHlsZVJlY2FsYyBhdCBTdGFydGVkU3R5bGVSZWNhbGMgaW5zdGVhZCBvZiBFbmRlZFN0eWxlUmVj YWxjLiAKKworICAgICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmRvbVRpbWVyRXhlY3V0ZURp ZEZpbmlzaCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0eWxl UmVjYWxjRGlkU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVy OjpzdHlsZVJlY2FsY0RpZEZpbmlzaCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OmFkanVzdE9ic2VydmVkU3RhdGUpOgorICAgICAgICAqIHBhZ2UvaW9zL0NvbnRl bnRDaGFuZ2VPYnNlcnZlci5oOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2Vy dmVyOjpoYXNQZW5kaW5nQWN0aXZpdHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dENoYW5nZU9ic2VydmVyOjppc09ic2VydmF0aW9uVGltZVdpbmRvd0FjdGl2ZSBjb25zdCk6CisK IDIwMTktMDMtMDggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBb Q29udGVudENoYW5nZU9ic2VydmVyXSBBZGQgU3RhcnRlZERPTVRpbWVyRXhlY3V0aW9uIGFuZCBT dGFydGVkU3R5bGVSZWNhbGMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0Nv bnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50 Q2hhbmdlT2JzZXJ2ZXIuY3BwCmluZGV4IDlmNjJhNWYwNDFlMmFiZTJlOWNiNzY0ZDIzODIwN2Uw YjgxMTllNzkuLmFjYmUwYzMxNWU2Zjg5ZmI3N2Y2ZDlmY2Q3MWYyZmFhMmU5NWYwZmEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcApA QCAtOTksMTMgKzk5LDEyIEBAIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpkb21UaW1lckV4 ZWN1dGVEaWRTdGFydChjb25zdCBET01UaW1lciYgdGltZXIpCiAKIHZvaWQgQ29udGVudENoYW5n ZU9ic2VydmVyOjpkb21UaW1lckV4ZWN1dGVEaWRGaW5pc2goY29uc3QgRE9NVGltZXImIHRpbWVy KQogewotICAgIGlmICghY29udGFpbnNPYnNlcnZlZERPTVRpbWVyKHRpbWVyKSkKKyAgICBpZiAo IW1fZG9tVGltZXJJc0JlaW5nRXhlY3V0ZWQpCiAgICAgICAgIHJldHVybjsKICAgICBMT0dfV0lU SF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgInN0b3BPYnNlcnZpbmdET01U aW1lckV4ZWN1dGU6IHN0b3Agb2JzZXJ2aW5nICgiIDw8ICZ0aW1lciA8PCAiKSB0aW1lciBjYWxs YmFjay4iKTsKIAogICAgIG1fZG9tVGltZXJJc0JlaW5nRXhlY3V0ZWQgPSBmYWxzZTsKICAgICB1 bnJlZ2lzdGVyRE9NVGltZXIodGltZXIpOwotICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVS ZWNhbGMobV9kb2N1bWVudC5oYXNQZW5kaW5nU3R5bGVSZWNhbGMoKSk7CiAgICAgYWRqdXN0T2Jz ZXJ2ZWRTdGF0ZShFdmVudDo6RW5kZWRET01UaW1lckV4ZWN1dGlvbik7CiB9CiAKQEAgLTExMyw4 ICsxMTIsNiBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRTdGFy dCgpCiB7CiAgICAgaWYgKCFpc09ic2VydmluZ1BlbmRpbmdTdHlsZVJlY2FsYygpKQogICAgICAg ICByZXR1cm47Ci0gICAgaWYgKGhhc1Zpc2libGVDaGFuZ2VTdGF0ZSgpKQotICAgICAgICByZXR1 cm47CiAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNh bGM6IHN0YXJ0IG9ic2VydmluZyBzdHlsZSByZWNhbGMuIik7CiAKICAgICBtX3N0eWxlUmVjYWxj SXNCZWluZ0V4ZWN1dGVkID0gdHJ1ZTsKQEAgLTEyMyw3ICsxMjAsNyBAQCB2b2lkIENvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRTdGFydCgpCiAKIHZvaWQgQ29udGVudENoYW5n ZU9ic2VydmVyOjpzdHlsZVJlY2FsY0RpZEZpbmlzaCgpCiB7Ci0gICAgaWYgKCFpc09ic2Vydmlu Z1BlbmRpbmdTdHlsZVJlY2FsYygpKQorICAgIGlmICghbV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVj dXRlZCkKICAgICAgICAgcmV0dXJuOwogICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJzdG9w T2JzZXJ2aW5nU3R5bGVSZWNhbGM6IHN0b3Agb2JzZXJ2aW5nIHN0eWxlIHJlY2FsYyIpOwogCkBA IC0yMjksNyArMjI2LDExIEBAIGJvb2wgQ29udGVudENoYW5nZU9ic2VydmVyOjppc05vdGlmeUNv bnRlbnRDaGFuZ2VBbGxvd2VkKCkgY29uc3QKIAogdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OmFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQgZXZlbnQpCiB7Ci0gICAgYXV0byBub3RpZnlDb250 ZW50Q2hhbmdlSWZOZWVkZWQgPSBbJl0geworICAgIGF1dG8gYWRqdXN0U3RhdGVBbmROb3RpZnlD b250ZW50Q2hhbmdlSWZOZWVkZWQgPSBbJl0geworICAgICAgICAvLyBEZW1vdGUgdG8gIm5vIGNo YW5nZSIgd2hlbiB0aGVyZSdzIG5vIHBlbmRpbmcgYWN0aXZpdHkgYW55bW9yZS4KKyAgICAgICAg aWYgKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFu Z2UgJiYgIWhhc1BlbmRpbmdBY3Rpdml0eSgpKQorICAgICAgICAgICAgc2V0SGFzTm9DaGFuZ2VT dGF0ZSgpOworCiAgICAgICAgIGlmICghaGFzRGV0ZXJtaW5hdGVTdGF0ZSgpKSB7CiAgICAgICAg ICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAibm90aWZ5Q29udGVudENoYW5nZUlmTmVlZGVk OiBub3QgaW4gYSBkZXRlcm1pbmVkIHN0YXRlIHlldC4iKTsKICAgICAgICAgICAgIHJldHVybjsK QEAgLTI0OCw2ICsyNDksOSBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6YWRqdXN0T2Jz ZXJ2ZWRTdGF0ZShFdmVudCBldmVudCkKICAgICAgICAgbV9pc01vdXNlTW92ZWRQcmVjZWRlZEJ5 VG91Y2ggPSB0cnVlOwogICAgICAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5n KHRydWUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEV2ZW50OjpFbmRlZFRvdWNoU3RhcnRF dmVudERpc3BhdGNoaW5nOgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVs aW5nKGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFdmVudDo6U3RhcnRlZE1vdXNl TW92ZWRFdmVudERpc3BhdGNoaW5nOgogICAgICAgICBBU1NFUlQoIW1fZG9jdW1lbnQuaGFzUGVu ZGluZ1N0eWxlUmVjYWxjKCkpOwogICAgICAgICBpZiAoIW1faXNNb3VzZU1vdmVkUHJlY2VkZWRC eVRvdWNoKSB7CkBAIC0yNTcsMzMgKzI2MSwzNiBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZl cjo6YWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudCBldmVudCkKICAgICAgICAgc2V0U2hvdWxkT2Jz ZXJ2ZURPTVRpbWVyU2NoZWR1bGluZyh0cnVlKTsKICAgICAgICAgbV9pc01vdXNlTW92ZWRQcmVj ZWRlZEJ5VG91Y2ggPSBmYWxzZTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBFdmVudDo6U3Rh cnRlZERPTVRpbWVyRXhlY3V0aW9uOgotICAgIGNhc2UgRXZlbnQ6OlN0YXJ0ZWRTdHlsZVJlY2Fs YzoKLSAgICAgICAgQVNTRVJUKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudElu ZGV0ZXJtaW5hdGVDaGFuZ2UpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEV2ZW50OjpFbmRl ZFRvdWNoU3RhcnRFdmVudERpc3BhdGNoaW5nOgogICAgIGNhc2UgRXZlbnQ6OkVuZGVkTW91c2VN b3ZlZEV2ZW50RGlzcGF0Y2hpbmc6CiAgICAgICAgIHNldFNob3VsZE9ic2VydmVET01UaW1lclNj aGVkdWxpbmcoZmFsc2UpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEV2ZW50OjpTdGFydGVk U3R5bGVSZWNhbGM6CisgICAgICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoZmFs c2UpOworICAgICAgICBGQUxMVEhST1VHSDsKKyAgICBjYXNlIEV2ZW50OjpTdGFydGVkRE9NVGlt ZXJFeGVjdXRpb246CisgICAgICAgIEFTU0VSVChpc09ic2VydmF0aW9uVGltZVdpbmRvd0FjdGl2 ZSgpIHx8IG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVD aGFuZ2UpOworICAgICAgICBicmVhazsKICAgICBjYXNlIEV2ZW50OjpJbnN0YWxsZWRET01UaW1l cjoKICAgICBjYXNlIEV2ZW50OjpTdGFydGVkRml4ZWRPYnNlcnZhdGlvblRpbWVXaW5kb3c6Ci0g ICAgICAgIC8vIEV4cGVjdGluZyBhIHRpbWVyIGZpcmUuIFByb21vdGUgdG8gYW4gaW5kZXRlcm1p bmF0ZSBzdGF0ZS4KICAgICAgICAgQVNTRVJUKCFoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSk7CiAg ICAgICAgIHNldEhhc0luZGV0ZXJtaW5hdGVTdGF0ZSgpOwogICAgICAgICBicmVhazsKLSAgICBj YXNlIEV2ZW50OjpFbmRlZFN0eWxlUmVjYWxjOgotICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4 dFN0eWxlUmVjYWxjKGZhbHNlKTsKKyAgICBjYXNlIEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0 aW9uOgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKG1fZG9jdW1lbnQu aGFzUGVuZGluZ1N0eWxlUmVjYWxjKCkpOwogICAgICAgICBGQUxMVEhST1VHSDsKKyAgICBjYXNl IEV2ZW50OjpFbmRlZFN0eWxlUmVjYWxjOgogICAgIGNhc2UgRXZlbnQ6OlJlbW92ZWRET01UaW1l cjoKLSAgICBjYXNlIEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9uOgorICAgICAgICBpZiAo IWlzT2JzZXJ2YXRpb25UaW1lV2luZG93QWN0aXZlKCkpCisgICAgICAgICAgICBhZGp1c3RTdGF0 ZUFuZE5vdGlmeUNvbnRlbnRDaGFuZ2VJZk5lZWRlZCgpOworICAgICAgICBicmVhazsKICAgICBj YXNlIEV2ZW50OjpFbmRlZEZpeGVkT2JzZXJ2YXRpb25UaW1lV2luZG93OgotICAgICAgICAvLyBE ZW1vdGUgdG8gIm5vIGNoYW5nZSIgd2hlbiB0aGVyZSdzIG5vIHBlbmRpbmcgYWN0aXZpdHkgYW55 bW9yZS4KLSAgICAgICAgaWYgKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudElu ZGV0ZXJtaW5hdGVDaGFuZ2UgJiYgIWhhc1BlbmRpbmdBY3Rpdml0eSgpKQotICAgICAgICAgICAg c2V0SGFzTm9DaGFuZ2VTdGF0ZSgpOwotICAgICAgICBub3RpZnlDb250ZW50Q2hhbmdlSWZOZWVk ZWQoKTsKKyAgICAgICAgYWRqdXN0U3RhdGVBbmROb3RpZnlDb250ZW50Q2hhbmdlSWZOZWVkZWQo KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFdmVudDo6Q29udGVudFZpc2liaWxpdHlDaGFu Z2VkOgogICAgICAgICBzZXRIYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKTsKKyAgICAgICAgLy8gUmVt b3ZlIHBlbmRpbmcgYWN0aXZpdGllcy4gV2UgZG9uJ3QgbmVlZCB0byBvYnNlcnZlIHRoZW0gYW55 bW9yZS4KKyAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhmYWxzZSk7Cisg ICAgICAgIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2Vy dmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApp bmRleCAxN2VhMWI5MWQ5ZDg3ZjFiNGFhOGM4MTBjN2NhOTU4YzkxZTNiZDZhLi44ZTQwYTBkNGI5 YmI1ODgyOGYwYjUyZDAwMTU0NjIxMmRmOGM3MDhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApAQCAtMTMxLDcgKzEzMSw4IEBAIHByaXZh dGU6CiAgICAgYm9vbCBoYXNPYnNlcnZlZERPTVRpbWVyKCkgY29uc3QgeyByZXR1cm4gIW1fRE9N VGltZXJMaXN0LmlzRW1wdHkoKTsgfQogICAgIGJvb2wgaGFzRGV0ZXJtaW5hdGVTdGF0ZSgpIGNv bnN0OwogCi0gICAgYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdCB7IHJldHVybiBoYXNP YnNlcnZlZERPTVRpbWVyKCkgfHwgbV9kb2N1bWVudC5oYXNQZW5kaW5nU3R5bGVSZWNhbGMoKSB8 fCBtX2NvbnRlbnRPYnNlcnZhdGlvblRpbWVyLmlzQWN0aXZlKCk7IH0KKyAgICBib29sIGhhc1Bl bmRpbmdBY3Rpdml0eSgpIGNvbnN0IHsgcmV0dXJuIGhhc09ic2VydmVkRE9NVGltZXIoKSB8fCBt X2RvY3VtZW50Lmhhc1BlbmRpbmdTdHlsZVJlY2FsYygpIHx8IGlzT2JzZXJ2YXRpb25UaW1lV2lu ZG93QWN0aXZlKCk7IH0KKyAgICBib29sIGlzT2JzZXJ2YXRpb25UaW1lV2luZG93QWN0aXZlKCkg Y29uc3QgeyByZXR1cm4gbV9jb250ZW50T2JzZXJ2YXRpb25UaW1lci5pc0FjdGl2ZSgpOyB9CiAj aWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIGJvb2wgaXNOb3RpZnlDb250ZW50Q2hhbmdlQWxsb3dl ZCgpIGNvbnN0OwogI2VuZGlmCg== 364036 2019-03-08 10:57:17 -0800 2019-03-08 12:43:39 -0800 Patch bug-195470-20190308105716.patch text/plain 7373 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y2ODM5NDIzNTc5YWM0 NTZkNzQyNGNkMjRhNjMyNGFiOTQ4ODEwZC4uODg1YzRjMzg0ODkxZGYwMjJiYWY3OWE5MjViMjcw MWIzY2M1ZjE5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAzLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gQ2xlYW51cCBhZGp1c3RPYnNlcnZlZFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU0NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4NzE3ODIzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGludHJvZHVjaW5nIGEgb2JzZXJ2YXRpb24g d2luZG93IGZyb20gdG91Y2hTdGFydCAtPiBtb3VzZU1vdmVkLgorICAgICAgICAxLiBDYW5jZWwg cGVuZGluZyBhY3Rpdml0aWVzIHdoZW4gdmlzaWJsZSBjb250ZW50IGNoYW5nZSBpcyBkZXRlY3Rl ZCAoZnV0dXJlIHRpbWVycywgcGVuZGluZyBzdHlsZXNoZWV0IHJlY2FsY3MpLgorICAgICAgICAy LiBUaGUgZml4ZWQgdGltZSB3aW5kb3cgdGFrZXMgY2FyZSBvZiBub3RpZnlpbmcgdGhlIGNsaWVu dCAodGltZXJzLCBzdHlsZSByZWNhbGNzIGR1cmluZyB0aGUgd2luZG93IHNob3VsZCBub3Qgc2ln bmFsIHRoZW1zZWx2ZXMpLiAgCisgICAgICAgIDMuIFJlc2V0IG1faXNPYnNlcnZpbmdQZW5kaW5n U3R5bGVSZWNhbGMgYXQgU3RhcnRlZFN0eWxlUmVjYWxjIGluc3RlYWQgb2YgRW5kZWRTdHlsZVJl Y2FsYy4gCisKKyAgICAgICAgKiBwYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpkb21UaW1lckV4ZWN1dGVE aWRGaW5pc2gpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdHls ZVJlY2FsY0RpZFN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZl cjo6c3R5bGVSZWNhbGNEaWRGaW5pc2gpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5n ZU9ic2VydmVyOjphZGp1c3RPYnNlcnZlZFN0YXRlKToKKyAgICAgICAgKiBwYWdlL2lvcy9Db250 ZW50Q2hhbmdlT2JzZXJ2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6aGFzUGVuZGluZ0FjdGl2aXR5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl bnRDaGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZhdGlvblRpbWVXaW5kb3dBY3RpdmUgY29uc3QpOgor CiAyMDE5LTAzLTA4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W0NvbnRlbnRDaGFuZ2VPYnNlcnZlcl0gQWRkIFN0YXJ0ZWRET01UaW1lckV4ZWN1dGlvbiBhbmQg U3RhcnRlZFN0eWxlUmVjYWxjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9D b250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVu dENoYW5nZU9ic2VydmVyLmNwcAppbmRleCA5ZjYyYTVmMDQxZTJhYmUyZTljYjc2NGQyMzgyMDdl MGI4MTE5ZTc5Li5hY2JlMGMzMTVlNmY4OWZiNzdmNmQ5ZmNkNzFmMmZhYTJlOTVmMGZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAK QEAgLTk5LDEzICs5OSwxMiBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJF eGVjdXRlRGlkU3RhcnQoY29uc3QgRE9NVGltZXImIHRpbWVyKQogCiB2b2lkIENvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlkRmluaXNoKGNvbnN0IERPTVRpbWVyJiB0aW1l cikKIHsKLSAgICBpZiAoIWNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcih0aW1lcikpCisgICAgaWYg KCFtX2RvbVRpbWVySXNCZWluZ0V4ZWN1dGVkKQogICAgICAgICByZXR1cm47CiAgICAgTE9HX1dJ VEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJzdG9wT2JzZXJ2aW5nRE9N VGltZXJFeGVjdXRlOiBzdG9wIG9ic2VydmluZyAoIiA8PCAmdGltZXIgPDwgIikgdGltZXIgY2Fs bGJhY2suIik7CiAKICAgICBtX2RvbVRpbWVySXNCZWluZ0V4ZWN1dGVkID0gZmFsc2U7CiAgICAg dW5yZWdpc3RlckRPTVRpbWVyKHRpbWVyKTsKLSAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxl UmVjYWxjKG1fZG9jdW1lbnQuaGFzUGVuZGluZ1N0eWxlUmVjYWxjKCkpOwogICAgIGFkanVzdE9i c2VydmVkU3RhdGUoRXZlbnQ6OkVuZGVkRE9NVGltZXJFeGVjdXRpb24pOwogfQogCkBAIC0xMTMs OCArMTEyLDYgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0eWxlUmVjYWxjRGlkU3Rh cnQoKQogewogICAgIGlmICghaXNPYnNlcnZpbmdQZW5kaW5nU3R5bGVSZWNhbGMoKSkKICAgICAg ICAgcmV0dXJuOwotICAgIGlmIChoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSkKLSAgICAgICAgcmV0 dXJuOwogICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJzdGFydE9ic2VydmluZ1N0eWxlUmVj YWxjOiBzdGFydCBvYnNlcnZpbmcgc3R5bGUgcmVjYWxjLiIpOwogCiAgICAgbV9zdHlsZVJlY2Fs Y0lzQmVpbmdFeGVjdXRlZCA9IHRydWU7CkBAIC0xMjMsNyArMTIwLDcgQEAgdm9pZCBDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6OnN0eWxlUmVjYWxjRGlkU3RhcnQoKQogCiB2b2lkIENvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRGaW5pc2goKQogewotICAgIGlmICghaXNPYnNlcnZp bmdQZW5kaW5nU3R5bGVSZWNhbGMoKSkKKyAgICBpZiAoIW1fc3R5bGVSZWNhbGNJc0JlaW5nRXhl Y3V0ZWQpCiAgICAgICAgIHJldHVybjsKICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAic3Rv cE9ic2VydmluZ1N0eWxlUmVjYWxjOiBzdG9wIG9ic2VydmluZyBzdHlsZSByZWNhbGMiKTsKIApA QCAtMjI5LDcgKzIyNiwxMSBAQCBib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6aXNOb3RpZnlD b250ZW50Q2hhbmdlQWxsb3dlZCgpIGNvbnN0CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVy OjphZGp1c3RPYnNlcnZlZFN0YXRlKEV2ZW50IGV2ZW50KQogewotICAgIGF1dG8gbm90aWZ5Q29u dGVudENoYW5nZUlmTmVlZGVkID0gWyZdIHsKKyAgICBhdXRvIGFkanVzdFN0YXRlQW5kTm90aWZ5 Q29udGVudENoYW5nZUlmTmVlZGVkID0gWyZdIHsKKyAgICAgICAgLy8gRGVtb3RlIHRvICJubyBj aGFuZ2UiIHdoZW4gdGhlcmUncyBubyBwZW5kaW5nIGFjdGl2aXR5IGFueW1vcmUuCisgICAgICAg IGlmIChvYnNlcnZlZENvbnRlbnRDaGFuZ2UoKSA9PSBXS0NvbnRlbnRJbmRldGVybWluYXRlQ2hh bmdlICYmICFoYXNQZW5kaW5nQWN0aXZpdHkoKSkKKyAgICAgICAgICAgIHNldEhhc05vQ2hhbmdl U3RhdGUoKTsKKwogICAgICAgICBpZiAoIWhhc0RldGVybWluYXRlU3RhdGUoKSkgewogICAgICAg ICAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgIm5vdGlmeUNvbnRlbnRDaGFuZ2VJZk5lZWRl ZDogbm90IGluIGEgZGV0ZXJtaW5lZCBzdGF0ZSB5ZXQuIik7CiAgICAgICAgICAgICByZXR1cm47 CkBAIC0yNDgsNiArMjQ5LDkgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFkanVzdE9i c2VydmVkU3RhdGUoRXZlbnQgZXZlbnQpCiAgICAgICAgIG1faXNNb3VzZU1vdmVkUHJlY2VkZWRC eVRvdWNoID0gdHJ1ZTsKICAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZURPTVRpbWVyU2NoZWR1bGlu Zyh0cnVlKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFdmVudDo6RW5kZWRUb3VjaFN0YXJ0 RXZlbnREaXNwYXRjaGluZzoKKyAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZURPTVRpbWVyU2NoZWR1 bGluZyhmYWxzZSk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRXZlbnQ6OlN0YXJ0ZWRNb3Vz ZU1vdmVkRXZlbnREaXNwYXRjaGluZzoKICAgICAgICAgQVNTRVJUKCFtX2RvY3VtZW50Lmhhc1Bl bmRpbmdTdHlsZVJlY2FsYygpKTsKICAgICAgICAgaWYgKCFtX2lzTW91c2VNb3ZlZFByZWNlZGVk QnlUb3VjaCkgewpAQCAtMjU3LDMzICsyNjEsMzYgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2 ZXI6OmFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQgZXZlbnQpCiAgICAgICAgIHNldFNob3VsZE9i c2VydmVET01UaW1lclNjaGVkdWxpbmcodHJ1ZSk7CiAgICAgICAgIG1faXNNb3VzZU1vdmVkUHJl Y2VkZWRCeVRvdWNoID0gZmFsc2U7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgRXZlbnQ6OlN0 YXJ0ZWRET01UaW1lckV4ZWN1dGlvbjoKLSAgICBjYXNlIEV2ZW50OjpTdGFydGVkU3R5bGVSZWNh bGM6Ci0gICAgICAgIEFTU0VSVChvYnNlcnZlZENvbnRlbnRDaGFuZ2UoKSA9PSBXS0NvbnRlbnRJ bmRldGVybWluYXRlQ2hhbmdlKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBFdmVudDo6RW5k ZWRUb3VjaFN0YXJ0RXZlbnREaXNwYXRjaGluZzoKICAgICBjYXNlIEV2ZW50OjpFbmRlZE1vdXNl TW92ZWRFdmVudERpc3BhdGNoaW5nOgogICAgICAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJT Y2hlZHVsaW5nKGZhbHNlKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFdmVudDo6U3RhcnRl ZFN0eWxlUmVjYWxjOgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGZh bHNlKTsKKyAgICAgICAgRkFMTFRIUk9VR0g7CisgICAgY2FzZSBFdmVudDo6U3RhcnRlZERPTVRp bWVyRXhlY3V0aW9uOgorICAgICAgICBBU1NFUlQoaXNPYnNlcnZhdGlvblRpbWVXaW5kb3dBY3Rp dmUoKSB8fCBvYnNlcnZlZENvbnRlbnRDaGFuZ2UoKSA9PSBXS0NvbnRlbnRJbmRldGVybWluYXRl Q2hhbmdlKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFdmVudDo6SW5zdGFsbGVkRE9NVGlt ZXI6CiAgICAgY2FzZSBFdmVudDo6U3RhcnRlZEZpeGVkT2JzZXJ2YXRpb25UaW1lV2luZG93Ogot ICAgICAgICAvLyBFeHBlY3RpbmcgYSB0aW1lciBmaXJlLiBQcm9tb3RlIHRvIGFuIGluZGV0ZXJt aW5hdGUgc3RhdGUuCiAgICAgICAgIEFTU0VSVCghaGFzVmlzaWJsZUNoYW5nZVN0YXRlKCkpOwog ICAgICAgICBzZXRIYXNJbmRldGVybWluYXRlU3RhdGUoKTsKICAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBFdmVudDo6RW5kZWRTdHlsZVJlY2FsYzoKLSAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZU5l eHRTdHlsZVJlY2FsYyhmYWxzZSk7CisgICAgY2FzZSBFdmVudDo6RW5kZWRET01UaW1lckV4ZWN1 dGlvbjoKKyAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhtX2RvY3VtZW50 Lmhhc1BlbmRpbmdTdHlsZVJlY2FsYygpKTsKICAgICAgICAgRkFMTFRIUk9VR0g7CisgICAgY2Fz ZSBFdmVudDo6RW5kZWRTdHlsZVJlY2FsYzoKICAgICBjYXNlIEV2ZW50OjpSZW1vdmVkRE9NVGlt ZXI6Ci0gICAgY2FzZSBFdmVudDo6RW5kZWRET01UaW1lckV4ZWN1dGlvbjoKKyAgICAgICAgaWYg KCFpc09ic2VydmF0aW9uVGltZVdpbmRvd0FjdGl2ZSgpKQorICAgICAgICAgICAgYWRqdXN0U3Rh dGVBbmROb3RpZnlDb250ZW50Q2hhbmdlSWZOZWVkZWQoKTsKKyAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBFdmVudDo6RW5kZWRGaXhlZE9ic2VydmF0aW9uVGltZVdpbmRvdzoKLSAgICAgICAgLy8g RGVtb3RlIHRvICJubyBjaGFuZ2UiIHdoZW4gdGhlcmUncyBubyBwZW5kaW5nIGFjdGl2aXR5IGFu eW1vcmUuCi0gICAgICAgIGlmIChvYnNlcnZlZENvbnRlbnRDaGFuZ2UoKSA9PSBXS0NvbnRlbnRJ bmRldGVybWluYXRlQ2hhbmdlICYmICFoYXNQZW5kaW5nQWN0aXZpdHkoKSkKLSAgICAgICAgICAg IHNldEhhc05vQ2hhbmdlU3RhdGUoKTsKLSAgICAgICAgbm90aWZ5Q29udGVudENoYW5nZUlmTmVl ZGVkKCk7CisgICAgICAgIGFkanVzdFN0YXRlQW5kTm90aWZ5Q29udGVudENoYW5nZUlmTmVlZGVk KCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRXZlbnQ6OkNvbnRlbnRWaXNpYmlsaXR5Q2hh bmdlZDoKICAgICAgICAgc2V0SGFzVmlzaWJsZUNoYW5nZVN0YXRlKCk7CisgICAgICAgIC8vIFJl bW92ZSBwZW5kaW5nIGFjdGl2aXRpZXMuIFdlIGRvbid0IG5lZWQgdG8gb2JzZXJ2ZSB0aGVtIGFu eW1vcmUuCisgICAgICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoZmFsc2UpOwor ICAgICAgICBjbGVhck9ic2VydmVkRE9NVGltZXJzKCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0K IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNl cnZlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgK aW5kZXggMTdlYTFiOTFkOWQ4N2YxYjRhYThjODEwYzdjYTk1OGM5MWUzYmQ2YS4uOGU0MGEwZDRi OWJiNTg4MjhmMGI1MmQwMDE1NDYyMTJkZjhjNzA4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKQEAgLTEzMSw3ICsxMzEsOCBAQCBwcml2 YXRlOgogICAgIGJvb2wgaGFzT2JzZXJ2ZWRET01UaW1lcigpIGNvbnN0IHsgcmV0dXJuICFtX0RP TVRpbWVyTGlzdC5pc0VtcHR5KCk7IH0KICAgICBib29sIGhhc0RldGVybWluYXRlU3RhdGUoKSBj b25zdDsKIAotICAgIGJvb2wgaGFzUGVuZGluZ0FjdGl2aXR5KCkgY29uc3QgeyByZXR1cm4gaGFz T2JzZXJ2ZWRET01UaW1lcigpIHx8IG1fZG9jdW1lbnQuaGFzUGVuZGluZ1N0eWxlUmVjYWxjKCkg fHwgbV9jb250ZW50T2JzZXJ2YXRpb25UaW1lci5pc0FjdGl2ZSgpOyB9CisgICAgYm9vbCBoYXNQ ZW5kaW5nQWN0aXZpdHkoKSBjb25zdCB7IHJldHVybiBoYXNPYnNlcnZlZERPTVRpbWVyKCkgfHwg bV9kb2N1bWVudC5oYXNQZW5kaW5nU3R5bGVSZWNhbGMoKSB8fCBpc09ic2VydmF0aW9uVGltZVdp bmRvd0FjdGl2ZSgpOyB9CisgICAgYm9vbCBpc09ic2VydmF0aW9uVGltZVdpbmRvd0FjdGl2ZSgp IGNvbnN0IHsgcmV0dXJuIG1fY29udGVudE9ic2VydmF0aW9uVGltZXIuaXNBY3RpdmUoKTsgfQog I2lmICFBU1NFUlRfRElTQUJMRUQKICAgICBib29sIGlzTm90aWZ5Q29udGVudENoYW5nZUFsbG93 ZWQoKSBjb25zdDsKICNlbmRpZgo= 364051 2019-03-08 12:43:40 -0800 2019-03-08 13:34:33 -0800 Patch bug-195470-20190308124339.patch text/plain 9074 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY5N2VjOGJjZDYxMmY2 N2ZmZGUyYjFjNDU1ZmU4YmQxZTVjOTRiZi4uODFjMzg5ZDI5MzAyMDU2MzM1MmUzMmVmMjY2Y2M3 YWY0Y2MzOGU5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAzLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gQ2xlYW51cCBhZGp1c3RPYnNlcnZlZFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU0NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4NzE3ODIzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAg ICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBpbnRyb2R1Y2luZyBhbiBvYnNlcnZhdGlvbiB3 aW5kb3cgZnJvbSB0b3VjaFN0YXJ0IC0+IG1vdXNlTW92ZWQuCisgICAgICAgIDEuIENhbmNlbCBw ZW5kaW5nIGFjdGl2aXRpZXMgKGZ1dHVyZSB0aW1lcnMsIHBlbmRpbmcgc3R5bGVzaGVldCByZWNh bGNzKSB3aGVuIHZpc2libGUgY29udGVudCBjaGFuZ2UgaXMgZGV0ZWN0ZWQuCisgICAgICAgIDIu IFRoZSBmaXhlZCB0aW1lIHdpbmRvdyB0YWtlcyBjYXJlIG9mIG5vdGlmeWluZyB0aGUgY2xpZW50 IC10aW1lcnMsIHN0eWxlIHJlY2FsY3MgZHVyaW5nIHRoZSB3aW5kb3cgc2hvdWxkIG5vdCBzaWdu YWwgdGhlbXNlbHZlcy4gIAorICAgICAgICAzLiBSZXNldCBtX2lzT2JzZXJ2aW5nUGVuZGluZ1N0 eWxlUmVjYWxjIGF0IFN0YXJ0ZWRTdHlsZVJlY2FsYyBpbnN0ZWFkIG9mIEVuZGVkU3R5bGVSZWNh bGMuIAorCisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlk RmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVS ZWNhbGNEaWRTdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OnN0eWxlUmVjYWxjRGlkRmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6YWRqdXN0T2JzZXJ2ZWRTdGF0ZSk6CisgICAgICAgICogcGFnZS9pb3MvQ29udGVu dENoYW5nZU9ic2VydmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2 ZXI6Omhhc1BlbmRpbmdBY3Rpdml0eSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6OmlzT2JzZXJ2YXRpb25UaW1lV2luZG93QWN0aXZlIGNvbnN0KToKKwog MjAxOS0wMy0wOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtD b250ZW50Q2hhbmdlT2JzZXJ2ZXJdIEFkZCBTdGFydGVkRE9NVGltZXJFeGVjdXRpb24gYW5kIFN0 YXJ0ZWRTdHlsZVJlY2FsYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29u dGVudENoYW5nZU9ic2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRD aGFuZ2VPYnNlcnZlci5jcHAKaW5kZXggNzJiOGQ2YWZkMjc1ZGE4YzdhMjFlYmVmMjNmYjM5MDY0 ZWJjMjBjOC4uYjFiMWFmMDcyZjhhY2ZmYzZkMTY2NDVkOTE3ODY3YjFmNWFiOTVlMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwCkBA IC05MywxOSArOTMsMTggQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmRvbVRpbWVyRXhl Y3V0ZURpZFN0YXJ0KGNvbnN0IERPTVRpbWVyJiB0aW1lcikKICAgICAgICAgcmV0dXJuOwogICAg IExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAic3RhcnRPYnNl cnZpbmdET01UaW1lckV4ZWN1dGU6IHN0YXJ0IG9ic2VydmluZyAoIiA8PCAmdGltZXIgPDwgIikg dGltZXIgY2FsbGJhY2suIik7CiAKLSAgICBtX2RvbVRpbWVySXNCZWluZ0V4ZWN1dGVkID0gdHJ1 ZTsKKyAgICBtX29ic2VydmVkRG9tVGltZXJJc0JlaW5nRXhlY3V0ZWQgPSB0cnVlOwogICAgIGFk anVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OlN0YXJ0ZWRET01UaW1lckV4ZWN1dGlvbik7CiB9CiAK IHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpkb21UaW1lckV4ZWN1dGVEaWRGaW5pc2goY29u c3QgRE9NVGltZXImIHRpbWVyKQogewotICAgIGlmICghY29udGFpbnNPYnNlcnZlZERPTVRpbWVy KHRpbWVyKSkKKyAgICBpZiAoIW1fb2JzZXJ2ZWREb21UaW1lcklzQmVpbmdFeGVjdXRlZCkKICAg ICAgICAgcmV0dXJuOwogICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0 cmVhbSA8PCAic3RvcE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZTogc3RvcCBvYnNlcnZpbmcgKCIg PDwgJnRpbWVyIDw8ICIpIHRpbWVyIGNhbGxiYWNrLiIpOwogCi0gICAgbV9kb21UaW1lcklzQmVp bmdFeGVjdXRlZCA9IGZhbHNlOworICAgIG1fb2JzZXJ2ZWREb21UaW1lcklzQmVpbmdFeGVjdXRl ZCA9IGZhbHNlOwogICAgIHVucmVnaXN0ZXJET01UaW1lcih0aW1lcik7Ci0gICAgc2V0U2hvdWxk T2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhtX2RvY3VtZW50Lmhhc1BlbmRpbmdTdHlsZVJlY2FsYygp KTsKICAgICBhZGp1c3RPYnNlcnZlZFN0YXRlKEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9u KTsKIH0KIApAQCAtMTEzLDIxICsxMTIsMTkgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OnN0eWxlUmVjYWxjRGlkU3RhcnQoKQogewogICAgIGlmICghaXNXYWl0aW5nRm9yU3R5bGVSZWNh bGMoKSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSkK LSAgICAgICAgcmV0dXJuOwogICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJzdGFydE9ic2Vy dmluZ1N0eWxlUmVjYWxjOiBzdGFydCBvYnNlcnZpbmcgc3R5bGUgcmVjYWxjLiIpOwogCi0gICAg bV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVjdXRlZCA9IHRydWU7CisgICAgbV9pc0luT2JzZXJ2ZWRT dHlsZVJlY2FsYyA9IHRydWU7CiAgICAgYWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudDo6U3RhcnRl ZFN0eWxlUmVjYWxjKTsKIH0KIAogdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0eWxlUmVj YWxjRGlkRmluaXNoKCkKIHsKLSAgICBpZiAoIWlzV2FpdGluZ0ZvclN0eWxlUmVjYWxjKCkpCisg ICAgaWYgKCFtX2lzSW5PYnNlcnZlZFN0eWxlUmVjYWxjKQogICAgICAgICByZXR1cm47CiAgICAg TE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsYzogc3RvcCBv YnNlcnZpbmcgc3R5bGUgcmVjYWxjIik7CiAKLSAgICBtX3N0eWxlUmVjYWxjSXNCZWluZ0V4ZWN1 dGVkID0gZmFsc2U7CisgICAgbV9pc0luT2JzZXJ2ZWRTdHlsZVJlY2FsYyA9IGZhbHNlOwogICAg IGFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OkVuZGVkU3R5bGVSZWNhbGMpOwogfQogCkBAIC0y MjksNyArMjI2LDExIEBAIGJvb2wgQ29udGVudENoYW5nZU9ic2VydmVyOjppc05vdGlmeUNvbnRl bnRDaGFuZ2VBbGxvd2VkKCkgY29uc3QKIAogdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFk anVzdE9ic2VydmVkU3RhdGUoRXZlbnQgZXZlbnQpCiB7Ci0gICAgYXV0byBub3RpZnlDb250ZW50 Q2hhbmdlSWZOZWVkZWQgPSBbJl0geworICAgIGF1dG8gYWRqdXN0U3RhdGVBbmROb3RpZnlDb250 ZW50Q2hhbmdlSWZOZWVkZWQgPSBbJl0geworICAgICAgICAvLyBEZW1vdGUgdG8gIm5vIGNoYW5n ZSIgd2hlbiB0aGVyZSdzIG5vIHBlbmRpbmcgYWN0aXZpdHkgYW55bW9yZS4KKyAgICAgICAgaWYg KG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2Ug JiYgIWhhc1BlbmRpbmdBY3Rpdml0eSgpKQorICAgICAgICAgICAgc2V0SGFzTm9DaGFuZ2VTdGF0 ZSgpOworCiAgICAgICAgIGlmICghaGFzRGV0ZXJtaW5hdGVTdGF0ZSgpKSB7CiAgICAgICAgICAg ICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAibm90aWZ5Q29udGVudENoYW5nZUlmTmVlZGVkOiBu b3QgaW4gYSBkZXRlcm1pbmVkIHN0YXRlIHlldC4iKTsKICAgICAgICAgICAgIHJldHVybjsKQEAg LTI0OCw2ICsyNDksOSBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6YWRqdXN0T2JzZXJ2 ZWRTdGF0ZShFdmVudCBldmVudCkKICAgICAgICAgbV9pc01vdXNlTW92ZWRQcmVjZWRlZEJ5VG91 Y2ggPSB0cnVlOwogICAgICAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5nKHRy dWUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEV2ZW50OjpFbmRlZFRvdWNoU3RhcnRFdmVu dERpc3BhdGNoaW5nOgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5n KGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFdmVudDo6U3RhcnRlZE1vdXNlTW92 ZWRFdmVudERpc3BhdGNoaW5nOgogICAgICAgICBBU1NFUlQoIW1fZG9jdW1lbnQuaGFzUGVuZGlu Z1N0eWxlUmVjYWxjKCkpOwogICAgICAgICBpZiAoIW1faXNNb3VzZU1vdmVkUHJlY2VkZWRCeVRv dWNoKSB7CkBAIC0yNTcsMzMgKzI2MSwzNiBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6 YWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudCBldmVudCkKICAgICAgICAgc2V0U2hvdWxkT2JzZXJ2 ZURPTVRpbWVyU2NoZWR1bGluZyh0cnVlKTsKICAgICAgICAgbV9pc01vdXNlTW92ZWRQcmVjZWRl ZEJ5VG91Y2ggPSBmYWxzZTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBFdmVudDo6U3RhcnRl ZERPTVRpbWVyRXhlY3V0aW9uOgotICAgIGNhc2UgRXZlbnQ6OlN0YXJ0ZWRTdHlsZVJlY2FsYzoK LSAgICAgICAgQVNTRVJUKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0 ZXJtaW5hdGVDaGFuZ2UpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEV2ZW50OjpFbmRlZFRv dWNoU3RhcnRFdmVudERpc3BhdGNoaW5nOgogICAgIGNhc2UgRXZlbnQ6OkVuZGVkTW91c2VNb3Zl ZEV2ZW50RGlzcGF0Y2hpbmc6CiAgICAgICAgIHNldFNob3VsZE9ic2VydmVET01UaW1lclNjaGVk dWxpbmcoZmFsc2UpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEV2ZW50OjpTdGFydGVkU3R5 bGVSZWNhbGM6CisgICAgICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoZmFsc2Up OworICAgICAgICBGQUxMVEhST1VHSDsKKyAgICBjYXNlIEV2ZW50OjpTdGFydGVkRE9NVGltZXJF eGVjdXRpb246CisgICAgICAgIEFTU0VSVChpc09ic2VydmF0aW9uVGltZVdpbmRvd0FjdGl2ZSgp IHx8IG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFu Z2UpOworICAgICAgICBicmVhazsKICAgICBjYXNlIEV2ZW50OjpJbnN0YWxsZWRET01UaW1lcjoK ICAgICBjYXNlIEV2ZW50OjpTdGFydGVkRml4ZWRPYnNlcnZhdGlvblRpbWVXaW5kb3c6Ci0gICAg ICAgIC8vIEV4cGVjdGluZyBhIHRpbWVyIGZpcmUuIFByb21vdGUgdG8gYW4gaW5kZXRlcm1pbmF0 ZSBzdGF0ZS4KICAgICAgICAgQVNTRVJUKCFoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSk7CiAgICAg ICAgIHNldEhhc0luZGV0ZXJtaW5hdGVTdGF0ZSgpOwogICAgICAgICBicmVhazsKLSAgICBjYXNl IEV2ZW50OjpFbmRlZFN0eWxlUmVjYWxjOgotICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0 eWxlUmVjYWxjKGZhbHNlKTsKKyAgICBjYXNlIEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9u OgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKG1fZG9jdW1lbnQuaGFz UGVuZGluZ1N0eWxlUmVjYWxjKCkpOwogICAgICAgICBGQUxMVEhST1VHSDsKKyAgICBjYXNlIEV2 ZW50OjpFbmRlZFN0eWxlUmVjYWxjOgogICAgIGNhc2UgRXZlbnQ6OlJlbW92ZWRET01UaW1lcjoK LSAgICBjYXNlIEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9uOgorICAgICAgICBpZiAoIWlz T2JzZXJ2YXRpb25UaW1lV2luZG93QWN0aXZlKCkpCisgICAgICAgICAgICBhZGp1c3RTdGF0ZUFu ZE5vdGlmeUNvbnRlbnRDaGFuZ2VJZk5lZWRlZCgpOworICAgICAgICBicmVhazsKICAgICBjYXNl IEV2ZW50OjpFbmRlZEZpeGVkT2JzZXJ2YXRpb25UaW1lV2luZG93OgotICAgICAgICAvLyBEZW1v dGUgdG8gIm5vIGNoYW5nZSIgd2hlbiB0aGVyZSdzIG5vIHBlbmRpbmcgYWN0aXZpdHkgYW55bW9y ZS4KLSAgICAgICAgaWYgKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0 ZXJtaW5hdGVDaGFuZ2UgJiYgIWhhc1BlbmRpbmdBY3Rpdml0eSgpKQotICAgICAgICAgICAgc2V0 SGFzTm9DaGFuZ2VTdGF0ZSgpOwotICAgICAgICBub3RpZnlDb250ZW50Q2hhbmdlSWZOZWVkZWQo KTsKKyAgICAgICAgYWRqdXN0U3RhdGVBbmROb3RpZnlDb250ZW50Q2hhbmdlSWZOZWVkZWQoKTsK ICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFdmVudDo6Q29udGVudFZpc2liaWxpdHlDaGFuZ2Vk OgogICAgICAgICBzZXRIYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKTsKKyAgICAgICAgLy8gUmVtb3Zl IHBlbmRpbmcgYWN0aXZpdGllcy4gV2UgZG9uJ3QgbmVlZCB0byBvYnNlcnZlIHRoZW0gYW55bW9y ZS4KKyAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhmYWxzZSk7CisgICAg ICAgIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAppbmRl eCA3MTI2MDNiMzJiMGI3ZDJmM2Q2YTBiZWI2YWQwZDQxNGJjMmU5ZTNmLi41MjM0YTliNWQwNmY0 YWE4MjMzNzNiZTk0ZjQ2NTYzZDk1ZmUzMTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApAQCAtMTE5LDcgKzExOSw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGJvb2wpOwogICAgIGJv b2wgaXNXYWl0aW5nRm9yU3R5bGVSZWNhbGMoKSBjb25zdCB7IHJldHVybiBtX2lzV2FpdGluZ0Zv clN0eWxlUmVjYWxjOyB9CiAKLSAgICBib29sIGlzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKSBj b25zdCB7IHJldHVybiBtX21vdXNlTW92ZWRFdmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fdG91 Y2hFdmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fZG9tVGltZXJJc0JlaW5nRXhlY3V0ZWQgfHwg bV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVjdXRlZCB8fCBtX2NvbnRlbnRPYnNlcnZhdGlvblRpbWVy LmlzQWN0aXZlKCk7IH0KKyAgICBib29sIGlzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKSBjb25z dCB7IHJldHVybiBtX21vdXNlTW92ZWRFdmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fdG91Y2hF dmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fb2JzZXJ2ZWREb21UaW1lcklzQmVpbmdFeGVjdXRl ZCB8fCBtX2lzSW5PYnNlcnZlZFN0eWxlUmVjYWxjIHx8IG1fY29udGVudE9ic2VydmF0aW9uVGlt ZXIuaXNBY3RpdmUoKTsgfQogCiAgICAgdm9pZCBjYW5jZWxQZW5kaW5nQWN0aXZpdGllcygpOwog CkBAIC0xMzEsNyArMTMxLDggQEAgcHJpdmF0ZToKICAgICBib29sIGhhc09ic2VydmVkRE9NVGlt ZXIoKSBjb25zdCB7IHJldHVybiAhbV9ET01UaW1lckxpc3QuaXNFbXB0eSgpOyB9CiAgICAgYm9v bCBoYXNEZXRlcm1pbmF0ZVN0YXRlKCkgY29uc3Q7CiAKLSAgICBib29sIGhhc1BlbmRpbmdBY3Rp dml0eSgpIGNvbnN0IHsgcmV0dXJuIGhhc09ic2VydmVkRE9NVGltZXIoKSB8fCBtX2RvY3VtZW50 Lmhhc1BlbmRpbmdTdHlsZVJlY2FsYygpIHx8IG1fY29udGVudE9ic2VydmF0aW9uVGltZXIuaXNB Y3RpdmUoKTsgfQorICAgIGJvb2wgaGFzUGVuZGluZ0FjdGl2aXR5KCkgY29uc3QgeyByZXR1cm4g aGFzT2JzZXJ2ZWRET01UaW1lcigpIHx8IG1fZG9jdW1lbnQuaGFzUGVuZGluZ1N0eWxlUmVjYWxj KCkgfHwgaXNPYnNlcnZhdGlvblRpbWVXaW5kb3dBY3RpdmUoKTsgfQorICAgIGJvb2wgaXNPYnNl cnZhdGlvblRpbWVXaW5kb3dBY3RpdmUoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRPYnNlcnZh dGlvblRpbWVyLmlzQWN0aXZlKCk7IH0KICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgYm9vbCBp c05vdGlmeUNvbnRlbnRDaGFuZ2VBbGxvd2VkKCkgY29uc3Q7CiAjZW5kaWYKQEAgLTE2MCw5ICsx NjEsOSBAQCBwcml2YXRlOgogICAgIEhhc2hTZXQ8Y29uc3QgRE9NVGltZXIqPiBtX0RPTVRpbWVy TGlzdDsKICAgICBib29sIG1fdG91Y2hFdmVudElzQmVpbmdEaXNwYXRjaGVkIHsgZmFsc2UgfTsK ICAgICBib29sIG1faXNXYWl0aW5nRm9yU3R5bGVSZWNhbGMgeyBmYWxzZSB9OwotICAgIGJvb2wg bV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVjdXRlZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzSW5P YnNlcnZlZFN0eWxlUmVjYWxjIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNPYnNlcnZpbmdET01U aW1lclNjaGVkdWxpbmcgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9kb21UaW1lcklzQmVpbmdFeGVj dXRlZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX29ic2VydmVkRG9tVGltZXJJc0JlaW5nRXhlY3V0 ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc01vdXNlTW92ZWRQcmVjZWRlZEJ5VG91Y2ggeyBm YWxzZSB9OwogICAgIGJvb2wgbV9tb3VzZU1vdmVkRXZlbnRJc0JlaW5nRGlzcGF0Y2hlZCB7IGZh bHNlIH07CiB9Owo= 364057 2019-03-08 13:34:34 -0800 2019-03-08 14:12:51 -0800 Patch bug-195470-20190308133434.patch text/plain 9074 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY5N2VjOGJjZDYxMmY2 N2ZmZGUyYjFjNDU1ZmU4YmQxZTVjOTRiZi4uODFjMzg5ZDI5MzAyMDU2MzM1MmUzMmVmMjY2Y2M3 YWY0Y2MzOGU5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAzLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gQ2xlYW51cCBhZGp1c3RPYnNlcnZlZFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU0NzAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4NzE3ODIzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAg ICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBpbnRyb2R1Y2luZyBhbiBvYnNlcnZhdGlvbiB3 aW5kb3cgZnJvbSB0b3VjaFN0YXJ0IC0+IG1vdXNlTW92ZWQuCisgICAgICAgIDEuIENhbmNlbCBw ZW5kaW5nIGFjdGl2aXRpZXMgKGZ1dHVyZSB0aW1lcnMsIHBlbmRpbmcgc3R5bGVzaGVldCByZWNh bGNzKSB3aGVuIHZpc2libGUgY29udGVudCBjaGFuZ2UgaXMgZGV0ZWN0ZWQuCisgICAgICAgIDIu IFRoZSBmaXhlZCB0aW1lIHdpbmRvdyB0YWtlcyBjYXJlIG9mIG5vdGlmeWluZyB0aGUgY2xpZW50 IC10aW1lcnMsIHN0eWxlIHJlY2FsY3MgZHVyaW5nIHRoZSB3aW5kb3cgc2hvdWxkIG5vdCBzaWdu YWwgdGhlbXNlbHZlcy4gIAorICAgICAgICAzLiBSZXNldCBtX2lzT2JzZXJ2aW5nUGVuZGluZ1N0 eWxlUmVjYWxjIGF0IFN0YXJ0ZWRTdHlsZVJlY2FsYyBpbnN0ZWFkIG9mIEVuZGVkU3R5bGVSZWNh bGMuIAorCisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlk RmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVS ZWNhbGNEaWRTdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OnN0eWxlUmVjYWxjRGlkRmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6YWRqdXN0T2JzZXJ2ZWRTdGF0ZSk6CisgICAgICAgICogcGFnZS9pb3MvQ29udGVu dENoYW5nZU9ic2VydmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2 ZXI6Omhhc1BlbmRpbmdBY3Rpdml0eSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6OmlzT2JzZXJ2YXRpb25UaW1lV2luZG93QWN0aXZlIGNvbnN0KToKKwog MjAxOS0wMy0wOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtD b250ZW50Q2hhbmdlT2JzZXJ2ZXJdIEFkZCBTdGFydGVkRE9NVGltZXJFeGVjdXRpb24gYW5kIFN0 YXJ0ZWRTdHlsZVJlY2FsYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29u dGVudENoYW5nZU9ic2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRD aGFuZ2VPYnNlcnZlci5jcHAKaW5kZXggNzJiOGQ2YWZkMjc1ZGE4YzdhMjFlYmVmMjNmYjM5MDY0 ZWJjMjBjOC4uYjFiMWFmMDcyZjhhY2ZmYzZkMTY2NDVkOTE3ODY3YjFmNWFiOTVlMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwCkBA IC05MywxOSArOTMsMTggQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmRvbVRpbWVyRXhl Y3V0ZURpZFN0YXJ0KGNvbnN0IERPTVRpbWVyJiB0aW1lcikKICAgICAgICAgcmV0dXJuOwogICAg IExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAic3RhcnRPYnNl cnZpbmdET01UaW1lckV4ZWN1dGU6IHN0YXJ0IG9ic2VydmluZyAoIiA8PCAmdGltZXIgPDwgIikg dGltZXIgY2FsbGJhY2suIik7CiAKLSAgICBtX2RvbVRpbWVySXNCZWluZ0V4ZWN1dGVkID0gdHJ1 ZTsKKyAgICBtX29ic2VydmVkRG9tVGltZXJJc0JlaW5nRXhlY3V0ZWQgPSB0cnVlOwogICAgIGFk anVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OlN0YXJ0ZWRET01UaW1lckV4ZWN1dGlvbik7CiB9CiAK IHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpkb21UaW1lckV4ZWN1dGVEaWRGaW5pc2goY29u c3QgRE9NVGltZXImIHRpbWVyKQogewotICAgIGlmICghY29udGFpbnNPYnNlcnZlZERPTVRpbWVy KHRpbWVyKSkKKyAgICBpZiAoIW1fb2JzZXJ2ZWREb21UaW1lcklzQmVpbmdFeGVjdXRlZCkKICAg ICAgICAgcmV0dXJuOwogICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0 cmVhbSA8PCAic3RvcE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZTogc3RvcCBvYnNlcnZpbmcgKCIg PDwgJnRpbWVyIDw8ICIpIHRpbWVyIGNhbGxiYWNrLiIpOwogCi0gICAgbV9kb21UaW1lcklzQmVp bmdFeGVjdXRlZCA9IGZhbHNlOworICAgIG1fb2JzZXJ2ZWREb21UaW1lcklzQmVpbmdFeGVjdXRl ZCA9IGZhbHNlOwogICAgIHVucmVnaXN0ZXJET01UaW1lcih0aW1lcik7Ci0gICAgc2V0U2hvdWxk T2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhtX2RvY3VtZW50Lmhhc1BlbmRpbmdTdHlsZVJlY2FsYygp KTsKICAgICBhZGp1c3RPYnNlcnZlZFN0YXRlKEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9u KTsKIH0KIApAQCAtMTEzLDIxICsxMTIsMTkgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OnN0eWxlUmVjYWxjRGlkU3RhcnQoKQogewogICAgIGlmICghaXNXYWl0aW5nRm9yU3R5bGVSZWNh bGMoKSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSkK LSAgICAgICAgcmV0dXJuOwogICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJzdGFydE9ic2Vy dmluZ1N0eWxlUmVjYWxjOiBzdGFydCBvYnNlcnZpbmcgc3R5bGUgcmVjYWxjLiIpOwogCi0gICAg bV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVjdXRlZCA9IHRydWU7CisgICAgbV9pc0luT2JzZXJ2ZWRT dHlsZVJlY2FsYyA9IHRydWU7CiAgICAgYWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudDo6U3RhcnRl ZFN0eWxlUmVjYWxjKTsKIH0KIAogdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0eWxlUmVj YWxjRGlkRmluaXNoKCkKIHsKLSAgICBpZiAoIWlzV2FpdGluZ0ZvclN0eWxlUmVjYWxjKCkpCisg ICAgaWYgKCFtX2lzSW5PYnNlcnZlZFN0eWxlUmVjYWxjKQogICAgICAgICByZXR1cm47CiAgICAg TE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsYzogc3RvcCBv YnNlcnZpbmcgc3R5bGUgcmVjYWxjIik7CiAKLSAgICBtX3N0eWxlUmVjYWxjSXNCZWluZ0V4ZWN1 dGVkID0gZmFsc2U7CisgICAgbV9pc0luT2JzZXJ2ZWRTdHlsZVJlY2FsYyA9IGZhbHNlOwogICAg IGFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OkVuZGVkU3R5bGVSZWNhbGMpOwogfQogCkBAIC0y MjksNyArMjI2LDExIEBAIGJvb2wgQ29udGVudENoYW5nZU9ic2VydmVyOjppc05vdGlmeUNvbnRl bnRDaGFuZ2VBbGxvd2VkKCkgY29uc3QKIAogdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFk anVzdE9ic2VydmVkU3RhdGUoRXZlbnQgZXZlbnQpCiB7Ci0gICAgYXV0byBub3RpZnlDb250ZW50 Q2hhbmdlSWZOZWVkZWQgPSBbJl0geworICAgIGF1dG8gYWRqdXN0U3RhdGVBbmROb3RpZnlDb250 ZW50Q2hhbmdlSWZOZWVkZWQgPSBbJl0geworICAgICAgICAvLyBEZW1vdGUgdG8gIm5vIGNoYW5n ZSIgd2hlbiB0aGVyZSdzIG5vIHBlbmRpbmcgYWN0aXZpdHkgYW55bW9yZS4KKyAgICAgICAgaWYg KG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2Ug JiYgIWhhc1BlbmRpbmdBY3Rpdml0eSgpKQorICAgICAgICAgICAgc2V0SGFzTm9DaGFuZ2VTdGF0 ZSgpOworCiAgICAgICAgIGlmICghaGFzRGV0ZXJtaW5hdGVTdGF0ZSgpKSB7CiAgICAgICAgICAg ICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAibm90aWZ5Q29udGVudENoYW5nZUlmTmVlZGVkOiBu b3QgaW4gYSBkZXRlcm1pbmVkIHN0YXRlIHlldC4iKTsKICAgICAgICAgICAgIHJldHVybjsKQEAg LTI0OCw2ICsyNDksOSBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6YWRqdXN0T2JzZXJ2 ZWRTdGF0ZShFdmVudCBldmVudCkKICAgICAgICAgbV9pc01vdXNlTW92ZWRQcmVjZWRlZEJ5VG91 Y2ggPSB0cnVlOwogICAgICAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5nKHRy dWUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEV2ZW50OjpFbmRlZFRvdWNoU3RhcnRFdmVu dERpc3BhdGNoaW5nOgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5n KGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFdmVudDo6U3RhcnRlZE1vdXNlTW92 ZWRFdmVudERpc3BhdGNoaW5nOgogICAgICAgICBBU1NFUlQoIW1fZG9jdW1lbnQuaGFzUGVuZGlu Z1N0eWxlUmVjYWxjKCkpOwogICAgICAgICBpZiAoIW1faXNNb3VzZU1vdmVkUHJlY2VkZWRCeVRv dWNoKSB7CkBAIC0yNTcsMzMgKzI2MSwzNiBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6 YWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudCBldmVudCkKICAgICAgICAgc2V0U2hvdWxkT2JzZXJ2 ZURPTVRpbWVyU2NoZWR1bGluZyh0cnVlKTsKICAgICAgICAgbV9pc01vdXNlTW92ZWRQcmVjZWRl ZEJ5VG91Y2ggPSBmYWxzZTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBFdmVudDo6U3RhcnRl ZERPTVRpbWVyRXhlY3V0aW9uOgotICAgIGNhc2UgRXZlbnQ6OlN0YXJ0ZWRTdHlsZVJlY2FsYzoK LSAgICAgICAgQVNTRVJUKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0 ZXJtaW5hdGVDaGFuZ2UpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEV2ZW50OjpFbmRlZFRv dWNoU3RhcnRFdmVudERpc3BhdGNoaW5nOgogICAgIGNhc2UgRXZlbnQ6OkVuZGVkTW91c2VNb3Zl ZEV2ZW50RGlzcGF0Y2hpbmc6CiAgICAgICAgIHNldFNob3VsZE9ic2VydmVET01UaW1lclNjaGVk dWxpbmcoZmFsc2UpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEV2ZW50OjpTdGFydGVkU3R5 bGVSZWNhbGM6CisgICAgICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoZmFsc2Up OworICAgICAgICBGQUxMVEhST1VHSDsKKyAgICBjYXNlIEV2ZW50OjpTdGFydGVkRE9NVGltZXJF eGVjdXRpb246CisgICAgICAgIEFTU0VSVChpc09ic2VydmF0aW9uVGltZVdpbmRvd0FjdGl2ZSgp IHx8IG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFu Z2UpOworICAgICAgICBicmVhazsKICAgICBjYXNlIEV2ZW50OjpJbnN0YWxsZWRET01UaW1lcjoK ICAgICBjYXNlIEV2ZW50OjpTdGFydGVkRml4ZWRPYnNlcnZhdGlvblRpbWVXaW5kb3c6Ci0gICAg ICAgIC8vIEV4cGVjdGluZyBhIHRpbWVyIGZpcmUuIFByb21vdGUgdG8gYW4gaW5kZXRlcm1pbmF0 ZSBzdGF0ZS4KICAgICAgICAgQVNTRVJUKCFoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSk7CiAgICAg ICAgIHNldEhhc0luZGV0ZXJtaW5hdGVTdGF0ZSgpOwogICAgICAgICBicmVhazsKLSAgICBjYXNl IEV2ZW50OjpFbmRlZFN0eWxlUmVjYWxjOgotICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0 eWxlUmVjYWxjKGZhbHNlKTsKKyAgICBjYXNlIEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9u OgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKG1fZG9jdW1lbnQuaGFz UGVuZGluZ1N0eWxlUmVjYWxjKCkpOwogICAgICAgICBGQUxMVEhST1VHSDsKKyAgICBjYXNlIEV2 ZW50OjpFbmRlZFN0eWxlUmVjYWxjOgogICAgIGNhc2UgRXZlbnQ6OlJlbW92ZWRET01UaW1lcjoK LSAgICBjYXNlIEV2ZW50OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9uOgorICAgICAgICBpZiAoIWlz T2JzZXJ2YXRpb25UaW1lV2luZG93QWN0aXZlKCkpCisgICAgICAgICAgICBhZGp1c3RTdGF0ZUFu ZE5vdGlmeUNvbnRlbnRDaGFuZ2VJZk5lZWRlZCgpOworICAgICAgICBicmVhazsKICAgICBjYXNl IEV2ZW50OjpFbmRlZEZpeGVkT2JzZXJ2YXRpb25UaW1lV2luZG93OgotICAgICAgICAvLyBEZW1v dGUgdG8gIm5vIGNoYW5nZSIgd2hlbiB0aGVyZSdzIG5vIHBlbmRpbmcgYWN0aXZpdHkgYW55bW9y ZS4KLSAgICAgICAgaWYgKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0 ZXJtaW5hdGVDaGFuZ2UgJiYgIWhhc1BlbmRpbmdBY3Rpdml0eSgpKQotICAgICAgICAgICAgc2V0 SGFzTm9DaGFuZ2VTdGF0ZSgpOwotICAgICAgICBub3RpZnlDb250ZW50Q2hhbmdlSWZOZWVkZWQo KTsKKyAgICAgICAgYWRqdXN0U3RhdGVBbmROb3RpZnlDb250ZW50Q2hhbmdlSWZOZWVkZWQoKTsK ICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFdmVudDo6Q29udGVudFZpc2liaWxpdHlDaGFuZ2Vk OgogICAgICAgICBzZXRIYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKTsKKyAgICAgICAgLy8gUmVtb3Zl IHBlbmRpbmcgYWN0aXZpdGllcy4gV2UgZG9uJ3QgbmVlZCB0byBvYnNlcnZlIHRoZW0gYW55bW9y ZS4KKyAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhmYWxzZSk7CisgICAg ICAgIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAppbmRl eCA3MTI2MDNiMzJiMGI3ZDJmM2Q2YTBiZWI2YWQwZDQxNGJjMmU5ZTNmLi41MjM0YTliNWQwNmY0 YWE4MjMzNzNiZTk0ZjQ2NTYzZDk1ZmUzMTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApAQCAtMTE5LDcgKzExOSw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGJvb2wpOwogICAgIGJv b2wgaXNXYWl0aW5nRm9yU3R5bGVSZWNhbGMoKSBjb25zdCB7IHJldHVybiBtX2lzV2FpdGluZ0Zv clN0eWxlUmVjYWxjOyB9CiAKLSAgICBib29sIGlzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKSBj b25zdCB7IHJldHVybiBtX21vdXNlTW92ZWRFdmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fdG91 Y2hFdmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fZG9tVGltZXJJc0JlaW5nRXhlY3V0ZWQgfHwg bV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVjdXRlZCB8fCBtX2NvbnRlbnRPYnNlcnZhdGlvblRpbWVy LmlzQWN0aXZlKCk7IH0KKyAgICBib29sIGlzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKSBjb25z dCB7IHJldHVybiBtX21vdXNlTW92ZWRFdmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fdG91Y2hF dmVudElzQmVpbmdEaXNwYXRjaGVkIHx8IG1fb2JzZXJ2ZWREb21UaW1lcklzQmVpbmdFeGVjdXRl ZCB8fCBtX2lzSW5PYnNlcnZlZFN0eWxlUmVjYWxjIHx8IG1fY29udGVudE9ic2VydmF0aW9uVGlt ZXIuaXNBY3RpdmUoKTsgfQogCiAgICAgdm9pZCBjYW5jZWxQZW5kaW5nQWN0aXZpdGllcygpOwog CkBAIC0xMzEsNyArMTMxLDggQEAgcHJpdmF0ZToKICAgICBib29sIGhhc09ic2VydmVkRE9NVGlt ZXIoKSBjb25zdCB7IHJldHVybiAhbV9ET01UaW1lckxpc3QuaXNFbXB0eSgpOyB9CiAgICAgYm9v bCBoYXNEZXRlcm1pbmF0ZVN0YXRlKCkgY29uc3Q7CiAKLSAgICBib29sIGhhc1BlbmRpbmdBY3Rp dml0eSgpIGNvbnN0IHsgcmV0dXJuIGhhc09ic2VydmVkRE9NVGltZXIoKSB8fCBtX2RvY3VtZW50 Lmhhc1BlbmRpbmdTdHlsZVJlY2FsYygpIHx8IG1fY29udGVudE9ic2VydmF0aW9uVGltZXIuaXNB Y3RpdmUoKTsgfQorICAgIGJvb2wgaGFzUGVuZGluZ0FjdGl2aXR5KCkgY29uc3QgeyByZXR1cm4g aGFzT2JzZXJ2ZWRET01UaW1lcigpIHx8IG1fZG9jdW1lbnQuaGFzUGVuZGluZ1N0eWxlUmVjYWxj KCkgfHwgaXNPYnNlcnZhdGlvblRpbWVXaW5kb3dBY3RpdmUoKTsgfQorICAgIGJvb2wgaXNPYnNl cnZhdGlvblRpbWVXaW5kb3dBY3RpdmUoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRPYnNlcnZh dGlvblRpbWVyLmlzQWN0aXZlKCk7IH0KICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgYm9vbCBp c05vdGlmeUNvbnRlbnRDaGFuZ2VBbGxvd2VkKCkgY29uc3Q7CiAjZW5kaWYKQEAgLTE2MCw5ICsx NjEsOSBAQCBwcml2YXRlOgogICAgIEhhc2hTZXQ8Y29uc3QgRE9NVGltZXIqPiBtX0RPTVRpbWVy TGlzdDsKICAgICBib29sIG1fdG91Y2hFdmVudElzQmVpbmdEaXNwYXRjaGVkIHsgZmFsc2UgfTsK ICAgICBib29sIG1faXNXYWl0aW5nRm9yU3R5bGVSZWNhbGMgeyBmYWxzZSB9OwotICAgIGJvb2wg bV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVjdXRlZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzSW5P YnNlcnZlZFN0eWxlUmVjYWxjIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNPYnNlcnZpbmdET01U aW1lclNjaGVkdWxpbmcgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9kb21UaW1lcklzQmVpbmdFeGVj dXRlZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX29ic2VydmVkRG9tVGltZXJJc0JlaW5nRXhlY3V0 ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc01vdXNlTW92ZWRQcmVjZWRlZEJ5VG91Y2ggeyBm YWxzZSB9OwogICAgIGJvb2wgbV9tb3VzZU1vdmVkRXZlbnRJc0JlaW5nRGlzcGF0Y2hlZCB7IGZh bHNlIH07CiB9Owo=