60083 2011-05-03 16:38:30 -0700 WebKit2 should treat API calls that start/stop loads as user gestures for responsiveness timer 2011-05-03 16:46:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 397526 0 sam 2011-05-03 16:38:30 -0700 WebKit2 should treat API calls that start/stop loads as user gestures for responsiveness timer 397527 1 92164 sam 2011-05-03 16:41:13 -0700 Created attachment 92164 Patch 397531 2 sam 2011-05-03 16:46:10 -0700 Committed r85689: <http://trac.webkit.org/changeset/85689> 92164 2011-05-03 16:41:13 -0700 2011-05-03 16:44:36 -0700 Patch bug-60083-20110503164112.patch text/plain 9502 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1Njg2KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTEtMDUtMDMgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZWJLaXQyIHNob3VsZCB0cmVhdCBBUEkgY2FsbHMgdGhhdCBzdGFydC9z dG9wIGxvYWRzIGFzIHVzZXIgZ2VzdHVyZXMgZm9yIHJlc3BvbnNpdmVuZXNzIHRpbWVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDA4MworCisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbSk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6dHJ5Q2xvc2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmxvYWRVUkwpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRVUkxSZXF1ZXN0 KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2FkSFRNTFN0cmluZyk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRQbGFpblRleHRTdHJpbmcpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnN0b3BMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpyZWxvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Omdv Rm9yd2FyZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29CYWNrKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpnb1RvQmFja0ZvcndhcmRJdGVtKToKKyAgICAgICAg U3RhcnQgcmVzcG9uc2l2ZW5lc3MgdGltZXIgZm9yIGxvYWQgc3RhcnQvc3RvcCBhbmQgY2xvc2Uu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlNlbmRTdG9wUmVzcG9uc2l2ZW5lc3NUaW1lcjo6U2VuZFN0b3BSZXNwb25zaXZlbmVz c1RpbWVyKToKKyAgICAgICAgKFdlYktpdDo6U2VuZFN0b3BSZXNwb25zaXZlbmVzc1RpbWVyOjp+ U2VuZFN0b3BSZXNwb25zaXZlbmVzc1RpbWVyKToKKyAgICAgICAgQWRkIHNpbXBsZSBSQUlJIGNs YXNzIHRvIGVuc3VyZSB0aGUgU3RvcFJlc3BvbnNpdmVuZXNzVGltZXIgaXMgY2FsbGVkLgorCisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnRyeUNsb3NlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZTo6bG9hZFVSTFJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkRGF0 YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnN0b3BMb2FkaW5nKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6cmVsb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z29Gb3J3 YXJkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z29CYWNrKToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIFNlbmRzIGEgbWVzc2Fn ZSBiYWNrIHRvIHRoZSBVSVByb2Nlc3MgdG8gaW5kaWNhdGUgdGhlIFdlYlByb2Nlc3MKKyAgICAg ICAgaXMgc3RpbGwgcmVzcG9uc2l2ZS4KKwogMjAxMS0wNS0wMyAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiA4NTY0MSkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNzAsNiArMjcwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQ cm9jZXNzVwogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFu ZGxlOwogICAgIGluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKEtVUkwoS1VSTCgpLCBp dGVtLT51cmwoKSksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpOwogICAgIHByb2Nlc3MoKS0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShpdGVtLT5pdGVtSUQoKSwg c2FuZGJveEV4dGVuc2lvbkhhbmRsZSksIG1fcGFnZUlEKTsKKyAgICBwcm9jZXNzKCktPnJlc3Bv bnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OmluaXRp YWxpemVXZWJQYWdlKCkKQEAgLTM2Myw2ICszNjQsNyBAQCBib29sIFdlYlBhZ2VQcm94eTo6dHJ5 Q2xvc2UoKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHByb2Nlc3MoKS0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6VHJ5Q2xvc2UoKSwgbV9wYWdlSUQpOworICAgIHByb2Nlc3MoKS0+cmVz cG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApAQCAt Mzg4LDYgKzM5MCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkVVJMKGNvbnN0IFN0cmluZyYK ICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZTsKICAg ICBpbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShLVVJMKEtVUkwoKSwgdXJsKSwgc2Fu ZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpMb2FkVVJMKHVybCwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSksIG1fcGFnZUlEKTsKKyAg ICBwcm9jZXNzKCktPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIH0KIAogdm9pZCBX ZWJQYWdlUHJveHk6OmxvYWRVUkxSZXF1ZXN0KFdlYlVSTFJlcXVlc3QqIHVybFJlcXVlc3QpCkBA IC00MDAsNiArNDAzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRVUkxSZXF1ZXN0KFdlYlVS TAogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOwog ICAgIGluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKHVybFJlcXVlc3QtPnJlc291cmNl UmVxdWVzdCgpLnVybCgpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBwcm9jZXNzKCkt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRVUkxSZXF1ZXN0KHVybFJlcXVlc3QtPnJlc291 cmNlUmVxdWVzdCgpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKSwgbV9wYWdlSUQpOworICAgIHBy b2Nlc3MoKS0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwogfQogCiB2b2lkIFdlYlBh Z2VQcm94eTo6bG9hZEhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBT dHJpbmcmIGJhc2VVUkwpCkBAIC00MDgsNiArNDEyLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6Omxv YWRIVE1MU3RyaW5nKGNvbnN0IAogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwogCiAg ICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkSFRNTFN0cmluZyhodG1s U3RyaW5nLCBiYXNlVVJMKSwgbV9wYWdlSUQpOworICAgIHByb2Nlc3MoKS0+cmVzcG9uc2l2ZW5l c3NUaW1lcigpLT5zdGFydCgpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZEFsdGVybmF0 ZUhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VV UkwsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwpCkBAIC00MTksNiArNDI0LDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmxvYWRBbHRlcm5hdGVIVE1MU3RyaQogICAgICAgICBtX21haW5GcmFt ZS0+c2V0VW5yZWFjaGFibGVVUkwodW5yZWFjaGFibGVVUkwpOwogCiAgICAgcHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhodG1sU3RyaW5n LCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCksIG1fcGFnZUlEKTsKKyAgICBwcm9jZXNzKCktPnJl c3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6Omxv YWRQbGFpblRleHRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcpCkBAIC00MjcsMTMgKzQzMywx NiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFBsYWluVGV4dFN0cmluZyhjCiAgICAgICAgIHJl YXR0YWNoVG9XZWJQcm9jZXNzKCk7CiAKICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkxvYWRQbGFpblRleHRTdHJpbmcoc3RyaW5nKSwgbV9wYWdlSUQpOworICAgIHByb2Nl c3MoKS0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwogfQogCiB2b2lkIFdlYlBhZ2VQ cm94eTo6c3RvcExvYWRpbmcoKQogewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1 cm47CisKICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlN0b3BMb2FkaW5n KCksIG1fcGFnZUlEKTsKKyAgICBwcm9jZXNzKCktPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3Rh cnQoKTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OnJlbG9hZChib29sIHJlbG9hZEZyb21Pcmln aW4pCkBAIC00NDcsNiArNDU2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlbG9hZChib29sIHJl bG9hZEZybwogICAgIH0KIAogICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 UmVsb2FkKHJlbG9hZEZyb21PcmlnaW4pLCBtX3BhZ2VJRCk7CisgICAgcHJvY2VzcygpLT5yZXNw b25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpnb0Zv cndhcmQoKQpAQCAtNDY2LDYgKzQ3Niw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpnb0ZvcndhcmQo KQogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlOwog ICAgIGluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKEtVUkwoS1VSTCgpLCBmb3J3YXJk SXRlbS0+dXJsKCkpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBwcm9jZXNzKCktPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvRm9yd2FyZChmb3J3YXJkSXRlbS0+aXRlbUlEKCksIHNh bmRib3hFeHRlbnNpb25IYW5kbGUpLCBtX3BhZ2VJRCk7CisgICAgcHJvY2VzcygpLT5yZXNwb25z aXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5OjpjYW5Hb0Zv cndhcmQoKSBjb25zdApAQCAtNDkwLDYgKzUwMSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpnb0Jh Y2soKQogICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxl OwogICAgIGluaXRpYWxpemVTYW5kYm94RXh0ZW5zaW9uSGFuZGxlKEtVUkwoS1VSTCgpLCBiYWNr SXRlbS0+dXJsKCkpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBwcm9jZXNzKCktPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvQmFjayhiYWNrSXRlbS0+aXRlbUlEKCksIHNhbmRib3hF eHRlbnNpb25IYW5kbGUpLCBtX3BhZ2VJRCk7CisgICAgcHJvY2VzcygpLT5yZXNwb25zaXZlbmVz c1RpbWVyKCktPnN0YXJ0KCk7CiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5OjpjYW5Hb0JhY2soKSBj b25zdApAQCAtNTA5LDYgKzUyMSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpnb1RvQmFja0Zvcndh cmRJdGVtKFcKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhh bmRsZTsKICAgICBpbml0aWFsaXplU2FuZGJveEV4dGVuc2lvbkhhbmRsZShLVVJMKEtVUkwoKSwg aXRlbS0+dXJsKCkpLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKICAgICBwcm9jZXNzKCktPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0oaXRlbS0+aXRlbUlEKCks IHNhbmRib3hFeHRlbnNpb25IYW5kbGUpLCBtX3BhZ2VJRCk7CisgICAgcHJvY2VzcygpLT5yZXNw b25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRD aGFuZ2VCYWNrRm9yd2FyZExpc3QoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogYWRkZWQsIFZlY3Rv cjxSZWZQdHI8QVBJT2JqZWN0PiA+KiByZW1vdmVkKQpJbmRleDogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gODU2NDEpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzNCw2ICsxMzQsMjIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCitjbGFzcyBTZW5kU3RvcFJlc3BvbnNpdmVuZXNzVGltZXIgeworcHVibGlj OgorICAgIFNlbmRTdG9wUmVzcG9uc2l2ZW5lc3NUaW1lcihXZWJQYWdlKiBwYWdlKQorICAgICAg ICA6IG1fcGFnZShwYWdlKQorICAgIHsKKyAgICB9CisgICAgCisgICAgflNlbmRTdG9wUmVzcG9u c2l2ZW5lc3NUaW1lcigpCisgICAgeworICAgICAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6U3RvcFJlc3BvbnNpdmVuZXNzVGltZXIoKSk7CisgICAgfQorCitwcml2YXRl OgorICAgIFdlYlBhZ2UqIG1fcGFnZTsKK307CisgICAgCiAjaWZuZGVmIE5ERUJVRwogc3RhdGlj IFdURjo6UmVmQ291bnRlZExlYWtDb3VudGVyIHdlYlBhZ2VDb3VudGVyKCJXZWJQYWdlIik7CiAj ZW5kaWYKQEAgLTQyNiw2ICs0NDIsOCBAQCB2b2lkIFdlYlBhZ2U6OmNsb3NlKCkKIAogdm9pZCBX ZWJQYWdlOjp0cnlDbG9zZSgpCiB7CisgICAgU2VuZFN0b3BSZXNwb25zaXZlbmVzc1RpbWVyIHN0 b3BwZXIodGhpcyk7CisKICAgICBpZiAoIW1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVy KCktPnNob3VsZENsb3NlKCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtNDQ0LDEyICs0NjIsMTYg QEAgdm9pZCBXZWJQYWdlOjpsb2FkVVJMKGNvbnN0IFN0cmluZyYgdXJsLAogCiB2b2lkIFdlYlBh Z2U6OmxvYWRVUkxSZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKQogeworICAg IFNlbmRTdG9wUmVzcG9uc2l2ZW5lc3NUaW1lciBzdG9wcGVyKHRoaXMpOworCiAgICAgbV9zYW5k Ym94RXh0ZW5zaW9uVHJhY2tlci5iZWdpbkxvYWQobV9tYWluRnJhbWUuZ2V0KCksIHNhbmRib3hF eHRlbnNpb25IYW5kbGUpOwogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkt PmxvYWQocmVxdWVzdCwgZmFsc2UpOwogfQogCiB2b2lkIFdlYlBhZ2U6OmxvYWREYXRhKFBhc3NS ZWZQdHI8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUs IGNvbnN0IFN0cmluZyYgZW5jb2RpbmdOYW1lLCBjb25zdCBLVVJMJiBiYXNlVVJMLCBjb25zdCBL VVJMJiB1bnJlYWNoYWJsZVVSTCkKIHsKKyAgICBTZW5kU3RvcFJlc3BvbnNpdmVuZXNzVGltZXIg c3RvcHBlcih0aGlzKTsKKwogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KGJhc2VVUkwpOwog ICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRhKHNoYXJlZEJ1ZmZlciwgTUlNRVR5cGUs IGVuY29kaW5nTmFtZSwgdW5yZWFjaGFibGVVUkwpOwogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJh bWUoKS0+bG9hZGVyKCktPmxvYWQocmVxdWVzdCwgc3Vic3RpdHV0ZURhdGEsIGZhbHNlKTsKQEAg LTUwMSw2ICs1MjMsOCBAQCB2b2lkIFdlYlBhZ2U6OnN0b3BMb2FkaW5nRnJhbWUodWludDY0X3Qg CiAKIHZvaWQgV2ViUGFnZTo6c3RvcExvYWRpbmcoKQogeworICAgIFNlbmRTdG9wUmVzcG9uc2l2 ZW5lc3NUaW1lciBzdG9wcGVyKHRoaXMpOworCiAgICAgbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgp LT5sb2FkZXIoKS0+c3RvcEZvclVzZXJDYW5jZWwoKTsKIH0KIApAQCAtNTExLDExICs1MzUsMTUg QEAgdm9pZCBXZWJQYWdlOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZQogCiB2b2lkIFdlYlBh Z2U6OnJlbG9hZChib29sIHJlbG9hZEZyb21PcmlnaW4pCiB7CisgICAgU2VuZFN0b3BSZXNwb25z aXZlbmVzc1RpbWVyIHN0b3BwZXIodGhpcyk7CisKICAgICBtX21haW5GcmFtZS0+Y29yZUZyYW1l KCktPmxvYWRlcigpLT5yZWxvYWQocmVsb2FkRnJvbU9yaWdpbik7CiB9CiAKIHZvaWQgV2ViUGFn ZTo6Z29Gb3J3YXJkKHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlELCBjb25zdCBTYW5kYm94RXh0 ZW5zaW9uOjpIYW5kbGUmIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpCiB7CisgICAgU2VuZFN0b3BS ZXNwb25zaXZlbmVzc1RpbWVyIHN0b3BwZXIodGhpcyk7CisKICAgICBIaXN0b3J5SXRlbSogaXRl bSA9IFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjppdGVtRm9ySUQoYmFja0ZvcndhcmRJdGVtSUQp OwogICAgIEFTU0VSVChpdGVtKTsKICAgICBpZiAoIWl0ZW0pCkBAIC01MjcsNiArNTU1LDggQEAg dm9pZCBXZWJQYWdlOjpnb0ZvcndhcmQodWludDY0X3QgYmFja0ZvcgogCiB2b2lkIFdlYlBhZ2U6 OmdvQmFjayh1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCwgY29uc3QgU2FuZGJveEV4dGVuc2lv bjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKQogeworICAgIFNlbmRTdG9wUmVzcG9u c2l2ZW5lc3NUaW1lciBzdG9wcGVyKHRoaXMpOworCiAgICAgSGlzdG9yeUl0ZW0qIGl0ZW0gPSBX ZWJCYWNrRm9yd2FyZExpc3RQcm94eTo6aXRlbUZvcklEKGJhY2tGb3J3YXJkSXRlbUlEKTsKICAg ICBBU1NFUlQoaXRlbSk7CiAgICAgaWYgKCFpdGVtKQpAQCAtNTM4LDYgKzU2OCw4IEBAIHZvaWQg V2ViUGFnZTo6Z29CYWNrKHVpbnQ2NF90IGJhY2tGb3J3YXIKIAogdm9pZCBXZWJQYWdlOjpnb1Rv QmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlELCBjb25zdCBTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGUmIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpCiB7CisgICAgU2VuZFN0 b3BSZXNwb25zaXZlbmVzc1RpbWVyIHN0b3BwZXIodGhpcyk7CisKICAgICBIaXN0b3J5SXRlbSog aXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjppdGVtRm9ySUQoYmFja0ZvcndhcmRJdGVt SUQpOwogICAgIEFTU0VSVChpdGVtKTsKICAgICBpZiAoIWl0ZW0pCg==