128342 2014-02-06 16:20:35 -0800 Remove ChildProcess::m_activeTasks 2014-02-06 17:52:52 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 977597 0 barraclough 2014-02-06 16:20:35 -0800 Currently we funnel a number of different user activities to a single UserActivity object, which requires a call down from WebCore to WebKit2. Split these out so we can track them separately. 977606 1 223402 barraclough 2014-02-06 16:28:25 -0800 Created attachment 223402 Fix 977607 2 223402 andersca 2014-02-06 16:30:58 -0800 Comment on attachment 223402 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=223402&action=review > Source/WebKit2/PluginProcess/PluginProcess.cpp:63 > + , m_connectionActivity("PluginProcess conection activity.") Typo conection. > Source/WebKit2/Shared/ActivityAssertion.h:37 > + ActivityAssertion(UserActivity&); I'd make this explicit. 977663 3 barraclough 2014-02-06 17:52:52 -0800 Transmitting file data ............... Committed revision 163591. 223402 2014-02-06 16:28:25 -0800 2014-02-06 16:30:58 -0800 Fix 128342.1.patch text/plain 14571 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MzU1NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE0LTAyLTA2ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgQ2hp bGRQcm9jZXNzOjptX2FjdGl2ZVRhc2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjgzNDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDdXJyZW50bHkgd2UgZnVubmVsIGEgbnVtYmVyIG9mIGRpZmZlcmVu dCB1c2VyIGFjdGl2aXRpZXMKKyAgICAgICAgdG8gYSBzaW5nbGUgVXNlckFjdGl2aXR5IG9iamVj dCwgd2hpY2ggcmVxdWlyZXMgYSBjYWxsIGRvd24KKyAgICAgICAgZnJvbSBXZWJDb3JlIHRvIFdl YktpdDIuIFNwbGl0IHRoZXNlIG91dCBzbyB3ZSBjYW4gdHJhY2sKKyAgICAgICAgdGhlbSBzZXBh cmF0ZWx5LgorCisgICAgICAgICogcGFnZS9DaHJvbWVDbGllbnQuaDoKKyAgICAgICAgICAgIC0g cmVtb3ZlZCBbaW5jfGRlY11yZW1lbnRBY3RpdmVQYWdlQ291bnQKKyAgICAgICAgKiBwYWdlL1Bh Z2VUaHJvdHRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6UGFnZVRo cm90dGxlcik6CisgICAgICAgICAgICAtIGluY3JlbWVudEFjdGl2ZVBhZ2VDb3VudCAtPiBiZWdp bkFjdGl2aXR5CisgICAgICAgIChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjp+UGFnZVRocm90dGxl cik6CisgICAgICAgICAgICAtIGRlY3JlbWVudEFjdGl2ZVBhZ2VDb3VudCAtPiBlbmRBY3Rpdml0 eQorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6dGhyb3R0bGVQYWdlKToKKyAgICAg ICAgICAgIC0gZGVjcmVtZW50QWN0aXZlUGFnZUNvdW50IC0+IGVuZEFjdGl2aXR5CisgICAgICAg IChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjp1bnRocm90dGxlUGFnZSk6CisgICAgICAgICAgICAt IGluY3JlbWVudEFjdGl2ZVBhZ2VDb3VudCAtPiBiZWdpbkFjdGl2aXR5CisgICAgICAgICogcGFn ZS9QYWdlVGhyb3R0bGVyLmg6CisgICAgICAgICAgICAtIEFkZGVkIG1fcGFnZUFjdGl2aXR5Lgor CiAyMDE0LTAyLTA2ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAog ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTYzNTQyLgpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL0Nocm9tZUNsaWVudC5oCShyZXZpc2lvbiAxNjM1MjMpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL0Nocm9tZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC00MTIsMTIgKzQxMiw2IEBAIHB1 YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVc2VUaWxlZEJhY2tpbmdGb3JGcmFtZVZp ZXcoY29uc3QgRnJhbWVWaWV3KikgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAotICAgIC8vIFRo ZXNlIG1ldGhvZHMgYXJlIHVzZWQgdG8gcmVwb3J0IHBhZ2VzIHRoYXQgYXJlIHBlcmZvcm1pbmcK LSAgICAvLyBzb21lIHRhc2sgdGhhdCB3ZSBjb25zaWRlciB0byBiZSAiYWN0aXZlIiwgYW5kIHNv IHRoZSB1c2VyCi0gICAgLy8gd291bGQgbGlrZWx5IHdhbnQgdGhlIHBhZ2UgdG8gcmVtYWluIHJ1 bm5pbmcgdW5pbnRlcnJ1cHRlZC4KLSAgICB2aXJ0dWFsIHZvaWQgaW5jcmVtZW50QWN0aXZlUGFn ZUNvdW50KCkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGRlY3JlbWVudEFjdGl2ZVBhZ2VDb3VudCgp IHsgfQotCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB+Q2hyb21lQ2xpZW50KCkgeyB9CiB9OwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3BwCShyZXZpc2lvbiAxNjM1MjMp CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00Miw4ICs0Miw5IEBAIFBhZ2VUaHJvdHRsZXI6OlBhZ2VUaHJvdHRsZXIoUGFnZSYgcGFn ZSkKICAgICAsIG1fdGhyb3R0bGVTdGF0ZShQYWdlTm90VGhyb3R0bGVkU3RhdGUpCiAgICAgLCBt X3Rocm90dGxlSHlzdGVyZXNpc1RpbWVyKHRoaXMsICZQYWdlVGhyb3R0bGVyOjp0aHJvdHRsZUh5 c3RlcmVzaXNUaW1lckZpcmVkKQogICAgICwgbV92aXN1YWxseU5vbklkbGUoIlBhZ2UgaXMgbm90 IHZpc3VhbGx5IGlkbGUuIikKKyAgICAsIG1fcGFnZUFjdGl2aXR5KCJQYWdlIGlzIGFjdGl2ZS4i KQogewotICAgIG1fcGFnZS5jaHJvbWUoKS5jbGllbnQoKS5pbmNyZW1lbnRBY3RpdmVQYWdlQ291 bnQoKTsKKyAgICBtX3BhZ2VBY3Rpdml0eS5iZWdpbkFjdGl2aXR5KCk7CiB9CiAKIFBhZ2VUaHJv dHRsZXI6On5QYWdlVGhyb3R0bGVyKCkKQEAgLTU0LDcgKzU1LDcgQEAgUGFnZVRocm90dGxlcjo6 flBhZ2VUaHJvdHRsZXIoKQogICAgICAgICAoKml0KS0+aW52YWxpZGF0ZSgpOwogCiAgICAgaWYg KG1fdGhyb3R0bGVTdGF0ZSAhPSBQYWdlVGhyb3R0bGVkU3RhdGUpCi0gICAgICAgIG1fcGFnZS5j aHJvbWUoKS5jbGllbnQoKS5kZWNyZW1lbnRBY3RpdmVQYWdlQ291bnQoKTsKKyAgICAgICAgbV9w YWdlQWN0aXZpdHkuZW5kQWN0aXZpdHkoKTsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPFBhZ2VBY3Rp dml0eUFzc2VydGlvblRva2VuPiBQYWdlVGhyb3R0bGVyOjpjcmVhdGVBY3Rpdml0eVRva2VuKCkK QEAgLTY2LDcgKzY3LDcgQEAgdm9pZCBQYWdlVGhyb3R0bGVyOjp0aHJvdHRsZVBhZ2UoKQogewog ICAgIG1fdGhyb3R0bGVTdGF0ZSA9IFBhZ2VUaHJvdHRsZWRTdGF0ZTsKIAotICAgIG1fcGFnZS5j aHJvbWUoKS5jbGllbnQoKS5kZWNyZW1lbnRBY3RpdmVQYWdlQ291bnQoKTsKKyAgICBtX3BhZ2VB Y3Rpdml0eS5lbmRBY3Rpdml0eSgpOwogCiAgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbV9wYWdl Lm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgp KSB7CiAgICAgICAgIGlmIChmcmFtZS0+ZG9jdW1lbnQoKSkKQEAgLTg1LDcgKzg2LDcgQEAgdm9p ZCBQYWdlVGhyb3R0bGVyOjp1bnRocm90dGxlUGFnZSgpCiAgICAgICAgIHJldHVybjsKIAogICAg IGlmIChvbGRTdGF0ZSA9PSBQYWdlVGhyb3R0bGVkU3RhdGUpCi0gICAgICAgIG1fcGFnZS5jaHJv bWUoKS5jbGllbnQoKS5pbmNyZW1lbnRBY3RpdmVQYWdlQ291bnQoKTsKKyAgICAgICAgbV9wYWdl QWN0aXZpdHkuYmVnaW5BY3Rpdml0eSgpOwogICAgIAogICAgIGZvciAoRnJhbWUqIGZyYW1lID0g Jm1fcGFnZS5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJz ZU5leHQoKSkgewogICAgICAgICBpZiAoZnJhbWUtPmRvY3VtZW50KCkpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2VUaHJvdHRsZXIuaAkocmV2aXNpb24gMTYzNTIzKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTc1LDYgKzc1LDcgQEAg cHJpdmF0ZToKICAgICBUaW1lcjxQYWdlVGhyb3R0bGVyPiBtX3Rocm90dGxlSHlzdGVyZXNpc1Rp bWVyOwogICAgIEhhc2hTZXQ8UGFnZUFjdGl2aXR5QXNzZXJ0aW9uVG9rZW4qPiBtX2FjdGl2aXR5 VG9rZW5zOwogICAgIFVzZXJBY3Rpdml0eSBtX3Zpc3VhbGx5Tm9uSWRsZTsKKyAgICBVc2VyQWN0 aXZpdHkgbV9wYWdlQWN0aXZpdHk7CiB9OwogCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAx NjM1NTYpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSw0MyBAQAorMjAxNC0wMi0wNiAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBh cHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIENoaWxkUHJvY2Vzczo6bV9hY3RpdmVUYXNrcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MzQyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5 IHdlIGZ1bm5lbCBhIG51bWJlciBvZiBkaWZmZXJlbnQgdXNlciBhY3Rpdml0aWVzCisgICAgICAg IHRvIGEgc2luZ2xlIFVzZXJBY3Rpdml0eSBvYmplY3QsIHdoaWNoIHJlcXVpcmVzIGEgY2FsbCBk b3duCisgICAgICAgIGZyb20gV2ViQ29yZSB0byBXZWJLaXQyLiBTcGxpdCB0aGVzZSBvdXQgc28g d2UgY2FuIHRyYWNrCisgICAgICAgIHRoZW0gc2VwYXJhdGVseS4KKworICAgICAgICAqIFBsdWdp blByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nl c3M6OlBsdWdpblByb2Nlc3MpOgorICAgICAgICAgICAgLSBhZGRlZCBtX2Nvbm5lY3Rpb25BY3Rp dml0eS4KKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3MuaDoKKyAgICAgICAg KFdlYktpdDo6UGx1Z2luUHJvY2Vzczo6Y29ubmVjdGlvbkFjdGl2aXR5KToKKyAgICAgICAgICAg IC0gYWRkZWQgbV9jb25uZWN0aW9uQWN0aXZpdHkuCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9X ZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDb25u ZWN0aW9uOjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzQ29ubmVjdGlvbjo6ZGVzdHJveVBsdWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3NDb25uZWN0aW9uOjpjcmVhdGVQbHVnaW4pOgorICAgICAgICAgICAgLSB1c2UgY29ubmVjdGlv bkFjdGl2aXR5CisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01hYy5t bToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplUHJv Y2Vzcyk6CisgICAgICAgICAgICAtIHVzZSBhIHNlcGFyYXRlIFVzZXJBY3Rpdml0eSBmb3IgSmF2 YS4KKyAgICAgICAgKiBTaGFyZWQvQWN0aXZpdHlBc3NlcnRpb24uY3BwOgorICAgICAgICAoV2Vi S2l0OjpBY3Rpdml0eUFzc2VydGlvbjo6QWN0aXZpdHlBc3NlcnRpb24pOgorICAgICAgICAoV2Vi S2l0OjpBY3Rpdml0eUFzc2VydGlvbjo6fkFjdGl2aXR5QXNzZXJ0aW9uKToKKyAgICAgICAgKiBT aGFyZWQvQWN0aXZpdHlBc3NlcnRpb24uaDoKKyAgICAgICAgICAgIC0gQ2hpbGRQcm9jZXNzIC0+ IFVzZXJBY3Rpdml0eQorICAgICAgICAqIFNoYXJlZC9DaGlsZFByb2Nlc3MuY3BwOgorICAgICAg ICAoV2ViS2l0OjpDaGlsZFByb2Nlc3M6OkNoaWxkUHJvY2Vzcyk6CisgICAgICAgICogU2hhcmVk L0NoaWxkUHJvY2Vzcy5oOgorICAgICAgICAgICAgLSByZW1vdmUgbV9hY3RpdmVUYXNrcy4KKyAg ICAgICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNzOjpwcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaDoK KyAgICAgICAgICAgIC0gcmVtb3ZlZCBbaW5jfGRlY11yZW1lbnRBY3RpdmVQYWdlQ291bnQKKwog MjAxNC0wMi0wNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlcGxhY2Ug4oCZIHdpdGggJyB0byBzaWxlbmNlIHRoZSBjaGVjay1mb3Itd2Via2l0LWZy YW1ld29yay1pbmNsdWRlLWNvbnNpc3RlbmN5IHNjcmlwdC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcAkocmV2aXNpb24gMTYzNTIzKQor KysgU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjAsNiArNjAsNyBAQCBQbHVnaW5Qcm9jZXNzOjpQbHVnaW5Qcm9jZXNzKCkK ICNpZiBQTEFURk9STShNQUMpCiAgICAgLCBtX2NvbXBvc2l0aW5nUmVuZGVyU2VydmVyUG9ydChN QUNIX1BPUlRfTlVMTCkKICNlbmRpZgorICAgICwgbV9jb25uZWN0aW9uQWN0aXZpdHkoIlBsdWdp blByb2Nlc3MgY29uZWN0aW9uIGFjdGl2aXR5LiIpCiB7CiAgICAgTmV0c2NhcGVQbHVnaW46OnNl dFNldEV4Y2VwdGlvbkZ1bmN0aW9uKFdlYlByb2Nlc3NDb25uZWN0aW9uOjpzZXRHbG9iYWxFeGNl cHRpb24pOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9j ZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Q cm9jZXNzLmgJKHJldmlzaW9uIDE2MzUyMykKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvUGx1Z2luUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2Myw4IEBAIHB1Ymxp YzoKICAgICBib29sIG9wZW5GaWxlKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKTsKICNlbmRpZgog CisgICAgVXNlckFjdGl2aXR5JiBjb25uZWN0aW9uQWN0aXZpdHkoKSB7IHJldHVybiBtX2Nvbm5l Y3Rpb25BY3Rpdml0eTsgfQorCiBwcml2YXRlOgogICAgIFBsdWdpblByb2Nlc3MoKTsKICAgICB+ UGx1Z2luUHJvY2VzcygpOwpAQCAtMTE3LDYgKzExOSw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAog ICAgIHN0YXRpYyB2b2lkIGxvd01lbW9yeUhhbmRsZXIoYm9vbCBjcml0aWNhbCk7CisgICAgVXNl ckFjdGl2aXR5IG1fY29ubmVjdGlvbkFjdGl2aXR5OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0 aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlBy b2Nlc3NDb25uZWN0aW9uLmNwcAkocmV2aXNpb24gMTYzNTIzKQorKysgU291cmNlL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE0Miw3ICsxNDIsNyBAQCB2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkaWRSZWNlaXZlTWVz CiB2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpD b25uZWN0aW9uKiBjb25uZWN0aW9uLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyLCBzdGQ6 OnVuaXF1ZV9wdHI8SVBDOjpNZXNzYWdlRW5jb2Rlcj4mIHJlcGx5RW5jb2RlcikKIHsKICAgICAv LyBGb3JjZSBhbGwgdGltZXJzIHRvIHJ1biBhdCBmdWxsIHNwZWVkIHdoZW4gcHJvY2Vzc2luZyBh IHN5bmNocm9ub3VzIG1lc3NhZ2UKLSAgICBBY3Rpdml0eUFzc2VydGlvbiBhY3Rpdml0eUFzc2Vy dGlvbihQbHVnaW5Qcm9jZXNzOjpzaGFyZWQoKSk7CisgICAgQWN0aXZpdHlBc3NlcnRpb24gYWN0 aXZpdHlBc3NlcnRpb24oUGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbkFjdGl2aXR5 KCkpOwogCiAgICAgQ29ubmVjdGlvblN0YWNrOjpDdXJyZW50Q29ubmVjdGlvblB1c2hlciBjdXJy ZW50Q29ubmVjdGlvbihDb25uZWN0aW9uU3RhY2s6OnNoYXJlZCgpLCBjb25uZWN0aW9uKTsKIApA QCAtMTgxLDcgKzE4MSw3IEBAIHZvaWQgV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZENsb3NlKElQ QzoKIHZvaWQgV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRlc3Ryb3lQbHVnaW4odWludDY0X3QgcGx1 Z2luSW5zdGFuY2VJRCwgYm9vbCBhc3luY2hyb25vdXNDcmVhdGlvbkluY29tcGxldGUpCiB7CiAg ICAgLy8gRW5zdXJlIHdlIGRvbid0IGNsYW1wIGFueSB0aW1lcnMgZHVyaW5nIGRlc3RydWN0aW9u Ci0gICAgQWN0aXZpdHlBc3NlcnRpb24gYWN0aXZpdHlBc3NlcnRpb24oUGx1Z2luUHJvY2Vzczo6 c2hhcmVkKCkpOworICAgIEFjdGl2aXR5QXNzZXJ0aW9uIGFjdGl2aXR5QXNzZXJ0aW9uKFBsdWdp blByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb25BY3Rpdml0eSgpKTsKIAogICAgIFBsdWdpbkNv bnRyb2xsZXJQcm94eSogcGx1Z2luQ29udHJvbGxlclByb3h5ID0gbV9wbHVnaW5Db250cm9sbGVy cy5nZXQocGx1Z2luSW5zdGFuY2VJRCk7CiAgICAgCkBAIC0yMzAsNyArMjMwLDcgQEAgdm9pZCBX ZWJQcm9jZXNzQ29ubmVjdGlvbjo6Y3JlYXRlUGx1Z2luSQogdm9pZCBXZWJQcm9jZXNzQ29ubmVj dGlvbjo6Y3JlYXRlUGx1Z2luKGNvbnN0IFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVycyYgY3JlYXRp b25QYXJhbWV0ZXJzLCBQYXNzUmVmUHRyPE1lc3NhZ2VzOjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6 Q3JlYXRlUGx1Z2luOjpEZWxheWVkUmVwbHk+IHJlcGx5KQogewogICAgIC8vIEVuc3VyZSB3ZSBk b24ndCBjbGFtcCBhbnkgdGltZXJzIGR1cmluZyBpbml0aWFsaXphdGlvbgotICAgIEFjdGl2aXR5 QXNzZXJ0aW9uIGFjdGl2aXR5QXNzZXJ0aW9uKFBsdWdpblByb2Nlc3M6OnNoYXJlZCgpKTsKKyAg ICBBY3Rpdml0eUFzc2VydGlvbiBhY3Rpdml0eUFzc2VydGlvbihQbHVnaW5Qcm9jZXNzOjpzaGFy ZWQoKS5jb25uZWN0aW9uQWN0aXZpdHkoKSk7CiAKICAgICBQbHVnaW5Db250cm9sbGVyUHJveHkq IHBsdWdpbkNvbnRyb2xsZXJQcm94eSA9IG1fcGx1Z2luQ29udHJvbGxlcnMuZ2V0KGNyZWF0aW9u UGFyYW1ldGVycy5wbHVnaW5JbnN0YW5jZUlEKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvUGx1 Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNzTWFjLm1tCShyZXZpc2lvbiAx NjM1MjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5Qcm9jZXNz TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MzgsNyArNDM4LDcgQEAgdm9pZCBQbHVnaW5Qcm9j ZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVQcgogCiAgICAgLy8gRklYTUU6IFdvcmthcm91bmQgZm9y IEphdmEgbm90IGxpa2luZyBpdHMgcGx1Z2luIHByb2Nlc3MgdG8gYmUgc3VwcmVzc2VkIC0gPHJk YXI6Ly9wcm9ibGVtLzE0MjY3ODQzPgogICAgIGlmIChtX3BsdWdpbkJ1bmRsZUlkZW50aWZpZXIg PT0gImNvbS5vcmFjbGUuamF2YS5KYXZhQXBwbGV0UGx1Z2luIikKLSAgICAgICAgaW5jcmVtZW50 QWN0aXZlVGFza0NvdW50KCk7CisgICAgICAgIChuZXcgVXNlckFjdGl2aXR5KCJjb20ub3JhY2xl LmphdmEuSmF2YUFwcGxldFBsdWdpbiIpKS0+YmVnaW5BY3Rpdml0eSgpOwogfQogCiB2b2lkIFBs dWdpblByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFtZShjb25zdCBDaGlsZFByb2Nlc3NJbml0 aWFsaXphdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvQWN0aXZpdHlBc3NlcnRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9BY3Rpdml0eUFzc2VydGlvbi5jcHAJKHJldmlzaW9uIDE2MzUyMykKKysrIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BY3Rpdml0eUFzc2VydGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI2LDE5ICsyNiwxNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkFjdGl2aXR5 QXNzZXJ0aW9uLmgiCiAKLSNpbmNsdWRlICJDaGlsZFByb2Nlc3MuaCIKLQogbmFtZXNwYWNlIFdl YktpdCB7CiAKLUFjdGl2aXR5QXNzZXJ0aW9uOjpBY3Rpdml0eUFzc2VydGlvbihDaGlsZFByb2Nl c3MmIHByb2Nlc3MpCi0gICAgOiBtX3Byb2Nlc3MocHJvY2VzcykKK0FjdGl2aXR5QXNzZXJ0aW9u OjpBY3Rpdml0eUFzc2VydGlvbihVc2VyQWN0aXZpdHkmIGFjdGl2aXR5KQorICAgIDogbV9hY3Rp dml0eShhY3Rpdml0eSkKIHsKLSAgICBtX3Byb2Nlc3MuaW5jcmVtZW50QWN0aXZlVGFza0NvdW50 KCk7CisgICAgbV9hY3Rpdml0eS5iZWdpbkFjdGl2aXR5KCk7CiB9CiAKIEFjdGl2aXR5QXNzZXJ0 aW9uOjp+QWN0aXZpdHlBc3NlcnRpb24oKQogewotICAgIG1fcHJvY2Vzcy5kZWNyZW1lbnRBY3Rp dmVUYXNrQ291bnQoKTsKKyAgICBtX2FjdGl2aXR5LmVuZEFjdGl2aXR5KCk7CiB9CiAKIH0KSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BY3Rpdml0eUFzc2VydGlvbi5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BY3Rpdml0eUFzc2VydGlvbi5oCShyZXZpc2lvbiAx NjM1MjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQWN0aXZpdHlBc3NlcnRpb24uaAkod29y a2luZyBjb3B5KQpAQCAtMjYsMjAgKzI2LDE5IEBACiAjaWZuZGVmIEFjdGl2aXR5QXNzZXJ0aW9u X2gKICNkZWZpbmUgQWN0aXZpdHlBc3NlcnRpb25faAogCisjaW5jbHVkZSA8V2ViQ29yZS9Vc2Vy QWN0aXZpdHkuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKLWNsYXNzIENoaWxkUHJvY2VzczsKLQogY2xhc3MgQWN0aXZpdHlBc3NlcnRpb24g ewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEFjdGl2aXR5QXNzZXJ0aW9uKTsKIHB1YmxpYzoK LSAgICBBY3Rpdml0eUFzc2VydGlvbihDaGlsZFByb2Nlc3MmKTsKKyAgICBBY3Rpdml0eUFzc2Vy dGlvbihVc2VyQWN0aXZpdHkmKTsKICAgICB+QWN0aXZpdHlBc3NlcnRpb24oKTsKIAogcHJpdmF0 ZToKLSAgICBDaGlsZFByb2Nlc3MmIG1fcHJvY2VzczsKKyAgICBVc2VyQWN0aXZpdHkmIG1fYWN0 aXZpdHk7CiB9OwogCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzLmNw cAkocmV2aXNpb24gMTYzNTIzKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vz cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2LDYgQEAgQ2hpbGRQcm9jZXNzOjpDaGls ZFByb2Nlc3MoKQogICAgICwgbV90ZXJtaW5hdGlvbkNvdW50ZXIoMCkKICAgICAsIG1fdGVybWlu YXRpb25UaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZDaGlsZFByb2Nlc3M6OnRlcm1pbmF0 aW9uVGltZXJGaXJlZCkKICAgICAsIG1fcHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWQoIlByb2Nl c3MgU3VwcHJlc3Npb24gRGlzYWJsZWQgYnkgVUlQcm9jZXNzIikKLSAgICAsIG1fYWN0aXZlVGFz a3MoIlByb2Nlc3MgU3VwcHJlc3Npb24gRGlzYWJsZWQgYnkgV2ViUHJvY2VzcyIpCiB7CiB9CiAK QEAgLTg1LDE2ICs4NCw2IEBAIHZvaWQgQ2hpbGRQcm9jZXNzOjpzZXRQcm9jZXNzU3VwcHJlc3Np b24KICAgICAgICAgbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZC5iZWdpbkFjdGl2aXR5KCk7 CiB9CiAKLXZvaWQgQ2hpbGRQcm9jZXNzOjppbmNyZW1lbnRBY3RpdmVUYXNrQ291bnQoKQotewot ICAgIG1fYWN0aXZlVGFza3MuYmVnaW5BY3Rpdml0eSgpOwotfQotCi12b2lkIENoaWxkUHJvY2Vz czo6ZGVjcmVtZW50QWN0aXZlVGFza0NvdW50KCkKLXsKLSAgICBtX2FjdGl2ZVRhc2tzLmVuZEFj dGl2aXR5KCk7Ci19Ci0KIHZvaWQgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXplUHJvY2Vzcyhjb25z dCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmKQogewogfQpJbmRleDogU291 cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuaAkocmV2aXNpb24gMTYzNTIzKQorKysgU291cmNl L1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw4ICs2 NCw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZChi b29sKTsKICAgICBib29sIHByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQoKSBjb25zdCB7IHJldHVy biAhbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZC5pc0FjdGl2ZSgpOyB9Ci0gICAgdm9pZCBp bmNyZW1lbnRBY3RpdmVUYXNrQ291bnQoKTsKLSAgICB2b2lkIGRlY3JlbWVudEFjdGl2ZVRhc2tD b3VudCgpOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgc2V0QXBwbGljYXRpb25Jc0Rh ZW1vbigpOwpAQCAtMTE5LDcgKzExNyw2IEBAIHByaXZhdGU6CiAgICAgSVBDOjpNZXNzYWdlUmVj ZWl2ZXJNYXAgbV9tZXNzYWdlUmVjZWl2ZXJNYXA7CiAKICAgICBVc2VyQWN0aXZpdHkgbV9wcm9j ZXNzU3VwcHJlc3Npb25EaXNhYmxlZDsKLSAgICBVc2VyQWN0aXZpdHkgbV9hY3RpdmVUYXNrczsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cAkocmV2aXNpb24gMTYzNTIzKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MzUsMTQgKzkz NSw0IEBAIGJvb2wgV2ViQ2hyb21lQ2xpZW50OjpzaG91bGRVc2VUaWxlZEJhY2sKICAgICByZXR1 cm4gbV9wYWdlLT5kcmF3aW5nQXJlYSgpLT5zaG91bGRVc2VUaWxlZEJhY2tpbmdGb3JGcmFtZVZp ZXcoZnJhbWVWaWV3KTsKIH0KIAotdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmluY3JlbWVudEFjdGl2 ZVBhZ2VDb3VudCgpCi17Ci0gICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuaW5jcmVtZW50QWN0aXZl VGFza0NvdW50KCk7Ci19Ci0KLXZvaWQgV2ViQ2hyb21lQ2xpZW50OjpkZWNyZW1lbnRBY3RpdmVQ YWdlQ291bnQoKQotewotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmRlY3JlbWVudEFjdGl2ZVRh c2tDb3VudCgpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQuaAkocmV2aXNpb24gMTYzNTIzKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjcyLDkg KzI3Miw2IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkVXNlVGlsZWRCYWNr aW5nRm9yRnJhbWVWaWV3KGNvbnN0IFdlYkNvcmU6OkZyYW1lVmlldyopIGNvbnN0IG92ZXJyaWRl OwogCi0gICAgdmlydHVhbCB2b2lkIGluY3JlbWVudEFjdGl2ZVBhZ2VDb3VudCgpIG92ZXJyaWRl OwotICAgIHZpcnR1YWwgdm9pZCBkZWNyZW1lbnRBY3RpdmVQYWdlQ291bnQoKSBvdmVycmlkZTsK LQogICAgIFN0cmluZyBtX2NhY2hlZFRvb2xUaXA7CiAgICAgbXV0YWJsZSBSZWZQdHI8V2ViRnJh bWU+IG1fY2FjaGVkRnJhbWVTZXRMYXJnZXN0RnJhbWU7CiAgICAgbXV0YWJsZSBib29sIG1fY2Fj aGVkTWFpbkZyYW1lSGFzSG9yaXpvbnRhbFNjcm9sbGJhcjsK