173974 2017-06-29 10:28:37 -0700 statistics.mostRecentUserInteraction should be of type WallTime 2017-06-29 12:13:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez bfulgham buildbot commit-queue dbates ggaren japhet sam wilander oldest_to_newest 1323978 0 cdumez 2017-06-29 10:28:37 -0700 statistics.mostRecentUserInteraction should be of type WallTime for clarity. 1323981 1 314140 cdumez 2017-06-29 10:31:03 -0700 Created attachment 314140 Patch 1324025 2 314140 bfulgham 2017-06-29 11:52:58 -0700 Comment on attachment 314140 Patch r=me 1324033 3 314140 commit-queue 2017-06-29 12:13:13 -0700 Comment on attachment 314140 Patch Clearing flags on attachment: 314140 Committed r218953: <http://trac.webkit.org/changeset/218953> 1324034 4 commit-queue 2017-06-29 12:13:15 -0700 All reviewed patches have been landed. Closing bug. 314140 2017-06-29 10:31:03 -0700 2017-06-29 12:13:13 -0700 Patch bug-173974-20170629103102.patch text/plain 12294 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ViNDVjZTA2N2ZhMjNl NjdmNzNhY2M3ZTE1ZjUyMTZlZDk0ZjBhMS4uYmI5YTlmMmY0YTQyZGQzMGNjZDBmNThkOTYwNTQ2 ZjZmNDFkZjM4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgc3RhdGlzdGljcy5tb3N0UmVj ZW50VXNlckludGVyYWN0aW9uIHNob3VsZCBiZSBvZiB0eXBlIFdhbGxUaW1lCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM5NzQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzdGF0aXN0aWNzLm1vc3RSZWNl bnRVc2VySW50ZXJhY3Rpb24gc2hvdWxkIGJlIG9mIHR5cGUgV2FsbFRpbWUgZm9yIGNsYXJpdHku CisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldpdGhSZWR1 Y2VkVGltZVJlc29sdXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2 ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRP YnNlcnZlcjo6Y2xlYXJVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRp c3RpY3M6OmVuY29kZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNz OjpkZWNvZGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljczo6dG9T dHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljczo6bWVyZ2Up OgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmg6CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjptb3N0UmVjZW50VXNlckludGVyYWN0aW9u VGltZSk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRQYXJ0aXRpb25Db29raWVzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50 VXNlckludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6c29ydGVkUHJldmFsZW50UmVzb3VyY2VUZWxlbWV0cnkpOgorCiAyMDE3LTA2LTI4 ICBGcmVkZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBBbGlnbiBEb2N1 bWVudDo6Y2FuTmF2aWdhdGUgb24gdGhlIEhUTTUgc3BlY2lmaWNhdGlvbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4 IDQzOWY1Njc4MzVjOTljMWFjNjA5OGE5NzljZjJlMmJmZmE3ODRiNGIuLmNkOThjMTBmODQ3MTFh OTk1Yzc1MTVmZjNjMmFhY2Q2ODg1NjdjZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxNy0wNi0yOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIHN0 YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiBzaG91bGQgYmUgb2YgdHlwZSBXYWxs VGltZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcz OTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgc3Rh dGlzdGljcy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uIHNob3VsZCBiZSBvZiB0eXBlIFdhbGxU aW1lIGZvciBjbGFyaXR5LgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5jcHA6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VMb2FkU3RhdGlzdGlj cz46OmVuY29kZSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VMb2FkU3Rh dGlzdGljcz46OmRlY29kZSk6CisKIDIwMTctMDYtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBHVEsrIHVuaXQg dGVzdHMgY3Jhc2hpbmcgYWZ0ZXIgcjIxODkyMi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCmluZGV4IDYzMDI5MDhlMmJlMGZjZjI0NTVlOWY2MDFm YWM2NTVkNmY3NmM2ZDEuLjRmNWE3YjM3ZTI0YzUwMzg2NGQ4MWU1NDkyYTgwOWJiNmY2MWNlYzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcApA QCAtNDMsNyArNDMsNiBAQAogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogI2luY2x1ZGUgIlVS TC5oIgogI2luY2x1ZGUgPHd0Zi9Dcm9zc1RocmVhZENvcGllci5oPgotI2luY2x1ZGUgPHd0Zi9D dXJyZW50VGltZS5oPgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUg PHd0Zi9Xb3JrUXVldWUuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CkBA IC0zNTgsMTEgKzM1NywxMSBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dVc2VySW50 ZXJhY3Rpb25XaXRoUmVkdWNlZFRpbWVSZXNvbHV0aW9uKGNvbnN0IERvYwogICAgICAgICBhdXRv IGxvY2tlciA9IGhvbGRMb2NrKG1fc3RvcmUtPnN0YXRpc3RpY3NMb2NrKCkpOwogICAgICAgICBh dXRvJiBzdGF0aXN0aWNzID0gbV9zdG9yZS0+ZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJp bWFyeURvbWFpbihwcmltYXJ5RG9tYWluU3RyaW5nKTsKICAgICAgICAgV2FsbFRpbWUgbmV3VGlt ZSA9IHJlZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpub3coKSk7Ci0gICAgICAgIGlmIChu ZXdUaW1lID09IHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUoKSkKKyAg ICAgICAgaWYgKG5ld1RpbWUgPT0gc3RhdGlzdGljcy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9u VGltZSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBzdGF0aXN0aWNzLmhhZFVzZXJJ bnRlcmFjdGlvbiA9IHRydWU7Ci0gICAgICAgIHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRl cmFjdGlvbiA9IG5ld1RpbWUuc2Vjb25kc1NpbmNlRXBvY2goKS52YWx1ZSgpOworICAgICAgICBz dGF0aXN0aWNzLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lID0gbmV3VGltZTsKICAgICAg ICAgfQogICAgICAgICAKICAgICAgICAgbV9zdG9yZS0+ZmlyZURhdGFNb2RpZmljYXRpb25IYW5k bGVyKCk7CkBAIC0zODAsNyArMzc5LDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9n VXNlckludGVyYWN0aW9uKGNvbnN0IFVSTCYgdXJsKQogICAgICAgICBhdXRvIGxvY2tlciA9IGhv bGRMb2NrKG1fc3RvcmUtPnN0YXRpc3RpY3NMb2NrKCkpOwogICAgICAgICBhdXRvJiBzdGF0aXN0 aWNzID0gbV9zdG9yZS0+ZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihw cmltYXJ5RG9tYWluU3RyaW5nKTsKICAgICAgICAgc3RhdGlzdGljcy5oYWRVc2VySW50ZXJhY3Rp b24gPSB0cnVlOwotICAgICAgICBzdGF0aXN0aWNzLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24g PSBXVEY6OmN1cnJlbnRUaW1lKCk7CisgICAgICAgIHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJ bnRlcmFjdGlvblRpbWUgPSBXYWxsVGltZTo6bm93KCk7CiAgICAgICAgIH0KICAgICAgICAgCiAg ICAgICAgIG1fc3RvcmUtPmZpcmVTaG91bGRQYXJ0aXRpb25Db29raWVzSGFuZGxlcih7IHByaW1h cnlEb21haW5TdHJpbmcgfSwgeyB9LCBmYWxzZSk7CkBAIC0zOTYsNyArMzk1LDcgQEAgdm9pZCBS ZXNvdXJjZUxvYWRPYnNlcnZlcjo6Y2xlYXJVc2VySW50ZXJhY3Rpb24oY29uc3QgVVJMJiB1cmwp CiAgICAgYXV0byYgc3RhdGlzdGljcyA9IG1fc3RvcmUtPmVuc3VyZVJlc291cmNlU3RhdGlzdGlj c0ZvclByaW1hcnlEb21haW4ocHJpbWFyeURvbWFpbih1cmwpKTsKICAgICAKICAgICBzdGF0aXN0 aWNzLmhhZFVzZXJJbnRlcmFjdGlvbiA9IGZhbHNlOwotICAgIHN0YXRpc3RpY3MubW9zdFJlY2Vu dFVzZXJJbnRlcmFjdGlvbiA9IDA7CisgICAgc3RhdGlzdGljcy5tb3N0UmVjZW50VXNlckludGVy YWN0aW9uVGltZSA9IHsgfTsKIH0KIAogYm9vbCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6aGFzSGFk VXNlckludGVyYWN0aW9uKGNvbnN0IFVSTCYgdXJsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuY3BwCmluZGV4IDYyMjQ0MmU0YTY5OWEyZjMyZGY5 ZjRlZGUzMzkxOGQzM2Q5YTMwYjkuLmVlZmE1YWZlZTYyYjExMDk5Yjk2Mzk5OWZjYThiMGQ3YTk0 ODE1MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlz dGljcy5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjpl bmNvZGUoS2V5ZWRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIAogICAgIC8vIFVzZXIgaW50 ZXJhY3Rpb24KICAgICBlbmNvZGVyLmVuY29kZUJvb2woImhhZFVzZXJJbnRlcmFjdGlvbiIsIGhh ZFVzZXJJbnRlcmFjdGlvbik7Ci0gICAgZW5jb2Rlci5lbmNvZGVEb3VibGUoIm1vc3RSZWNlbnRV c2VySW50ZXJhY3Rpb24iLCBtb3N0UmVjZW50VXNlckludGVyYWN0aW9uKTsKKyAgICBlbmNvZGVy LmVuY29kZURvdWJsZSgibW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiIsIG1vc3RSZWNlbnRVc2Vy SW50ZXJhY3Rpb25UaW1lLnNlY29uZHNTaW5jZUVwb2NoKCkudmFsdWUoKSk7CiAgICAgZW5jb2Rl ci5lbmNvZGVCb29sKCJncmFuZGZhdGhlcmVkIiwgZ3JhbmRmYXRoZXJlZCk7CiAgICAgCiAgICAg Ly8gVG9wIGZyYW1lIHN0YXRzCkBAIC0xODMsOCArMTgzLDEwIEBAIGJvb2wgUmVzb3VyY2VMb2Fk U3RhdGlzdGljczo6ZGVjb2RlKEtleWVkRGVjb2RlciYgZGVjb2RlciwgdW5zaWduZWQgdmVyc2lv bikKICAgICBpZiAodmVyc2lvbiA8IDMpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgaWYg KCFkZWNvZGVyLmRlY29kZURvdWJsZSgibW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiIsIG1vc3RS ZWNlbnRVc2VySW50ZXJhY3Rpb24pKQorICAgIGRvdWJsZSBtb3N0UmVjZW50VXNlckludGVyYWN0 aW9uVGltZUFzRG91YmxlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGVEb3VibGUoIm1vc3RSZWNl bnRVc2VySW50ZXJhY3Rpb24iLCBtb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZUFzRG91Ymxl KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25U aW1lID0gV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25U aW1lQXNEb3VibGUpOwogCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZUJvb2woImdyYW5kZmF0aGVy ZWQiLCBncmFuZGZhdGhlcmVkKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjI2LDcgKzIy OCw3IEBAIFN0cmluZyBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOjp0b1N0cmluZygpIGNvbnN0CiAg ICAgYXBwZW5kQm9vbGVhbihidWlsZGVyLCAiaGFkVXNlckludGVyYWN0aW9uIiwgaGFkVXNlcklu dGVyYWN0aW9uKTsKICAgICBidWlsZGVyLmFwcGVuZCgnXG4nKTsKICAgICBidWlsZGVyLmFwcGVu ZExpdGVyYWwoIiAgICBtb3N0UmVjZW50VXNlckludGVyYWN0aW9uOiAiKTsKLSAgICBidWlsZGVy LmFwcGVuZE51bWJlcihtb3N0UmVjZW50VXNlckludGVyYWN0aW9uKTsKKyAgICBidWlsZGVyLmFw cGVuZE51bWJlcihtb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZS5zZWNvbmRzU2luY2VFcG9j aCgpLnZhbHVlKCkpOwogICAgIGJ1aWxkZXIuYXBwZW5kKCdcbicpOwogICAgIGFwcGVuZEJvb2xl YW4oYnVpbGRlciwgIiAgICBncmFuZGZhdGhlcmVkIiwgZ3JhbmRmYXRoZXJlZCk7CiAgICAgYnVp bGRlci5hcHBlbmQoJ1xuJyk7CkBAIC0zMTcsMTQgKzMxOSwxNCBAQCB2b2lkIFJlc291cmNlTG9h ZFN0YXRpc3RpY3M6Om1lcmdlKGNvbnN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIG90aGVyKQog ICAgIGlmICghb3RoZXIuaGFkVXNlckludGVyYWN0aW9uKSB7CiAgICAgICAgIC8vIElmIHVzZXIg aW50ZXJhY3Rpb24gaGFzIGJlZW4gcmVzZXQgZG8gc28gaGVyZSB0b28uCiAgICAgICAgIC8vIEVs c2UsIGRvIG5vdGhpbmcuCi0gICAgICAgIGlmICghb3RoZXIubW9zdFJlY2VudFVzZXJJbnRlcmFj dGlvbikgeworICAgICAgICBpZiAoIW90aGVyLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1l KSB7CiAgICAgICAgICAgICBoYWRVc2VySW50ZXJhY3Rpb24gPSBmYWxzZTsKLSAgICAgICAgICAg IG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24gPSAwOworICAgICAgICAgICAgbW9zdFJlY2VudFVz ZXJJbnRlcmFjdGlvblRpbWUgPSB7IH07CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAg ICBoYWRVc2VySW50ZXJhY3Rpb24gPSB0cnVlOwotICAgICAgICBpZiAobW9zdFJlY2VudFVzZXJJ bnRlcmFjdGlvbiA8IG90aGVyLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24pCi0gICAgICAgICAg ICBtb3N0UmVjZW50VXNlckludGVyYWN0aW9uID0gb3RoZXIubW9zdFJlY2VudFVzZXJJbnRlcmFj dGlvbjsKKyAgICAgICAgaWYgKG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lIDwgb3RoZXIu bW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUpCisgICAgICAgICAgICBtb3N0UmVjZW50VXNl ckludGVyYWN0aW9uVGltZSA9IG90aGVyLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lOwog ICAgIH0KICAgICBncmFuZGZhdGhlcmVkIHw9IG90aGVyLmdyYW5kZmF0aGVyZWQ7CiAgICAgCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MuaAppbmRleCBj NDg3NTc1MTEwNjI2NTRlYzczOThmYjY4NjFmNWFmOTYxMzBkMzU0Li5lYTVlMDdkNmIzNmYxNTA5 Y2YwNjY4OTMwYzVmODA5NzY2NjdjYzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9S ZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmgKQEAgLTUwLDE1ICs1MCwxMiBAQCBzdHJ1Y3QgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljcyB7CiAKICAgICB2b2lkIG1lcmdlKGNvbnN0IFJlc291cmNlTG9hZFN0 YXRpc3RpY3MmKTsKIAotICAgIFdhbGxUaW1lIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1l KCkgY29uc3QgeyByZXR1cm4gV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKG1vc3RSZWNlbnRVc2Vy SW50ZXJhY3Rpb24pOyB9Ci0KICAgICBTdHJpbmcgaGlnaExldmVsRG9tYWluOwogCiAgICAgLy8g VXNlciBpbnRlcmFjdGlvbgogICAgIGJvb2wgaGFkVXNlckludGVyYWN0aW9uIHsgZmFsc2UgfTsK ICAgICAvLyBUaW1lc3RhbXAuIERlZmF1bHQgdmFsdWUgaXMgbmVnYXRpdmUsIDAgbWVhbnMgaXQg d2FzIHJlc2V0LgotICAgIC8vIEZJWE1FOiBDYW4gdGhpcyB1c2UgV2FsbFRpbWU/Ci0gICAgZG91 YmxlIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24geyAtMSB9OworICAgIFdhbGxUaW1lIG1vc3RS ZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lIHsgV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKC0xKSB9 OwogICAgIGJvb2wgZ3JhbmRmYXRoZXJlZCB7IGZhbHNlIH07CiAKICAgICAvLyBUb3AgZnJhbWUg c3RhdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZS5jcHAKaW5kZXggNDIyYjlkODNkMjY3OTA5YTkwZjhiNWE5YzAyZTVjOWM1ZGIz ZDJhMS4uNzIwYTlkMWU1MzIyMjFjOWMzNDI1ZDZiOGQyNTY1MjY3MTI0YjJkNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAKQEAgLTM0LDcgKzM0LDYgQEAKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKICNpbmNsdWRl ICJVUkwuaCIKICNpbmNsdWRlIDx3dGYvQ3Jvc3NUaHJlYWRDb3BpZXIuaD4KLSNpbmNsdWRlIDx3 dGYvQ3VycmVudFRpbWUuaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgogI2luY2x1ZGUg PHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CkBAIC0yNDks OCArMjQ4LDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZpcmVUZWxlbWV0 cnlIYW5kbGVyKCkKICAgICAKIHN0YXRpYyBpbmxpbmUgYm9vbCBzaG91bGRQYXJ0aXRpb25Db29r aWVzKGNvbnN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRpc3RpYykKIHsKLSAgICByZXR1 cm4gc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UKLSAgICAgICAgJiYgKCFzdGF0aXN0aWMu aGFkVXNlckludGVyYWN0aW9uIHx8IFdhbGxUaW1lOjpub3coKSA+IHN0YXRpc3RpYy5tb3N0UmVj ZW50VXNlckludGVyYWN0aW9uVGltZSgpICsgdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUp OworICAgIHJldHVybiBzdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSAmJiAoIXN0YXRpc3Rp Yy5oYWRVc2VySW50ZXJhY3Rpb24gfHwgV2FsbFRpbWU6Om5vdygpID4gc3RhdGlzdGljLm1vc3RS ZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lICsgdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUp OwogfQogCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZmlyZVNob3VsZFBhcnRp dGlvbkNvb2tpZXNIYW5kbGVyKCkKQEAgLTM0MSwxMSArMzM5LDExIEBAIGJvb2wgUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpoYXNIYWRSZWNlbnRVc2VySW50ZXJhY3Rpb24oUmVzb3VyY2VM b2FkU3RhdGlzCiAgICAgaWYgKCFyZXNvdXJjZVN0YXRpc3RpYy5oYWRVc2VySW50ZXJhY3Rpb24p CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChXYWxsVGltZTo6bm93KCkgPiByZXNv dXJjZVN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSgpICsgdGltZVRvTGl2 ZVVzZXJJbnRlcmFjdGlvbikgeworICAgIGlmIChXYWxsVGltZTo6bm93KCkgPiByZXNvdXJjZVN0 YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSArIHRpbWVUb0xpdmVVc2VySW50 ZXJhY3Rpb24pIHsKICAgICAgICAgLy8gRHJvcCBwcml2YWN5IHNlbnNpdGl2ZSBkYXRhIGJlY2F1 c2Ugd2Ugbm8gbG9uZ2VyIG5lZWQgaXQuCi0gICAgICAgIC8vIFNldCB0aW1lc3RhbXAgdG8gMC4w IHNvIHRoYXQgc3RhdGlzdGljcyBtZXJnZSB3aWxsIGtub3cKKyAgICAgICAgLy8gU2V0IHRpbWVz dGFtcCB0byAwIHNvIHRoYXQgc3RhdGlzdGljcyBtZXJnZSB3aWxsIGtub3cKICAgICAgICAgLy8g aXQgaGFzIGJlZW4gcmVzZXQgYXMgb3Bwb3NlZCB0byBpdHMgZGVmYXVsdCAtMS4KLSAgICAgICAg cmVzb3VyY2VTdGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiA9IDA7CisgICAgICAg IHJlc291cmNlU3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lID0geyB9Owog ICAgICAgICByZXNvdXJjZVN0YXRpc3RpYy5oYWRVc2VySW50ZXJhY3Rpb24gPSBmYWxzZTsKIAog ICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0zODUsNyArMzgzLDcgQEAgVmVjdG9yPFByZXZhbGVu dFJlc291cmNlVGVsZW1ldHJ5PiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNvcnRlZFBy ZXZhbGVudFIKICAgICAgICAgaWYgKCFzdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSkKICAg ICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIHVuc2lnbmVkIGRheXNTaW5jZVVzZXJJbnRl cmFjdGlvbiA9IHN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uIDw9IDAgPyAwIDog c3RkOjpmbG9vcigoV2FsbFRpbWU6Om5vdygpIC0gc3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50 ZXJhY3Rpb25UaW1lKCkpIC8gMjRfaCk7CisgICAgICAgIHVuc2lnbmVkIGRheXNTaW5jZVVzZXJJ bnRlcmFjdGlvbiA9IHN0YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSA8PSBX YWxsVGltZSgpID8gMCA6IHN0ZDo6Zmxvb3IoKFdhbGxUaW1lOjpub3coKSAtIHN0YXRpc3RpYy5t b3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSkgLyAyNF9oKTsKICAgICAgICAgc29ydGVkLmFw cGVuZChQcmV2YWxlbnRSZXNvdXJjZVRlbGVtZXRyeSB7CiAgICAgICAgICAgICBzdGF0aXN0aWMu ZGF0YVJlY29yZHNSZW1vdmVkLAogICAgICAgICAgICAgc3RhdGlzdGljLmhhZFVzZXJJbnRlcmFj dGlvbiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRD b2RlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5j cHAKaW5kZXggMDhkYmExMGFkNjNkOGNhYTkzNWUyYjkzY2JhMWM5NmRlMTg4YmJhZi4uY2M2YWZm YTcxZDIyODE2NTJiZGUyZTZlYjI1NzM5NTZmNzUyNDc5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTIyNDQsNyArMjI0NCw3IEBA IHZvaWQgQXJndW1lbnRDb2RlcjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzPjo6ZW5jb2RlKEVuY29k ZXImIGVuY29kZXIsIGNvbnN0IFdlYkNvCiAgICAgCiAgICAgLy8gVXNlciBpbnRlcmFjdGlvbgog ICAgIGVuY29kZXIgPDwgc3RhdGlzdGljcy5oYWRVc2VySW50ZXJhY3Rpb247Ci0gICAgZW5jb2Rl ciA8PCBzdGF0aXN0aWNzLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb247CisgICAgZW5jb2RlciA8 PCBzdGF0aXN0aWNzLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lLnNlY29uZHNTaW5jZUVw b2NoKCkudmFsdWUoKTsKICAgICBlbmNvZGVyIDw8IHN0YXRpc3RpY3MuZ3JhbmRmYXRoZXJlZDsK ICAgICAKICAgICAvLyBUb3AgZnJhbWUgc3RhdHMKQEAgLTIyODgsOCArMjI4OCwxMCBAQCBib29s IEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VMb2FkU3RhdGlzdGljcz46OmRlY29kZShEZWNvZGVyJiBk ZWNvZGVyLCBXZWJDb3JlOjpSZQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoc3RhdGlzdGljcy5o YWRVc2VySW50ZXJhY3Rpb24pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbikpCisgICAg ZG91YmxlIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lQXNEb3VibGU7CisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShtb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZUFzRG91YmxlKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFj dGlvblRpbWUgPSBXYWxsVGltZTo6ZnJvbVJhd1NlY29uZHMobW9zdFJlY2VudFVzZXJJbnRlcmFj dGlvblRpbWVBc0RvdWJsZSk7CiAKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHN0YXRpc3RpY3Mu Z3JhbmRmYXRoZXJlZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK