218874 2020-11-12 15:33:53 -0800 Removed DeferrableTaskTimer 2022-02-27 23:59:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ggaren ggaren cdumez eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1707046 0 ggaren 2020-11-12 15:33:53 -0800 Removed DeferrableTaskTimer 1707280 1 414054 ggaren 2020-11-13 09:39:49 -0800 Created attachment 414054 Patch 1707316 2 414054 cdumez 2020-11-13 10:59:29 -0800 Comment on attachment 414054 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414054&action=review > Source/WebCore/platform/Timer.h:112 > + static void startOneShot(Seconds interval, WTF::Function<void()>&& function) Maybe it's just me but I preferred the previous order: Lambda first and then the delay. BTW, seems weird to call this interval instead of delay given that it is one shot. The reason for my preference is that it would be consistent with window.setTimeout(() => { }, 100); Finally, I wish we could find a better name for this function than startOneShot() given that it is a static. Maybe something like Timer::doAfter() or runAfter() (similarly to dispatch_after()). > Source/WebKit/ChangeLog:12 > + * UIProcess/WebPageProxy.h: Use WTF::RunLoop::Timer instead of Good catch. > Source/WebKit/UIProcess/WebPageProxy.h:2758 > + WTF::RunLoop::Timer<WebPageProxy> m_updateReportedMediaCaptureStateTimer; Why WTF:: ? 1707322 3 ggaren 2020-11-13 11:16:20 -0800 > > Source/WebCore/platform/Timer.h:112 > > + static void startOneShot(Seconds interval, WTF::Function<void()>&& function) > > Maybe it's just me but I preferred the previous order: Lambda first and then > the delay. BTW, seems weird to call this interval instead of delay given > that it is one shot. > > The reason for my preference is that it would be consistent with > window.setTimeout(() => { }, 100); For the order, my thinking was that Cocoa APIs have the habit of putting the lambda last, and the reasoning is that it reads better because a lambda is a disruptive amount of text that makes it hard to see what comes after. What do you think of that? > Finally, I wish we could find a better name for this function than > startOneShot() given that it is a static. Maybe something like > Timer::doAfter() or runAfter() (similarly to dispatch_after()). How about schedule()? > > Source/WebKit/UIProcess/WebPageProxy.h:2758 > > + WTF::RunLoop::Timer<WebPageProxy> m_updateReportedMediaCaptureStateTimer; > > Why WTF:: ? Will fix. 1707328 4 cdumez 2020-11-13 11:32:56 -0800 (In reply to Geoffrey Garen from comment #3) > > > Source/WebCore/platform/Timer.h:112 > > > + static void startOneShot(Seconds interval, WTF::Function<void()>&& function) > > > > Maybe it's just me but I preferred the previous order: Lambda first and then > > the delay. BTW, seems weird to call this interval instead of delay given > > that it is one shot. > > > > The reason for my preference is that it would be consistent with > > window.setTimeout(() => { }, 100); > > For the order, my thinking was that Cocoa APIs have the habit of putting the > lambda last, and the reasoning is that it reads better because a lambda is a > disruptive amount of text that makes it hard to see what comes after. > > What do you think of that? Not a big deal either way. It is true that dispatch_after() takes delay first and lambda last. > > > Finally, I wish we could find a better name for this function than > > startOneShot() given that it is a static. Maybe something like > > Timer::doAfter() or runAfter() (similarly to dispatch_after()). > > How about schedule()? Sure, schedule() would be better IMO. > > > > Source/WebKit/UIProcess/WebPageProxy.h:2758 > > > + WTF::RunLoop::Timer<WebPageProxy> m_updateReportedMediaCaptureStateTimer; > > > > Why WTF:: ? > > Will fix. 1707371 5 414087 ggaren 2020-11-13 13:30:33 -0800 Created attachment 414087 Patch for landing 1707394 6 ews-feeder 2020-11-13 14:39:17 -0800 Committed r269802: <https://trac.webkit.org/changeset/269802> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414087. 1707396 7 webkit-bug-importer 2020-11-13 14:40:22 -0800 <rdar://problem/71386106> 414054 2020-11-13 09:39:49 -0800 2022-02-27 23:59:22 -0800 Patch bug-218874-20201113093948.patch text/plain 8307 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2OTc0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTExLTEyICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlZCBEZWZlcnJhYmxl VGFza1RpbWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTg4NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJdCB3YXMgKG1vc3RseSkgcmVkdW5kYW50LgorCisgICAgICAgICogcGxhdGZvcm0vVGltZXIu aDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVyOjpzdGFydE9uZVNob3QpOiBUaGlzIGhlbHBlciBm dW5jdGlvbiBkb2VzIHRoZSBzYW1lIGpvYgorICAgICAgICB0aGF0IERlZmVycmFibGVUYXNrVGlt ZXIgdXNlZCB0byBkby4KKworICAgICAgICAoV2ViQ29yZTo6RGVmZXJyYWJsZVRhc2tUaW1lcjo6 ZmlyZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVmZXJyYWJsZVRhc2tUaW1lcjo6 ZG9UYXNrKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRlZmVycmFibGVUYXNrVGltZXI6 OmNhbmNlbCk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXJlY29yZGVyL01l ZGlhUmVjb3JkZXJQcml2YXRlTW9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVJlY29y ZGVyUHJpdmF0ZU1vY2s6OmZldGNoRGF0YSk6IFVzZSB0aGUgbmV3IGhlbHBlciBmdW5jdGlvbi4K KworICAgICAgICAqIHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlclByaXZhdGVN b2NrLmg6CisKIDIwMjAtMTEtMTIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgog CiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBWaXNpYmxlUG9zaXRpb246OmFic29sdXRlU2Vs ZWN0aW9uQm91bmRzRm9yTGluZSBzaG91bGQgdXNlIGl0ZXJhdG9yCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9UaW1lci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1RpbWVyLmgJKHJldmlzaW9uIDI2OTc0NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1RpbWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwOSw2ICsxMDksMTYgQEAgcHJpdmF0ZToKIGNs YXNzIFRpbWVyIDogcHVibGljIFRpbWVyQmFzZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7CiBwdWJsaWM6CisgICAgc3RhdGljIHZvaWQgc3RhcnRPbmVTaG90KFNlY29uZHMgaW50ZXJ2 YWwsIFdURjo6RnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uKQorICAgIHsKKyAgICAgICAgYXV0 byogdGltZXIgPSBuZXcgVGltZXIoW10geyB9KTsKKyAgICAgICAgdGltZXItPm1fZnVuY3Rpb24g PSBbdGltZXIsIGZ1bmN0aW9uID0gV1RGTW92ZShmdW5jdGlvbildIHsKKyAgICAgICAgICAgIGZ1 bmN0aW9uKCk7CisgICAgICAgICAgICBkZWxldGUgdGltZXI7CisgICAgICAgIH07CisgICAgICAg IHRpbWVyLT5zdGFydE9uZVNob3QoaW50ZXJ2YWwpOworICAgIH0KKwogICAgIHRlbXBsYXRlIDx0 eXBlbmFtZSBUaW1lckZpcmVkQ2xhc3MsIHR5cGVuYW1lIFRpbWVyRmlyZWRCYXNlQ2xhc3M+CiAg ICAgVGltZXIoVGltZXJGaXJlZENsYXNzJiBvYmplY3QsIHZvaWQgKFRpbWVyRmlyZWRCYXNlQ2xh c3M6OipmdW5jdGlvbikoKSkKICAgICAgICAgOiBtX2Z1bmN0aW9uKHN0ZDo6YmluZChmdW5jdGlv biwgJm9iamVjdCkpCkBAIC0xMjAsNiArMTMwLDggQEAgcHVibGljOgogICAgIHsKICAgICB9CiAK KyAgICB1c2luZyBUaW1lckJhc2U6OnN0YXJ0T25lU2hvdDsKKwogcHJpdmF0ZToKICAgICB2b2lk IGZpcmVkKCkgb3ZlcnJpZGUKICAgICB7CkBAIC0xNDksNyArMTYxLDcgQEAgcHVibGljOgogICAg IHsKICAgICB9CiAKLSAgICBEZWZlcnJhYmxlT25lU2hvdFRpbWVyKFdURjo6RnVuY3Rpb248dm9p ZCAoKT4mJiBmdW5jdGlvbiwgU2Vjb25kcyBkZWxheSkKKyAgICBEZWZlcnJhYmxlT25lU2hvdFRp bWVyKFdURjo6RnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uLCBTZWNvbmRzIGRlbGF5KQogICAg ICAgICA6IG1fZnVuY3Rpb24oV1RGTW92ZShmdW5jdGlvbikpCiAgICAgICAgICwgbV9kZWxheShk ZWxheSkKICAgICAgICAgLCBtX3Nob3VsZFJlc3RhcnRXaGVuVGltZXJGaXJlcyhmYWxzZSkKQEAg LTE5NSwzOCArMjA3LDQgQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2hvdWxkUmVzdGFydFdoZW5U aW1lckZpcmVzOwogfTsKIAotY2xhc3MgRGVmZXJyYWJsZVRhc2tUaW1lciBmaW5hbCA6IHByaXZh dGUgVGltZXJCYXNlIHsKLSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAg ICBEZWZlcnJhYmxlVGFza1RpbWVyKCkgPSBkZWZhdWx0OwotCi0gICAgdm9pZCBkb1Rhc2soRnVu Y3Rpb248dm9pZCgpPiYmLCBTZWNvbmRzKTsKLSAgICB2b2lkIGNhbmNlbCgpOwotICAgIGJvb2wg aXNBY3RpdmUoKSBjb25zdCB7IHJldHVybiBUaW1lckJhc2U6OmlzQWN0aXZlKCk7IH0KLQotcHJp dmF0ZToKLSAgICB2b2lkIGZpcmVkKCkgZmluYWw7Ci0KLSAgICBGdW5jdGlvbjx2b2lkKCk+IG1f ZnVuY3Rpb247Ci19OwotCi1pbmxpbmUgdm9pZCBEZWZlcnJhYmxlVGFza1RpbWVyOjpmaXJlZCgp Ci17Ci0gICAgc3RkOjpleGNoYW5nZShtX2Z1bmN0aW9uLCB7IH0pKCk7Ci19Ci0KLWlubGluZSB2 b2lkIERlZmVycmFibGVUYXNrVGltZXI6OmRvVGFzayhGdW5jdGlvbjx2b2lkKCk+JiYgZnVuY3Rp b24sIFNlY29uZHMgZGVsYXkpCi17Ci0gICAgQVNTRVJUKCFpc0FjdGl2ZSgpKTsKLSAgICBBU1NF UlQoIW1fZnVuY3Rpb24pOwotICAgIG1fZnVuY3Rpb24gPSBXVEZNb3ZlKGZ1bmN0aW9uKTsKLSAg ICBzdGFydE9uZVNob3QoZGVsYXkpOwotfQotCi1pbmxpbmUgdm9pZCBEZWZlcnJhYmxlVGFza1Rp bWVyOjpjYW5jZWwoKQotewotICAgIHN0ZDo6ZXhjaGFuZ2UobV9mdW5jdGlvbiwgeyB9KTsKLSAg ICBzdG9wKCk7Ci19Ci0KIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVj b3JkZXIvTWVkaWFSZWNvcmRlclByaXZhdGVNb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXJQcml2YXRlTW9jay5j cHAJKHJldmlzaW9uIDI2OTc0NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhcmVj b3JkZXIvTWVkaWFSZWNvcmRlclByaXZhdGVNb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAx LDkgKzEwMSw5IEBAIHZvaWQgTWVkaWFSZWNvcmRlclByaXZhdGVNb2NrOjpmZXRjaERhdGEKICAg ICB9CiAKICAgICAvLyBEZWxheSBjYWxsaW5nIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIgYSBiaXQg dG8gbWltaWNrIHJlYWwgd3JpdGVyIGJlaGF2aW9yLgotICAgIG1fZGVsYXlDb21wbGV0aW5nVGlt ZXIuZG9UYXNrKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp LCBidWZmZXIgPSBXVEZNb3ZlKGJ1ZmZlciksIG1pbWVUeXBlID0gbWltZVR5cGUoKSwgdGltZUNv ZGUgPSBNb25vdG9uaWNUaW1lOjpub3coKS5zZWNvbmRzU2luY2VFcG9jaCgpLnZhbHVlKCldKCkg bXV0YWJsZSB7CisgICAgVGltZXI6OnN0YXJ0T25lU2hvdCg1MF9tcywgW2NvbXBsZXRpb25IYW5k bGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGJ1ZmZlciA9IFdURk1vdmUoYnVmZmVy KSwgbWltZVR5cGUgPSBtaW1lVHlwZSgpLCB0aW1lQ29kZSA9IE1vbm90b25pY1RpbWU6Om5vdygp LnNlY29uZHNTaW5jZUVwb2NoKCkudmFsdWUoKV0oKSBtdXRhYmxlIHsKICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShidWZmZXIpLCBtaW1lVHlwZSwgdGltZUNvZGUpOwotICAgIH0s IDUwX21zKTsKKyAgICB9KTsKIH0KIAogY29uc3QgU3RyaW5nJiBNZWRpYVJlY29yZGVyUHJpdmF0 ZU1vY2s6Om1pbWVUeXBlKCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlclByaXZhdGVNb2NrLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyUHJpdmF0ZU1v Y2suaAkocmV2aXNpb24gMjY5NzQ3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFy ZWNvcmRlci9NZWRpYVJlY29yZGVyUHJpdmF0ZU1vY2suaAkod29ya2luZyBjb3B5KQpAQCAtMzIs NyArMzIsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIERlZmVycmFibGVUYXNr VGltZXI7CiBjbGFzcyBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTsKIAogY2xhc3MgV0VCQ09SRV9F WFBPUlQgTWVkaWFSZWNvcmRlclByaXZhdGVNb2NrIGZpbmFsCkBAIC01OCw3ICs1Nyw2IEBAIHBy aXZhdGU6CiAgICAgdW5zaWduZWQgbV9jb3VudGVyIHsgMCB9OwogICAgIFN0cmluZyBtX2F1ZGlv VHJhY2tJRDsKICAgICBTdHJpbmcgbV92aWRlb1RyYWNrSUQ7Ci0gICAgRGVmZXJyYWJsZVRhc2tU aW1lciBtX2RlbGF5Q29tcGxldGluZ1RpbWVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2OTc1NykKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMTEtMTIgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmVkIERlZmVycmFibGVU YXNrVGltZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxODg3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEl0IHdhcyAobW9zdGx5KSByZWR1bmRhbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp1cGRhdGVSZXBvcnRl ZE1lZGlhQ2FwdHVyZVN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6 IFVzZSBXVEY6OlJ1bkxvb3A6OlRpbWVyIGluc3RlYWQgb2YKKyAgICAgICAgV2ViQ29yZTo6VGlt ZXIgYmVjYXVzZSBXZWJDb3JlOjpUaW1lciBmb3IgV2ViS2l0IGNvZGUgaW4gdGhlIFVJIHByb2Nl c3MKKyAgICAgICAgaXMgYSBuby1ubywgd2hpY2ggY2FuIGNyYXNoIGlmIHRoZSBVSSBwcm9jZXNz IGFsc28gdXNlcyBXZWJUaHJlYWQuCisKIDIwMjAtMTEtMTIgIFNhaWQgQWJvdS1IYWxsYXdhICA8 c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBHcmFwaGljc0NvbnRleHQ6 OmRyYXdQYXR0ZXJuKCkgc2hvdWxkIHRha2UgYSBOYXRpdmVJbWFnZSBhcmd1bWVudApJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyNjk3NDcp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01MDksNiArNTA5LDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFnZUNs aWVudCYgcAogICAgICwgbV9pc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChUZXh0Q2hlY2tlcjo6 aXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKSkKICNlbmRpZgogICAgICwgbV9wYWdlTG9hZFN0 YXRlKCp0aGlzKQorICAgICwgbV91cGRhdGVSZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlVGltZXIo UnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmV2ViUGFnZVByb3h5Ojp1cGRhdGVSZXBvcnRlZE1lZGlh Q2FwdHVyZVN0YXRlKQogICAgICwgbV9pbnNwZWN0b3JDb250cm9sbGVyKG1ha2VVbmlxdWU8V2Vi UGFnZUluc3BlY3RvckNvbnRyb2xsZXI+KCp0aGlzKSkKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BF Q1RPUikKICAgICAsIG1faW5zcGVjdG9yRGVidWdnYWJsZShtYWtlVW5pcXVlPFdlYlBhZ2VEZWJ1 Z2dhYmxlPigqdGhpcykpCkBAIC05MDUyLDE0ICs5MDUzLDExIEBAIHZvaWQgV2ViUGFnZVByb3h5 Ojp1cGRhdGVSZXBvcnRlZE1lZGlhQ2EKICAgICBib29sIGhhdmVSZXBvcnRlZENhcHR1cmUgPSBt X3JlcG9ydGVkTWVkaWFDYXB0dXJlU3RhdGUgJiBNZWRpYVByb2R1Y2VyOjpNZWRpYUNhcHR1cmVN YXNrOwogICAgIGJvb2wgd2lsbFJlcG9ydENhcHR1cmUgPSBhY3RpdmVDYXB0dXJlU3RhdGU7CiAK LSAgICBpZiAoaGF2ZVJlcG9ydGVkQ2FwdHVyZSAmJiAhd2lsbFJlcG9ydENhcHR1cmUgJiYgbV9k ZWxheVN0b3BDYXB0dXJpbmdSZXBvcnRpbmdUaW1lci5pc0FjdGl2ZSgpKQorICAgIGlmIChoYXZl UmVwb3J0ZWRDYXB0dXJlICYmICF3aWxsUmVwb3J0Q2FwdHVyZSAmJiBtX3VwZGF0ZVJlcG9ydGVk TWVkaWFDYXB0dXJlU3RhdGVUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAg ICBpZiAoIWhhdmVSZXBvcnRlZENhcHR1cmUgJiYgd2lsbFJlcG9ydENhcHR1cmUpIHsKLSAgICAg ICAgbV9kZWxheVN0b3BDYXB0dXJpbmdSZXBvcnRpbmdUaW1lci5kb1Rhc2soW3RoaXNdIHsKLSAg ICAgICAgICAgIHVwZGF0ZVJlcG9ydGVkTWVkaWFDYXB0dXJlU3RhdGUoKTsKLSAgICAgICAgfSwg bV9tZWRpYUNhcHR1cmVSZXBvcnRpbmdEZWxheSk7Ci0gICAgfQorICAgIGlmICghaGF2ZVJlcG9y dGVkQ2FwdHVyZSAmJiB3aWxsUmVwb3J0Q2FwdHVyZSkKKyAgICAgICAgbV91cGRhdGVSZXBvcnRl ZE1lZGlhQ2FwdHVyZVN0YXRlVGltZXIuc3RhcnRPbmVTaG90KG1fbWVkaWFDYXB0dXJlUmVwb3J0 aW5nRGVsYXkpOwogCiAgICAgbV9yZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlID0gYWN0aXZlQ2Fw dHVyZVN0YXRlOwogICAgIG1fdWlDbGllbnQtPm1lZGlhQ2FwdHVyZVN0YXRlRGlkQ2hhbmdlKG1f bWVkaWFTdGF0ZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAko cmV2aXNpb24gMjY5NzQ3KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3NTUsNyArMjc1NSw3IEBAIHByaXZhdGU6CiAKICAgICAv LyBUbyBtYWtlIHN1cmUgY2FwdHVyZSBpbmRpY2F0b3JzIGFyZSB2aXNpYmxlIGxvbmcgZW5vdWdo LCBtX3JlcG9ydGVkTWVkaWFDYXB0dXJlU3RhdGUgaXMgdGhlIHNhbWUgYXMgbV9tZWRpYVN0YXRl IGV4Y2VwdCB0aGF0IHdlIG1pZ2h0IGRlbGF5IGEgYml0IHRyYW5zaXRpb24gZnJvbSBjYXB0dXJp bmcgdG8gbm90LWNhcHR1cmluZy4KICAgICBXZWJDb3JlOjpNZWRpYVByb2R1Y2VyOjpNZWRpYVN0 YXRlRmxhZ3MgbV9yZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlIHsgV2ViQ29yZTo6TWVkaWFQcm9k dWNlcjo6SXNOb3RQbGF5aW5nIH07Ci0gICAgV2ViQ29yZTo6RGVmZXJyYWJsZVRhc2tUaW1lciBt X2RlbGF5U3RvcENhcHR1cmluZ1JlcG9ydGluZ1RpbWVyOworICAgIFdURjo6UnVuTG9vcDo6VGlt ZXI8V2ViUGFnZVByb3h5PiBtX3VwZGF0ZVJlcG9ydGVkTWVkaWFDYXB0dXJlU3RhdGVUaW1lcjsK ICAgICBzdGF0aWMgY29uc3RleHByIFNlY29uZHMgRGVmYXVsdE1lZGlhQ2FwdHVyZVJlcG9ydGlu Z0RlbGF5IHsgM19zIH07CiAgICAgU2Vjb25kcyBtX21lZGlhQ2FwdHVyZVJlcG9ydGluZ0RlbGF5 IHsgRGVmYXVsdE1lZGlhQ2FwdHVyZVJlcG9ydGluZ0RlbGF5IH07CiAK 414087 2020-11-13 13:30:33 -0800 2020-11-13 14:39:18 -0800 Patch for landing bug-218874-20201113133032.patch text/plain 8650 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2OTc0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIwLTExLTEzICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlZCBEZWZlcnJhYmxl VGFza1RpbWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTg4NzQKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBJ dCB3YXMgKG1vc3RseSkgcmVkdW5kYW50LgorCisgICAgICAgICogcGxhdGZvcm0vVGltZXIuaDoK KyAgICAgICAgKFdlYkNvcmU6OlRpbWVyOjpzY2hlZHVsZSk6IFRoaXMgaGVscGVyIGZ1bmN0aW9u IGRvZXMgdGhlIHNhbWUgam9iCisgICAgICAgIHRoYXQgRGVmZXJyYWJsZVRhc2tUaW1lciB1c2Vk IHRvIGRvLgorCisgICAgICAgIChXZWJDb3JlOjpEZWZlcnJhYmxlVGFza1RpbWVyOjpmaXJlZCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpEZWZlcnJhYmxlVGFza1RpbWVyOjpkb1Rhc2sp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVmZXJyYWJsZVRhc2tUaW1lcjo6Y2FuY2Vs KTogRGVsZXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhcmVjb3JkZXIvTWVkaWFSZWNv cmRlclByaXZhdGVNb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUmVjb3JkZXJQcml2 YXRlTW9jazo6ZmV0Y2hEYXRhKTogVXNlIHRoZSBuZXcgaGVscGVyIGZ1bmN0aW9uLgorCisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyUHJpdmF0ZU1vY2suaDog Tm8gbmVlZCBmb3IgYSBkYXRhCisgICAgICAgIG1lbWJlciBhbnltb3JlIHNpbmNlIHdlIGNhbiB1 c2UgdGhlIHNjaGVkdWxlKCkgY29udmVuaWVuY2UgZnVuY3Rpb24gaW5zdGVhZC4KKwogMjAyMC0x MS0xMiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11b SW50ZWdyYXRpb25dIFZpc2libGVQb3NpdGlvbjo6YWJzb2x1dGVTZWxlY3Rpb25Cb3VuZHNGb3JM aW5lIHNob3VsZCB1c2UgaXRlcmF0b3IKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Rp bWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGltZXIuaAkocmV2 aXNpb24gMjY5NzQ3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVGltZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBzdGFydChTZWNvbmRzIG5leHRGaXJlSW50ZXJ2YWwsIFNlY29uZHMgcmVwZWF0SW50ZXJ2YWwp OwogCiAgICAgdm9pZCBzdGFydFJlcGVhdGluZyhTZWNvbmRzIHJlcGVhdEludGVydmFsKSB7IHN0 YXJ0KHJlcGVhdEludGVydmFsLCByZXBlYXRJbnRlcnZhbCk7IH0KLSAgICB2b2lkIHN0YXJ0T25l U2hvdChTZWNvbmRzIGludGVydmFsKSB7IHN0YXJ0KGludGVydmFsLCAwX3MpOyB9CisgICAgdm9p ZCBzdGFydE9uZVNob3QoU2Vjb25kcyBkZWxheSkgeyBzdGFydChkZWxheSwgMF9zKTsgfQogCiAg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdG9wKCk7CiAgICAgYm9vbCBpc0FjdGl2ZSgpIGNvbnN0 OwpAQCAtMTA5LDYgKzEwOSwxNiBAQCBwcml2YXRlOgogY2xhc3MgVGltZXIgOiBwdWJsaWMgVGlt ZXJCYXNlIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKKyAgICBzdGF0 aWMgdm9pZCBzY2hlZHVsZShTZWNvbmRzIGRlbGF5LCBXVEY6OkZ1bmN0aW9uPHZvaWQoKT4mJiBm dW5jdGlvbikKKyAgICB7CisgICAgICAgIGF1dG8qIHRpbWVyID0gbmV3IFRpbWVyKFtdIHsgfSk7 CisgICAgICAgIHRpbWVyLT5tX2Z1bmN0aW9uID0gW3RpbWVyLCBmdW5jdGlvbiA9IFdURk1vdmUo ZnVuY3Rpb24pXSB7CisgICAgICAgICAgICBmdW5jdGlvbigpOworICAgICAgICAgICAgZGVsZXRl IHRpbWVyOworICAgICAgICB9OworICAgICAgICB0aW1lci0+c3RhcnRPbmVTaG90KGRlbGF5KTsK KyAgICB9CisKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVGltZXJGaXJlZENsYXNzLCB0eXBlbmFt ZSBUaW1lckZpcmVkQmFzZUNsYXNzPgogICAgIFRpbWVyKFRpbWVyRmlyZWRDbGFzcyYgb2JqZWN0 LCB2b2lkIChUaW1lckZpcmVkQmFzZUNsYXNzOjoqZnVuY3Rpb24pKCkpCiAgICAgICAgIDogbV9m dW5jdGlvbihzdGQ6OmJpbmQoZnVuY3Rpb24sICZvYmplY3QpKQpAQCAtMTQ5LDcgKzE1OSw3IEBA IHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0gICAgRGVmZXJyYWJsZU9uZVNob3RUaW1lcihXVEY6 OkZ1bmN0aW9uPHZvaWQgKCk+JiYgZnVuY3Rpb24sIFNlY29uZHMgZGVsYXkpCisgICAgRGVmZXJy YWJsZU9uZVNob3RUaW1lcihXVEY6OkZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbiwgU2Vjb25k cyBkZWxheSkKICAgICAgICAgOiBtX2Z1bmN0aW9uKFdURk1vdmUoZnVuY3Rpb24pKQogICAgICAg ICAsIG1fZGVsYXkoZGVsYXkpCiAgICAgICAgICwgbV9zaG91bGRSZXN0YXJ0V2hlblRpbWVyRmly ZXMoZmFsc2UpCkBAIC0xOTUsMzggKzIwNSw0IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3Nob3Vs ZFJlc3RhcnRXaGVuVGltZXJGaXJlczsKIH07CiAKLWNsYXNzIERlZmVycmFibGVUYXNrVGltZXIg ZmluYWwgOiBwcml2YXRlIFRpbWVyQmFzZSB7Ci0gICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7 Ci1wdWJsaWM6Ci0gICAgRGVmZXJyYWJsZVRhc2tUaW1lcigpID0gZGVmYXVsdDsKLQotICAgIHZv aWQgZG9UYXNrKEZ1bmN0aW9uPHZvaWQoKT4mJiwgU2Vjb25kcyk7Ci0gICAgdm9pZCBjYW5jZWwo KTsKLSAgICBib29sIGlzQWN0aXZlKCkgY29uc3QgeyByZXR1cm4gVGltZXJCYXNlOjppc0FjdGl2 ZSgpOyB9Ci0KLXByaXZhdGU6Ci0gICAgdm9pZCBmaXJlZCgpIGZpbmFsOwotCi0gICAgRnVuY3Rp b248dm9pZCgpPiBtX2Z1bmN0aW9uOwotfTsKLQotaW5saW5lIHZvaWQgRGVmZXJyYWJsZVRhc2tU aW1lcjo6ZmlyZWQoKQotewotICAgIHN0ZDo6ZXhjaGFuZ2UobV9mdW5jdGlvbiwgeyB9KSgpOwot fQotCi1pbmxpbmUgdm9pZCBEZWZlcnJhYmxlVGFza1RpbWVyOjpkb1Rhc2soRnVuY3Rpb248dm9p ZCgpPiYmIGZ1bmN0aW9uLCBTZWNvbmRzIGRlbGF5KQotewotICAgIEFTU0VSVCghaXNBY3RpdmUo KSk7Ci0gICAgQVNTRVJUKCFtX2Z1bmN0aW9uKTsKLSAgICBtX2Z1bmN0aW9uID0gV1RGTW92ZShm dW5jdGlvbik7Ci0gICAgc3RhcnRPbmVTaG90KGRlbGF5KTsKLX0KLQotaW5saW5lIHZvaWQgRGVm ZXJyYWJsZVRhc2tUaW1lcjo6Y2FuY2VsKCkKLXsKLSAgICBzdGQ6OmV4Y2hhbmdlKG1fZnVuY3Rp b24sIHsgfSk7Ci0gICAgc3RvcCgpOwotfQotCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXJQcml2YXRlTW9jay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVy UHJpdmF0ZU1vY2suY3BwCShyZXZpc2lvbiAyNjk3NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXJQcml2YXRlTW9jay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEwMSw5ICsxMDEsOSBAQCB2b2lkIE1lZGlhUmVjb3JkZXJQcml2YXRlTW9jazo6 ZmV0Y2hEYXRhCiAgICAgfQogCiAgICAgLy8gRGVsYXkgY2FsbGluZyB0aGUgY29tcGxldGlvbiBo YW5kbGVyIGEgYml0IHRvIG1pbWljayByZWFsIHdyaXRlciBiZWhhdmlvci4KLSAgICBtX2RlbGF5 Q29tcGxldGluZ1RpbWVyLmRvVGFzayhbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKSwgYnVmZmVyID0gV1RGTW92ZShidWZmZXIpLCBtaW1lVHlwZSA9IG1pbWVU eXBlKCksIHRpbWVDb2RlID0gTW9ub3RvbmljVGltZTo6bm93KCkuc2Vjb25kc1NpbmNlRXBvY2go KS52YWx1ZSgpXSgpIG11dGFibGUgeworICAgIFRpbWVyOjpzY2hlZHVsZSg1MF9tcywgW2NvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGJ1ZmZlciA9IFdURk1v dmUoYnVmZmVyKSwgbWltZVR5cGUgPSBtaW1lVHlwZSgpLCB0aW1lQ29kZSA9IE1vbm90b25pY1Rp bWU6Om5vdygpLnNlY29uZHNTaW5jZUVwb2NoKCkudmFsdWUoKV0oKSBtdXRhYmxlIHsKICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShidWZmZXIpLCBtaW1lVHlwZSwgdGltZUNvZGUp OwotICAgIH0sIDUwX21zKTsKKyAgICB9KTsKIH0KIAogY29uc3QgU3RyaW5nJiBNZWRpYVJlY29y ZGVyUHJpdmF0ZU1vY2s6Om1pbWVUeXBlKCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlclByaXZhdGVNb2NrLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVy UHJpdmF0ZU1vY2suaAkocmV2aXNpb24gMjY5NzQ3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyUHJpdmF0ZU1vY2suaAkod29ya2luZyBjb3B5 KQpAQCAtMzIsNyArMzIsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIERlZmVy cmFibGVUYXNrVGltZXI7CiBjbGFzcyBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTsKIAogY2xhc3Mg V0VCQ09SRV9FWFBPUlQgTWVkaWFSZWNvcmRlclByaXZhdGVNb2NrIGZpbmFsCkBAIC01OCw3ICs1 Nyw2IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9jb3VudGVyIHsgMCB9OwogICAgIFN0cmlu ZyBtX2F1ZGlvVHJhY2tJRDsKICAgICBTdHJpbmcgbV92aWRlb1RyYWNrSUQ7Ci0gICAgRGVmZXJy YWJsZVRhc2tUaW1lciBtX2RlbGF5Q29tcGxldGluZ1RpbWVyOwogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2OTc1NykKKysrIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMTEtMTMg IEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmVkIERl ZmVycmFibGVUYXNrVGltZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxODg3NAorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisg ICAgICAgIEl0IHdhcyAobW9zdGx5KSByZWR1bmRhbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp1cGRhdGVS ZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lmg6IFVzZSBXVEY6OlJ1bkxvb3A6OlRpbWVyIGluc3RlYWQgb2YKKyAgICAgICAgV2ViQ29y ZTo6VGltZXIgYmVjYXVzZSBXZWJDb3JlOjpUaW1lciBmb3IgV2ViS2l0IGNvZGUgaW4gdGhlIFVJ IHByb2Nlc3MKKyAgICAgICAgaXMgYSBuby1ubywgd2hpY2ggY2FuIGNyYXNoIGlmIHRoZSBVSSBw cm9jZXNzIGFsc28gdXNlcyBXZWJUaHJlYWQuCisKIDIwMjAtMTEtMTIgIFNhaWQgQWJvdS1IYWxs YXdhICA8c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBHcmFwaGljc0Nv bnRleHQ6OmRyYXdQYXR0ZXJuKCkgc2hvdWxkIHRha2UgYSBOYXRpdmVJbWFnZSBhcmd1bWVudApJ bmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAy Njk3NDcpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC01MDksNiArNTA5LDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHko UGFnZUNsaWVudCYgcAogICAgICwgbV9pc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChUZXh0Q2hl Y2tlcjo6aXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKSkKICNlbmRpZgogICAgICwgbV9wYWdl TG9hZFN0YXRlKCp0aGlzKQorICAgICwgbV91cGRhdGVSZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRl VGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmV2ViUGFnZVByb3h5Ojp1cGRhdGVSZXBvcnRl ZE1lZGlhQ2FwdHVyZVN0YXRlKQogICAgICwgbV9pbnNwZWN0b3JDb250cm9sbGVyKG1ha2VVbmlx dWU8V2ViUGFnZUluc3BlY3RvckNvbnRyb2xsZXI+KCp0aGlzKSkKICNpZiBFTkFCTEUoUkVNT1RF X0lOU1BFQ1RPUikKICAgICAsIG1faW5zcGVjdG9yRGVidWdnYWJsZShtYWtlVW5pcXVlPFdlYlBh Z2VEZWJ1Z2dhYmxlPigqdGhpcykpCkBAIC05MDUyLDE0ICs5MDUzLDExIEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojp1cGRhdGVSZXBvcnRlZE1lZGlhQ2EKICAgICBib29sIGhhdmVSZXBvcnRlZENhcHR1 cmUgPSBtX3JlcG9ydGVkTWVkaWFDYXB0dXJlU3RhdGUgJiBNZWRpYVByb2R1Y2VyOjpNZWRpYUNh cHR1cmVNYXNrOwogICAgIGJvb2wgd2lsbFJlcG9ydENhcHR1cmUgPSBhY3RpdmVDYXB0dXJlU3Rh dGU7CiAKLSAgICBpZiAoaGF2ZVJlcG9ydGVkQ2FwdHVyZSAmJiAhd2lsbFJlcG9ydENhcHR1cmUg JiYgbV9kZWxheVN0b3BDYXB0dXJpbmdSZXBvcnRpbmdUaW1lci5pc0FjdGl2ZSgpKQorICAgIGlm IChoYXZlUmVwb3J0ZWRDYXB0dXJlICYmICF3aWxsUmVwb3J0Q2FwdHVyZSAmJiBtX3VwZGF0ZVJl cG9ydGVkTWVkaWFDYXB0dXJlU3RhdGVUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBpZiAoIWhhdmVSZXBvcnRlZENhcHR1cmUgJiYgd2lsbFJlcG9ydENhcHR1cmUpIHsK LSAgICAgICAgbV9kZWxheVN0b3BDYXB0dXJpbmdSZXBvcnRpbmdUaW1lci5kb1Rhc2soW3RoaXNd IHsKLSAgICAgICAgICAgIHVwZGF0ZVJlcG9ydGVkTWVkaWFDYXB0dXJlU3RhdGUoKTsKLSAgICAg ICAgfSwgbV9tZWRpYUNhcHR1cmVSZXBvcnRpbmdEZWxheSk7Ci0gICAgfQorICAgIGlmICghaGF2 ZVJlcG9ydGVkQ2FwdHVyZSAmJiB3aWxsUmVwb3J0Q2FwdHVyZSkKKyAgICAgICAgbV91cGRhdGVS ZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlVGltZXIuc3RhcnRPbmVTaG90KG1fbWVkaWFDYXB0dXJl UmVwb3J0aW5nRGVsYXkpOwogCiAgICAgbV9yZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlID0gYWN0 aXZlQ2FwdHVyZVN0YXRlOwogICAgIG1fdWlDbGllbnQtPm1lZGlhQ2FwdHVyZVN0YXRlRGlkQ2hh bmdlKG1fbWVkaWFTdGF0ZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAkocmV2aXNpb24gMjY5NzQ3KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3NTUsNyArMjc1NSw3IEBAIHByaXZhdGU6CiAK ICAgICAvLyBUbyBtYWtlIHN1cmUgY2FwdHVyZSBpbmRpY2F0b3JzIGFyZSB2aXNpYmxlIGxvbmcg ZW5vdWdoLCBtX3JlcG9ydGVkTWVkaWFDYXB0dXJlU3RhdGUgaXMgdGhlIHNhbWUgYXMgbV9tZWRp YVN0YXRlIGV4Y2VwdCB0aGF0IHdlIG1pZ2h0IGRlbGF5IGEgYml0IHRyYW5zaXRpb24gZnJvbSBj YXB0dXJpbmcgdG8gbm90LWNhcHR1cmluZy4KICAgICBXZWJDb3JlOjpNZWRpYVByb2R1Y2VyOjpN ZWRpYVN0YXRlRmxhZ3MgbV9yZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlIHsgV2ViQ29yZTo6TWVk aWFQcm9kdWNlcjo6SXNOb3RQbGF5aW5nIH07Ci0gICAgV2ViQ29yZTo6RGVmZXJyYWJsZVRhc2tU aW1lciBtX2RlbGF5U3RvcENhcHR1cmluZ1JlcG9ydGluZ1RpbWVyOworICAgIFJ1bkxvb3A6OlRp bWVyPFdlYlBhZ2VQcm94eT4gbV91cGRhdGVSZXBvcnRlZE1lZGlhQ2FwdHVyZVN0YXRlVGltZXI7 CiAgICAgc3RhdGljIGNvbnN0ZXhwciBTZWNvbmRzIERlZmF1bHRNZWRpYUNhcHR1cmVSZXBvcnRp bmdEZWxheSB7IDNfcyB9OwogICAgIFNlY29uZHMgbV9tZWRpYUNhcHR1cmVSZXBvcnRpbmdEZWxh eSB7IERlZmF1bHRNZWRpYUNhcHR1cmVSZXBvcnRpbmdEZWxheSB9OwogCg==