195286 2019-03-04 10:15:53 -0800 [ContentChangeObserver] Decouple mouseMoved event and the "is observing content change" status. 2019-03-04 11:33:14 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1512220 0 zalan 2019-03-04 10:15:53 -0800 This is in preparation for moving to a "time window" based content observation. 1512227 1 363526 zalan 2019-03-04 10:34:45 -0800 Created attachment 363526 Patch 1512229 2 webkit-bug-importer 2019-03-04 10:35:05 -0800 <rdar://problem/48566894> 1512250 3 zalan 2019-03-04 11:33:14 -0800 Committed r242366: <https://trac.webkit.org/changeset/242366> 363526 2019-03-04 10:34:45 -0800 2019-03-04 10:56:52 -0800 Patch bug-195286-20190304103445.patch text/plain 11924 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2VhYmI3NmFjYjIzMDhm MjllZTdjYzNhOTAyMzVkNWZlOTI4NDc1Ni4uNGFkMTI0YWFlMTRmYTE1MzBjYzFkY2NkZmVmOTBj ZDgwNWNhZjFlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE5LTAzLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gRGVjb3VwbGUgbW91c2VNb3ZlZCBldmVudCBhbmQgdGhlICJpcyBvYnNlcnZpbmcgY29u dGVudCBjaGFuZ2UiIHN0YXR1cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5NTI4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vdyBpc09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzIHJldHVybnMgdHJ1ZSBv bmx5IHdoZW4gd2UgYXJlIGFjdGl2ZWx5IG9ic2VydmluZyBjb250ZW50IGNoYW5nZSBkdXJpbmcg dGltZXIgZmlyaW5nIGFuZC9vciBzdHlsZSByZWNhbGN1bGF0aW5nLgorICAgICAgICBUaGlzIHBh dGNoIGFsc28gcmVuYW1lcyBhIGNvdXBsZSBvZiBmdW5jdGlvbnMgdG8gZm9sbG93IHRoZSBkaWRT dGFydC9kaWRGaW5pc2ggcGF0dGVybi4KKworICAgICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFu Z2VPYnNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OmRvbVRpbWVyRXhlY3V0ZURpZFN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlkRmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRTdGFydCk6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0eWxlUmVjYWxjRGlkRmluaXNoKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6bW91c2VNb3ZlZERpZFN0YXJ0 KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6bW91c2VNb3ZlZERp ZEZpbmlzaCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNldFNo b3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENo YW5nZU9ic2VydmVyOjpTdHlsZUNoYW5nZVNjb3BlOjpTdHlsZUNoYW5nZVNjb3BlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6TW91c2VNb3ZlZFNjb3BlOjpNb3Vz ZU1vdmVkU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpN b3VzZU1vdmVkU2NvcGU6On5Nb3VzZU1vdmVkU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29u dGVudENoYW5nZU9ic2VydmVyOjpTdHlsZVJlY2FsY1Njb3BlOjpTdHlsZVJlY2FsY1Njb3BlKToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNTY29w ZTo6flN0eWxlUmVjYWxjU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9i c2VydmVyOjpET01UaW1lclNjb3BlOjpET01UaW1lclNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6RE9NVGltZXJTY29wZTo6fkRPTVRpbWVyU2NvcGUpOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0RP TVRpbWVyRXhlY3V0ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ1N0eWxlUmVj YWxjKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6 c3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdNb3VzZU1vdmVkKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ01v dXNlTW92ZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2Vy dmVyOjpzZXRTaG91bGRPYnNlcnZlU3R5bGVSZWNhbGMpOiBEZWxldGVkLgorICAgICAgICAqIHBh Z2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dENoYW5nZU9ic2VydmVyOjpzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5nKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdET01UaW1l clNjaGVkdWxpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2Vy dmVyOjppc09ic2VydmluZ1N0eWxlUmVjYWxjIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdDb250ZW50Q2hhbmdlcyBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nRE9N VGltZXJTY2hlZHVsaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZyk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNob3VsZE9ic2VydmVTdHls ZVJlY2FsYyBjb25zdCk6IERlbGV0ZWQuCisKIDIwMTktMDMtMDQgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBidWlsZC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwCmluZGV4IDY1 YWU4NThjNWFmOGZmMzExNzk2MmUyM2FlZjlkNGY1MzJmM2FkMDYuLjhiMWNmZTI0NDU3ZjllNDE2 YzhkZmE3ZGNhMmQ5YjY1YzExY2EzZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv aW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9p b3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcApAQCAtNjYsNDYgKzY2LDQ2IEBAIHZvaWQgQ29u dGVudENoYW5nZU9ic2VydmVyOjpkaWRSZW1vdmVET01UaW1lcihjb25zdCBET01UaW1lciYgdGlt ZXIpCiAgICAgbm90aWZ5Q29udGVudENoYW5nZUlmTmVlZGVkKCk7CiB9CiAKLXZvaWQgQ29udGVu dENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZShjb25zdCBET01U aW1lciYgdGltZXIpCit2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRl RGlkU3RhcnQoY29uc3QgRE9NVGltZXImIHRpbWVyKQogewogICAgIGlmICghY29udGFpbnNPYnNl cnZlZERPTVRpbWVyKHRpbWVyKSkKICAgICAgICAgcmV0dXJuOwogICAgIExPR19XSVRIX1NUUkVB TShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAic3RhcnRPYnNlcnZpbmdET01UaW1lckV4 ZWN1dGU6IHN0YXJ0IG9ic2VydmluZyAoIiA8PCAmdGltZXIgPDwgIikgdGltZXIgY2FsbGJhY2su Iik7CiAKLSAgICBtX2lzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMgPSB0cnVlOworICAgIG1fZG9t VGltZXJpc0JlaW5nRXhlY3V0ZWQgPSB0cnVlOwogfQogCi12b2lkIENvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6c3RvcE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZShjb25zdCBET01UaW1lciYgdGltZXIp Cit2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlkRmluaXNoKGNv bnN0IERPTVRpbWVyJiB0aW1lcikKIHsKICAgICBpZiAoIWNvbnRhaW5zT2JzZXJ2ZWRET01UaW1l cih0aW1lcikpCiAgICAgICAgIHJldHVybjsKICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9i c2VydmF0aW9uLCBzdHJlYW0gPDwgInN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6IHN0b3Ag b2JzZXJ2aW5nICgiIDw8ICZ0aW1lciA8PCAiKSB0aW1lciBjYWxsYmFjay4iKTsKIAotICAgIG1f aXNPYnNlcnZpbmdDb250ZW50Q2hhbmdlcyA9IGZhbHNlOworICAgIG1fZG9tVGltZXJpc0JlaW5n RXhlY3V0ZWQgPSBmYWxzZTsKICAgICB1bnJlZ2lzdGVyRE9NVGltZXIodGltZXIpOwotICAgIHNl dFNob3VsZE9ic2VydmVTdHlsZVJlY2FsYyhtX2RvY3VtZW50Lmhhc1BlbmRpbmdTdHlsZVJlY2Fs YygpKTsKKyAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKG1fZG9jdW1lbnQuaGFz UGVuZGluZ1N0eWxlUmVjYWxjKCkpOwogICAgIG5vdGlmeUNvbnRlbnRDaGFuZ2VJZk5lZWRlZCgp OwogfQogCi12b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdTdHlsZVJl Y2FsYygpCit2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRTdGFydCgp CiB7Ci0gICAgaWYgKCFzaG91bGRPYnNlcnZlU3R5bGVSZWNhbGMoKSkKKyAgICBpZiAoIWlzT2Jz ZXJ2aW5nU3R5bGVSZWNhbGMoKSkKICAgICAgICAgcmV0dXJuOwogICAgIGlmIChoYXNWaXNpYmxl Q2hhbmdlU3RhdGUoKSkKICAgICAgICAgcmV0dXJuOwogICAgIExPRyhDb250ZW50T2JzZXJ2YXRp b24sICJzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjOiBzdGFydCBvYnNlcnZpbmcgc3R5bGUgcmVj YWxjLiIpOwogCi0gICAgbV9pc09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzID0gdHJ1ZTsKKyAgICBt X3N0eWxlUmVjYWxjSXNCZWluZ0V4ZWN1dGVkID0gdHJ1ZTsKIH0KIAotdm9pZCBDb250ZW50Q2hh bmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsYygpCit2b2lkIENvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRGaW5pc2goKQogewotICAgIGlmICghc2hvdWxkT2Jz ZXJ2ZVN0eWxlUmVjYWxjKCkpCisgICAgaWYgKCFpc09ic2VydmluZ1N0eWxlUmVjYWxjKCkpCiAg ICAgICAgIHJldHVybjsKICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAic3RvcE9ic2Vydmlu Z1N0eWxlUmVjYWxjOiBzdG9wIG9ic2VydmluZyBzdHlsZSByZWNhbGMiKTsKIAotICAgIHNldFNo b3VsZE9ic2VydmVTdHlsZVJlY2FsYyhmYWxzZSk7Ci0gICAgbV9pc09ic2VydmluZ0NvbnRlbnRD aGFuZ2VzID0gZmFsc2U7CisgICAgbV9zdHlsZVJlY2FsY0lzQmVpbmdFeGVjdXRlZCA9IGZhbHNl OworICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoZmFsc2UpOwogICAgIGFkanVz dE9ic2VydmVkU3RhdGUoRXZlbnQ6OlN0eWxlUmVjYWxjRmluaXNoZWQpOwogICAgIG5vdGlmeUNv bnRlbnRDaGFuZ2VJZk5lZWRlZCgpOwogfQpAQCAtMTM4LDE5ICsxMzgsMTcgQEAgdm9pZCBDb250 ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNvbnRlbnRWaXNpYmlsaXR5RGlkQ2hhbmdlKCkKICAgICBhZGp1 c3RPYnNlcnZlZFN0YXRlKEV2ZW50OjpDb250ZW50VmlzaWJpbGl0eUNoYW5nZWQpOwogfQogCi12 b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdNb3VzZU1vdmVkKCkKK3Zv aWQgQ29udGVudENoYW5nZU9ic2VydmVyOjptb3VzZU1vdmVkRGlkU3RhcnQoKQogewogICAgIEFT U0VSVCghbV9kb2N1bWVudC5oYXNQZW5kaW5nU3R5bGVSZWNhbGMoKSk7CiAgICAgY2xlYXJPYnNl cnZlZERPTVRpbWVycygpOwotICAgIHN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7 Ci0gICAgbV9pc09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzID0gdHJ1ZTsKKyAgICBzZXRTaG91bGRP YnNlcnZlRE9NVGltZXJTY2hlZHVsaW5nKHRydWUpOwogICAgIGFkanVzdE9ic2VydmVkU3RhdGUo RXZlbnQ6OkNvbnRlbnRPYnNlcnZhdGlvblN0YXJ0ZWQpOwogfQogCi12b2lkIENvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ01vdXNlTW92ZWQoKQordm9pZCBDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6Om1vdXNlTW92ZWREaWRGaW5pc2goKQogewotICAgIHN0b3BPYnNlcnZpbmdET01U aW1lclNjaGVkdWxpbmcoKTsKLSAgICBtX2lzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMgPSBmYWxz ZTsKKyAgICBzZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5nKGZhbHNlKTsKIH0KIAog V0tDb250ZW50Q2hhbmdlIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6b2JzZXJ2ZWRDb250ZW50Q2hh bmdlKCkgY29uc3QKQEAgLTE3MCwxMSArMTY4LDExIEBAIHZvaWQgQ29udGVudENoYW5nZU9ic2Vy dmVyOjp1bnJlZ2lzdGVyRE9NVGltZXIoY29uc3QgRE9NVGltZXImIHRpbWVyKQogICAgIGFkanVz dE9ic2VydmVkU3RhdGUoRXZlbnQ6OlJlbW92ZWRET01UaW1lcik7CiB9CiAKLXZvaWQgQ29udGVu dENoYW5nZU9ic2VydmVyOjpzZXRTaG91bGRPYnNlcnZlU3R5bGVSZWNhbGMoYm9vbCBzaG91bGRP YnNlcnZlKQordm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNldFNob3VsZE9ic2VydmVOZXh0 U3R5bGVSZWNhbGMoYm9vbCBzaG91bGRPYnNlcnZlKQogewogICAgIGlmIChzaG91bGRPYnNlcnZl KQogICAgICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAiV2FpdCB1bnRpbCBuZXh0IHN0eWxl IHJlY2FsYyBmaXJlcy4iKTsKLSAgICBtX3Nob3VsZE9ic2VydmVTdHlsZVJlY2FsYyA9IHNob3Vs ZE9ic2VydmU7CisgICAgbV9pc09ic2VydmluZ1N0eWxlUmVjYWxjID0gc2hvdWxkT2JzZXJ2ZTsK IH0KIAogYm9vbCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6Omhhc0RldGVybWluYXRlU3RhdGUoKSBj b25zdApAQCAtMjQ2LDcgKzI0NCw3IEBAIHN0YXRpYyBWaXNpYmlsaXR5IGVsZW1lbnRJbXBsaWNp dFZpc2liaWxpdHkoY29uc3QgRWxlbWVudCYgZWxlbWVudCkKIENvbnRlbnRDaGFuZ2VPYnNlcnZl cjo6U3R5bGVDaGFuZ2VTY29wZTo6U3R5bGVDaGFuZ2VTY29wZShEb2N1bWVudCYgZG9jdW1lbnQs IGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgOiBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcihk b2N1bWVudC5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSkKICAgICAsIG1fZWxlbWVudChlbGVtZW50 KQotICAgICwgbV9uZWVkc09ic2VydmluZyhtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlci5pc09ic2Vy dmluZ0NvbnRlbnRDaGFuZ2VzKCkgJiYgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIub2JzZXJ2ZWRD b250ZW50Q2hhbmdlKCkgIT0gV0tDb250ZW50VmlzaWJpbGl0eUNoYW5nZSkKKyAgICAsIG1fbmVl ZHNPYnNlcnZpbmcobV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIuaXNPYnNlcnZpbmdDb250ZW50Q2hh bmdlcygpICYmICFtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oYXNWaXNpYmxlQ2hhbmdlU3RhdGUo KSkKIHsKICAgICBpZiAobV9uZWVkc09ic2VydmluZykgewogICAgICAgICBtX3ByZXZpb3VzRGlz cGxheSA9IGVsZW1lbnQucmVuZGVyU3R5bGUoKSA/IGVsZW1lbnQucmVuZGVyU3R5bGUoKS0+ZGlz cGxheSgpIDogRGlzcGxheVR5cGU6Ok5vbmU7CkBAIC0yODMsMjMgKzI4MSwyMyBAQCBDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6OlN0eWxlQ2hhbmdlU2NvcGU6On5TdHlsZUNoYW5nZVNjb3BlKCkKIENv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6TW91c2VNb3ZlZFNjb3BlOjpNb3VzZU1vdmVkU2NvcGUoRG9j dW1lbnQmIGRvY3VtZW50KQogICAgIDogbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoZG9jdW1lbnQu Y29udGVudENoYW5nZU9ic2VydmVyKCkpCiB7Ci0gICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIu c3RhcnRPYnNlcnZpbmdNb3VzZU1vdmVkKCk7CisgICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIu bW91c2VNb3ZlZERpZFN0YXJ0KCk7CiB9CiAKIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6TW91c2VN b3ZlZFNjb3BlOjp+TW91c2VNb3ZlZFNjb3BlKCkKIHsKLSAgICBtX2NvbnRlbnRDaGFuZ2VPYnNl cnZlci5zdG9wT2JzZXJ2aW5nTW91c2VNb3ZlZCgpOworICAgIG1fY29udGVudENoYW5nZU9ic2Vy dmVyLm1vdXNlTW92ZWREaWRGaW5pc2goKTsKIH0KIAogQ29udGVudENoYW5nZU9ic2VydmVyOjpT dHlsZVJlY2FsY1Njb3BlOjpTdHlsZVJlY2FsY1Njb3BlKERvY3VtZW50JiBkb2N1bWVudCkKICAg ICA6IG1fY29udGVudENoYW5nZU9ic2VydmVyKGRvY3VtZW50LmNvbnRlbnRDaGFuZ2VPYnNlcnZl cigpKQogewotICAgIG1fY29udGVudENoYW5nZU9ic2VydmVyLnN0YXJ0T2JzZXJ2aW5nU3R5bGVS ZWNhbGMoKTsKKyAgICBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlci5zdHlsZVJlY2FsY0RpZFN0YXJ0 KCk7CiB9CiAKIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNTY29wZTo6flN0eWxl UmVjYWxjU2NvcGUoKQogewotICAgIG1fY29udGVudENoYW5nZU9ic2VydmVyLnN0b3BPYnNlcnZp bmdTdHlsZVJlY2FsYygpOworICAgIG1fY29udGVudENoYW5nZU9ic2VydmVyLnN0eWxlUmVjYWxj RGlkRmluaXNoKCk7CiB9CiAKIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6RE9NVGltZXJTY29wZTo6 RE9NVGltZXJTY29wZShEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IERPTVRpbWVyJiBkb21UaW1l cikKQEAgLTMwNywxMyArMzA1LDEzIEBAIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6RE9NVGltZXJT Y29wZTo6RE9NVGltZXJTY29wZShEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IERPCiAgICAgLCBt X2RvbVRpbWVyKGRvbVRpbWVyKQogewogICAgIGlmIChtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcikK LSAgICAgICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPnN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJF eGVjdXRlKG1fZG9tVGltZXIpOworICAgICAgICBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlci0+ZG9t VGltZXJFeGVjdXRlRGlkU3RhcnQobV9kb21UaW1lcik7CiB9CiAKIENvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6RE9NVGltZXJTY29wZTo6fkRPTVRpbWVyU2NvcGUoKQogewogICAgIGlmIChtX2NvbnRl bnRDaGFuZ2VPYnNlcnZlcikKLSAgICAgICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPnN0b3BP YnNlcnZpbmdET01UaW1lckV4ZWN1dGUobV9kb21UaW1lcik7CisgICAgICAgIG1fY29udGVudENo YW5nZU9ic2VydmVyLT5kb21UaW1lckV4ZWN1dGVEaWRGaW5pc2gobV9kb21UaW1lcik7CiB9CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNl cnZlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgK aW5kZXggMDdiNWVjOTMyZGYzYjE5MjU4NmM5OGFhYjVhMzVkZWFhODkzMGFiMy4uMjNkMTI1MDVk NWM2YTNhOTY2NjBiNTNiOTc0NDc0NzVjOGRmMzRmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKQEAgLTg2LDI3ICs4NiwyMyBAQCBwdWJs aWM6CiAgICAgfTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nTW91c2VNb3Zl ZCgpOwotICAgIHZvaWQgc3RvcE9ic2VydmluZ01vdXNlTW92ZWQoKTsKLQotICAgIHZvaWQgc3Rh cnRPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKSB7IG1faXNPYnNlcnZpbmdET01UaW1lclNj aGVkdWxpbmcgPSB0cnVlOyB9Ci0gICAgdm9pZCBzdG9wT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVs aW5nKCkgeyBtX2lzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nID0gZmFsc2U7IH0KLQotICAg IHZvaWQgc3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXImKTsKLSAg ICB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXImKTsKLQot ICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsYygpOwotICAgIHZvaWQgc3RvcE9ic2Vy dmluZ1N0eWxlUmVjYWxjKCk7CisgICAgdm9pZCBtb3VzZU1vdmVkRGlkU3RhcnQoKTsKKyAgICB2 b2lkIG1vdXNlTW92ZWREaWRGaW5pc2goKTsKIAorICAgIHZvaWQgc2V0U2hvdWxkT2JzZXJ2ZURP TVRpbWVyU2NoZWR1bGluZyhib29sIG9ic2VydmUpIHsgbV9pc09ic2VydmluZ0RPTVRpbWVyU2No ZWR1bGluZyA9IG9ic2VydmU7IH0KKyAgICBib29sIGlzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVs aW5nKCkgY29uc3QgeyByZXR1cm4gbV9pc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZzsgfQor ICAgIHZvaWQgZG9tVGltZXJFeGVjdXRlRGlkU3RhcnQoY29uc3QgRE9NVGltZXImKTsKKyAgICB2 b2lkIGRvbVRpbWVyRXhlY3V0ZURpZEZpbmlzaChjb25zdCBET01UaW1lciYpOwogICAgIHZvaWQg cmVnaXN0ZXJET01UaW1lcihjb25zdCBET01UaW1lciYpOwogICAgIHZvaWQgdW5yZWdpc3RlckRP TVRpbWVyKGNvbnN0IERPTVRpbWVyJik7Ci0gICAgYm9vbCBpc09ic2VydmluZ0RPTVRpbWVyU2No ZWR1bGluZygpIGNvbnN0IHsgcmV0dXJuIG1faXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmc7 IH0KICAgICBib29sIGNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcihjb25zdCBET01UaW1lciYgdGlt ZXIpIGNvbnN0IHsgcmV0dXJuIG1fRE9NVGltZXJMaXN0LmNvbnRhaW5zKCZ0aW1lcik7IH0KIAot ICAgIHZvaWQgc2V0U2hvdWxkT2JzZXJ2ZVN0eWxlUmVjYWxjKGJvb2wpOwotICAgIGJvb2wgc2hv dWxkT2JzZXJ2ZVN0eWxlUmVjYWxjKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRPYnNlcnZlU3R5 bGVSZWNhbGM7IH0KKyAgICB2b2lkIHN0eWxlUmVjYWxjRGlkU3RhcnQoKTsKKyAgICB2b2lkIHN0 eWxlUmVjYWxjRGlkRmluaXNoKCk7CisgICAgdm9pZCBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxl UmVjYWxjKGJvb2wpOworICAgIGJvb2wgaXNPYnNlcnZpbmdTdHlsZVJlY2FsYygpIGNvbnN0IHsg cmV0dXJuIG1faXNPYnNlcnZpbmdTdHlsZVJlY2FsYzsgfQogCi0gICAgYm9vbCBpc09ic2Vydmlu Z0NvbnRlbnRDaGFuZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9pc09ic2VydmluZ0NvbnRlbnRDaGFu Z2VzOyB9CisgICAgYm9vbCBpc09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkgY29uc3QgeyByZXR1 cm4gbV9kb21UaW1lcmlzQmVpbmdFeGVjdXRlZCB8fCBtX3N0eWxlUmVjYWxjSXNCZWluZ0V4ZWN1 dGVkOyB9CiAKICAgICB2b2lkIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKSB7IG1fRE9NVGltZXJM aXN0LmNsZWFyKCk7IH0KICAgICB2b2lkIGNsZWFyVGltZXJzQW5kUmVwb3J0Q29udGVudENoYW5n ZSgpOwpAQCAtMTMyLDkgKzEyOCwxMCBAQCBwcml2YXRlOgogCiAgICAgRG9jdW1lbnQmIG1fZG9j dW1lbnQ7CiAgICAgSGFzaFNldDxjb25zdCBET01UaW1lcio+IG1fRE9NVGltZXJMaXN0OwotICAg IGJvb2wgbV9zaG91bGRPYnNlcnZlU3R5bGVSZWNhbGMgeyBmYWxzZSB9OworICAgIGJvb2wgbV9p c09ic2VydmluZ1N0eWxlUmVjYWxjIHsgZmFsc2UgfTsKKyAgICBib29sIG1fc3R5bGVSZWNhbGNJ c0JlaW5nRXhlY3V0ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc09ic2VydmluZ0RPTVRpbWVy U2NoZWR1bGluZyB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2lzT2JzZXJ2aW5nQ29udGVudENoYW5n ZXMgeyBmYWxzZSB9OworICAgIGJvb2wgbV9kb21UaW1lcmlzQmVpbmdFeGVjdXRlZCB7IGZhbHNl IH07CiB9OwogCiBpbmxpbmUgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNldEhhc05vQ2hh bmdlU3RhdGUoKQo=