50850 2010-12-10 15:21:19 -0800 Make WKContextGetStatistics gather global statistics 2010-12-10 15:50:46 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 320447 0 andersca 2010-12-10 15:21:19 -0800 Make WKContextGetStatistics gather global statistics 320449 1 76267 andersca 2010-12-10 15:24:09 -0800 Created attachment 76267 Patch 320453 2 76267 sullivan 2010-12-10 15:31:49 -0800 Comment on attachment 76267 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76267&action=review > WebKit2/UIProcess/API/C/WKContextPrivate.h:43 > +WK_EXPORT void WKContextGetStatistics(WKContextStatistics* statistics); Maybe it should be renamed something like WKContextGetGlobalStatistics() since it no longer pays attention to the context? > WebKitTools/ChangeLog:8 > + Break the statistics window. This could be elaborated a bit. 320468 3 andersca 2010-12-10 15:50:46 -0800 Committed r73816: <http://trac.webkit.org/changeset/73816> 76267 2010-12-10 15:24:09 -0800 2010-12-10 15:31:49 -0800 Patch bug-50850-20101210152408.patch text/plain 11130 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NmMwOTk2MjgwMTJkYTljY2I3NzM5YjQ2MjgwM2UxYzczNTI2ZTNjMC4uMzViYjU2OTRjN2ZjOTJj YTAyNjI3NDEwMTlmMGQyZmJlYjlkMjJhZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMC0xMi0xMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgV0tDb250ZXh0R2V0U3RhdGlzdGljcyBn YXRoZXIgZ2xvYmFsIHN0YXRpc3RpY3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUwODUwCisKKyAgICAgICAgQ2hhbmdlIFdLQ29udGV4dEdldFN0YXRp c3RpY3MgdG8gd29yayBvbiBhbGwgb2JqZWN0cyBpbiB0aGUgcHJvY2VzcywgYW5kCisgICAgICAg IG1ha2UgaXQgbW9yZSByb2J1c3QgYnkgaW5jcmVtZW50aW5nL2RlY3JlbWVudGluZyB0aGUgY291 bnRzIGluIHRoZSBjb25zdHJ1Y3RvcgorICAgICAgICBhbmQgZGVzdHJ1Y3RvciByZXNwZWN0aXZl bHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcDoKKyAgICAgICAg KFdLQ29udGV4dEdldFN0YXRpc3RpY3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0Nv bnRleHRQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgor ICAgICAgICAoLVtXS1ZpZXcgaW5pdFdpdGhGcmFtZTpwYWdlTmFtZXNwYWNlUmVmOnBhZ2VHcm91 cFJlZjpdKToKKyAgICAgICAgKC1bV0tWaWV3IGRlYWxsb2NdKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnN0YXRpc3Rp Y3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0Lmg6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYkZyYW1lUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5OjpX ZWJGcmFtZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6fldlYkZyYW1l UHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlTmFtZXNwYWNlLmNwcDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZU5hbWVzcGFjZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQ cm94eSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6fldlYlBhZ2VQcm94eSk6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCiAyMDEwLTEyLTEwICBKb2NlbHlu IFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tD b250ZXh0LmNwcAppbmRleCAzNzUyZmE4YzExMTBkODkyNzNhZTRkNjY4MTYyMzUyNzMyMDQzMGUx Li41ZGU4ZGUxNzkyY2RmOGViYTJlN2UwZTBkNTdlYmI5MzhlOTI5MDkxIDEwMDY0NAotLS0gYS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAKQEAgLTkyLDkgKzkyLDEzIEBAIHZvaWQgV0tDb250ZXh0 UG9zdE1lc3NhZ2VUb0luamVjdGVkQnVuZGxlKFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1N0 cmluZ1JlZiBtCiAgICAgdG9JbXBsKGNvbnRleHRSZWYpLT5wb3N0TWVzc2FnZVRvSW5qZWN0ZWRC dW5kbGUodG9JbXBsKG1lc3NhZ2VOYW1lUmVmKS0+c3RyaW5nKCksIHRvSW1wbChtZXNzYWdlQm9k eVJlZikpOwogfQogCi12b2lkIFdLQ29udGV4dEdldFN0YXRpc3RpY3MoV0tDb250ZXh0UmVmIGNv bnRleHRSZWYsIFdLQ29udGV4dFN0YXRpc3RpY3MqIHN0YXRpc3RpY3MpCit2b2lkIFdLQ29udGV4 dEdldFN0YXRpc3RpY3MoV0tDb250ZXh0U3RhdGlzdGljcyogc3RhdGlzdGljcykKIHsKLSAgICB0 b0ltcGwoY29udGV4dFJlZiktPmdldFN0YXRpc3RpY3Moc3RhdGlzdGljcyk7CisgICAgY29uc3Qg V2ViQ29udGV4dDo6U3RhdGlzdGljcyYgd2ViQ29udGV4dFN0YXRpc3RpY3MgPSBXZWJDb250ZXh0 OjpzdGF0aXN0aWNzKCk7CisKKyAgICBzdGF0aXN0aWNzLT53a1ZpZXdDb3VudCA9IHdlYkNvbnRl eHRTdGF0aXN0aWNzLndrVmlld0NvdW50OworICAgIHN0YXRpc3RpY3MtPndrUGFnZUNvdW50ID0g d2ViQ29udGV4dFN0YXRpc3RpY3Mud2tQYWdlQ291bnQ7CisgICAgc3RhdGlzdGljcy0+d2tGcmFt ZUNvdW50ID0gd2ViQ29udGV4dFN0YXRpc3RpY3Mud2tWaWV3Q291bnQ7CiB9CiAKIHZvaWQgV0tD b250ZXh0QWRkVmlzaXRlZExpbmsoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVm IHZpc2l0ZWRVUkwpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRl eHRQcml2YXRlLmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmgK aW5kZXggMDE1MWU5ZDllYTUyMDY1NTlhOWUxYjcxYTQ0YTY0YWYxZjliNzU4OC4uMmJhNDI4Yjhi MTQwYjgyYjExMWQzYmQ3MTU1MjA2ODMyZmQyNjdiYiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tDb250ZXh0UHJpdmF0ZS5oCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLQ29udGV4dFByaXZhdGUuaApAQCAtMzQsMTMgKzM0LDEzIEBAIGV4dGVybiAiQyIgewog I2VuZGlmCiAKIHN0cnVjdCBXS0NvbnRleHRTdGF0aXN0aWNzIHsKLSAgICBzaXplX3QgbnVtYmVy T2ZXS1BhZ2VOYW1lc3BhY2VzOwotICAgIHNpemVfdCBudW1iZXJPZldLUGFnZXM7Ci0gICAgc2l6 ZV90IG51bWJlck9mV0tGcmFtZXM7CisgICAgdW5zaWduZWQgd2tWaWV3Q291bnQ7CisgICAgdW5z aWduZWQgd2tQYWdlQ291bnQ7CisgICAgdW5zaWduZWQgd2tGcmFtZUNvdW50OwogfTsKIHR5cGVk ZWYgc3RydWN0IFdLQ29udGV4dFN0YXRpc3RpY3MgV0tDb250ZXh0U3RhdGlzdGljczsKIAotV0tf RVhQT1JUIHZvaWQgV0tDb250ZXh0R2V0U3RhdGlzdGljcyhXS0NvbnRleHRSZWYgY29udGV4dCwg V0tDb250ZXh0U3RhdGlzdGljcyogc3RhdGlzdGljcyk7CitXS19FWFBPUlQgdm9pZCBXS0NvbnRl eHRHZXRTdGF0aXN0aWNzKFdLQ29udGV4dFN0YXRpc3RpY3MqIHN0YXRpc3RpY3MpOwogCiBXS19F WFBPUlQgV0tDb250ZXh0UmVmIFdLQ29udGV4dEdldFNoYXJlZFRocmVhZENvbnRleHQoKTsKIApk aWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCBiOGVhNTMzMWNjZWJmNjBhMDJjZTYz YWI2YzNmZThjNmI4ODY4NWIyLi43YzE0MjRlYzhkOWViOWMwYmVmMzE0ZmI5MWY4MDYxYjk5NWFi YjRmIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysg Yi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMTQ5LDYgKzE0OSw4IEBA IC0gKGlkKWluaXRXaXRoRnJhbWU6KE5TUmVjdClmcmFtZSBwYWdlTmFtZXNwYWNlUmVmOihXS1Bh Z2VOYW1lc3BhY2VSZWYpcGFnZU5hbWVzCiAgICAgX2RhdGEtPl9pc1NlbGVjdGlvbkluUGFzc3dv cmRGaWVsZCA9IE5POwogICAgIF9kYXRhLT5faGFzTWFya2VkVGV4dCA9IE5POwogCisgICAgV2Vi Q29udGV4dDo6c3RhdGlzdGljcygpLndrVmlld0NvdW50Kys7CisKICAgICByZXR1cm4gc2VsZjsK IH0KIApAQCAtMTY4LDYgKzE3MCw5IEBAIC0gKHZvaWQpZGVhbGxvYwogICAgIF9kYXRhLT5fcGFn ZS0+Y2xvc2UoKTsKIAogICAgIFtfZGF0YSByZWxlYXNlXTsKKworICAgIFdlYkNvbnRleHQ6OnN0 YXRpc3RpY3MoKS53a1ZpZXdDb3VudC0tOworCiAgICAgW3N1cGVyIGRlYWxsb2NdOwogfQogCmRp ZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcCBiL1dlYktpdDIvVUlQ cm9jZXNzL1dlYkNvbnRleHQuY3BwCmluZGV4IDkzMGQyZmRkNDQ5MjM1NWYyZjdlMmVkZjFmZjEw NmI0NTRjNzRjNDMuLmUyYjQyYmE4M2FlYTYwZGVhYzA0NzM4ZjM5M2QxMjc2OTQxMDZkZmQgMTAw NjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCisrKyBiL1dlYktpdDIv VUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCkBAIC0zMDQsMTQgKzMwNCwxMSBAQCB2b2lkIFdlYkNv bnRleHQ6OnBvcHVsYXRlVmlzaXRlZExpbmtzKCkKICAgICBtX2hpc3RvcnlDbGllbnQucG9wdWxh dGVWaXNpdGVkTGlua3ModGhpcyk7CiB9CiAKLXZvaWQgV2ViQ29udGV4dDo6Z2V0U3RhdGlzdGlj cyhXS0NvbnRleHRTdGF0aXN0aWNzKiBzdGF0aXN0aWNzKQorV2ViQ29udGV4dDo6U3RhdGlzdGlj cyYgV2ViQ29udGV4dDo6c3RhdGlzdGljcygpCiB7Ci0gICAgbWVtc2V0KHN0YXRpc3RpY3MsIDAs IHNpemVvZihXS0NvbnRleHRTdGF0aXN0aWNzKSk7CisgICAgc3RhdGljIFN0YXRpc3RpY3Mgc3Rh dGlzdGljcyA9IFN0YXRpc3RpY3MoKTsKIAotICAgIHN0YXRpc3RpY3MtPm51bWJlck9mV0tQYWdl TmFtZXNwYWNlcyA9IG1fcGFnZU5hbWVzcGFjZXMuc2l6ZSgpOwotCi0gICAgZm9yIChIYXNoU2V0 PFdlYlBhZ2VOYW1lc3BhY2UqPjo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VOYW1lc3BhY2VzLmJlZ2lu KCksIGVuZCA9IG1fcGFnZU5hbWVzcGFjZXMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKLSAgICAg ICAgKCppdCktPmdldFN0YXRpc3RpY3Moc3RhdGlzdGljcyk7CisgICAgcmV0dXJuIHN0YXRpc3Rp Y3M7CiB9CiAKIHZvaWQgV2ViQ29udGV4dDo6c2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3Rvcnko Y29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKaW5kZXggOTFhZWQ1 OWRkNzEzNjg1MmQ4OTk5NTM5MmJkMTMwYWJmNzY2Y2QwNi4uMTUyMzg5MzMwNmE4MGE2MzVkMjFj YjdiNjUwYjBlNmUwZTEyZGFlNSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29u dGV4dC5oCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaApAQCAtOTIsNyArOTIs NiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHBvcHVsYXRlVmlzaXRlZExpbmtzKCk7CiAgICAgCi0g ICAgdm9pZCBnZXRTdGF0aXN0aWNzKFdLQ29udGV4dFN0YXRpc3RpY3MqIHN0YXRpc3RpY3MpOwog ICAgIHZvaWQgc2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3RvcnkoY29uc3QgU3RyaW5nJik7CiAK ICAgICBQbHVnaW5JbmZvU3RvcmUqIHBsdWdpbkluZm9TdG9yZSgpIHsgcmV0dXJuICZtX3BsdWdp bkluZm9TdG9yZTsgfQpAQCAtMTI0LDYgKzEyMywxMyBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMg SGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4gcGRmQW5kUG9zdFNjcmlwdE1JTUVUeXBl cygpOwogCisgICAgc3RydWN0IFN0YXRpc3RpY3MgeworICAgICAgICB1bnNpZ25lZCB3a1ZpZXdD b3VudDsKKyAgICAgICAgdW5zaWduZWQgd2tQYWdlQ291bnQ7CisgICAgICAgIHVuc2lnbmVkIHdr RnJhbWVDb3VudDsKKyAgICB9OworICAgIHN0YXRpYyBTdGF0aXN0aWNzJiBzdGF0aXN0aWNzKCk7 CisKIHByaXZhdGU6CiAgICAgV2ViQ29udGV4dChQcm9jZXNzTW9kZWwsIGNvbnN0IFN0cmluZyYg aW5qZWN0ZWRCdW5kbGVQYXRoKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAppbmRl eCA3M2IzMjFkYzcwODM5OWFjNjVjNzNkNDczYzJkZmNmYjEyZWUxZDNjLi4yNDRkZTg3MTUyN2Uw ZjRhYTgzODM2MTBiMzY4ODYxNjgxMDBhMDViIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJGcmFtZVByb3h5LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5 LmNwcApAQCAtNDQsMTAgKzQ0LDEyIEBAIFdlYkZyYW1lUHJveHk6OldlYkZyYW1lUHJveHkoV2Vi UGFnZVByb3h5KiBwYWdlLCB1aW50NjRfdCBmcmFtZUlEKQogICAgICwgbV9pc0ZyYW1lU2V0KGZh bHNlKQogICAgICwgbV9mcmFtZUlEKGZyYW1lSUQpCiB7CisgICAgV2ViQ29udGV4dDo6c3RhdGlz dGljcygpLndrRnJhbWVDb3VudCsrOwogfQogCiBXZWJGcmFtZVByb3h5Ojp+V2ViRnJhbWVQcm94 eSgpCiB7CisgICAgV2ViQ29udGV4dDo6c3RhdGlzdGljcygpLndrRnJhbWVDb3VudC0tOwogfQog CiB2b2lkIFdlYkZyYW1lUHJveHk6OmRpc2Nvbm5lY3QoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZU5hbWVzcGFjZS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl TmFtZXNwYWNlLmNwcAppbmRleCA2YmYwNDdmNWM1ZTk0MTM2MWJhYzE4ZTYzMjQzYTU3NjcxNWM1 MTQ5Li45YjJkN2IzOTFmOTdhYzIxM2M3NGM4MzlkZTFjZjBlZjBlYzRjMjVlIDEwMDY0NAotLS0g YS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlTmFtZXNwYWNlLmNwcAorKysgYi9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlTmFtZXNwYWNlLmNwcApAQCAtNjIsMTUgKzYyLDQgQEAgV2ViUGFnZVBy b3h5KiBXZWJQYWdlTmFtZXNwYWNlOjpjcmVhdGVXZWJQYWdlKFdlYlBhZ2VHcm91cCogZ3JvdXAp CiAgICAgcmV0dXJuIG1fY29udGV4dC0+Y3JlYXRlV2ViUGFnZSh0aGlzLCBncm91cCk7CiB9CiAK LXZvaWQgV2ViUGFnZU5hbWVzcGFjZTo6Z2V0U3RhdGlzdGljcyhXS0NvbnRleHRTdGF0aXN0aWNz KiBzdGF0aXN0aWNzKQotewotICAgIGlmICghcHJvY2VzcygpKQotICAgICAgICByZXR1cm47Ci0K LSAgICBzdGF0aXN0aWNzLT5udW1iZXJPZldLUGFnZXMgKz0gcHJvY2VzcygpLT5udW1iZXJPZlBh Z2VzKCk7Ci0KLSAgICBmb3IgKFdlYlByb2Nlc3NQcm94eTo6cGFnZXNfY29uc3RfaXRlcmF0b3Ig aXQgPSBwcm9jZXNzKCktPnBhZ2VzX2JlZ2luKCksIGVuZCA9IHByb2Nlc3MoKS0+cGFnZXNfZW5k KCk7IGl0ICE9IGVuZDsgKytpdCkKLSAgICAgICAgKCppdCktPmdldFN0YXRpc3RpY3Moc3RhdGlz dGljcyk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZU5hbWVzcGFjZS5oIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZU5h bWVzcGFjZS5oCmluZGV4IDExYjU3N2JhYmU4YzI3MmM4NzYwMzZkOGJhNjIzMGU5YmY2Yjc4NjUu LmM4NTJmMzk1OTMxYTZiMDczYjhhYjViZDA1ZjgxOThmOTgyMjBmN2QgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VOYW1lc3BhY2UuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlTmFtZXNwYWNlLmgKQEAgLTU0LDggKzU0LDYgQEAgcHVibGljOgogICAgIFdlYkNv bnRleHQqIGNvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRleHQuZ2V0KCk7IH0KICAgICBX ZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MoKSBjb25zdCB7IHJldHVybiBtX2NvbnRleHQtPnByb2Nl c3MoKTsgfQogCi0gICAgdm9pZCBnZXRTdGF0aXN0aWNzKFdLQ29udGV4dFN0YXRpc3RpY3MqKTsK LQogcHJpdmF0ZToKICAgICBXZWJQYWdlTmFtZXNwYWNlKFdlYkNvbnRleHQqKTsKIApkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZDFkMWQyODk5OGZmNmQyMTI1MDQ1OWUwNzJmZjI2 YTdhNDgxZjk1MC4uYTBlZjU3NTA5NTJlMmVjNDAwNjU4MzIzNjZhY2RmMTM5ZGJiZjk5OSAxMDA2 NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xMTgsMTEgKzExOCwxNSBAQCBXZWJQYWdl UHJveHk6OldlYlBhZ2VQcm94eShXZWJQYWdlTmFtZXNwYWNlKiBwYWdlTmFtZXNwYWNlLCBXZWJQ YWdlR3JvdXAqIHBhZ2VHcgogICAgIHdlYlBhZ2VQcm94eUNvdW50ZXIuaW5jcmVtZW50KCk7CiAj ZW5kaWYKIAorICAgIFdlYkNvbnRleHQ6OnN0YXRpc3RpY3MoKS53a1BhZ2VDb3VudCsrOworCiAg ICAgbV9wYWdlR3JvdXAtPmFkZFBhZ2UodGhpcyk7CiB9CiAKIFdlYlBhZ2VQcm94eTo6fldlYlBh Z2VQcm94eSgpCiB7CisgICAgV2ViQ29udGV4dDo6c3RhdGlzdGljcygpLndrUGFnZUNvdW50LS07 CisKICAgICBtX3BhZ2VHcm91cC0+cmVtb3ZlUGFnZSh0aGlzKTsKIAogI2lmbmRlZiBOREVCVUcK QEAgLTcwOCwxMSArNzEyLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldFJlc2l6ZXNUb0NvbnRl bnRzVXNpbmdMYXlvdXRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHQKIH0KICNlbmRpZgog Ci12b2lkIFdlYlBhZ2VQcm94eTo6Z2V0U3RhdGlzdGljcyhXS0NvbnRleHRTdGF0aXN0aWNzKiBz dGF0aXN0aWNzKQotewotICAgIHN0YXRpc3RpY3MtPm51bWJlck9mV0tGcmFtZXMgKz0gcHJvY2Vz cygpLT5mcmFtZUNvdW50SW5QYWdlKHRoaXMpOwotfQotCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk UmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6 TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMp CiB7CiAgICAgaWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NEcmF3aW5nQXJl YVByb3h5PigpKSB7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aCBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGViZGNhZjQyZTgzNWZj ZmNlYjMzYWM0MDVmOWYxMzA5OGViZTczNjEuLjM3YzUzOGVmOGQzZmIwMTliZDE3OWU5NzFiNjk0 NTIwOGMyMWVkODQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0yNTYsOCArMjU2LDYg QEAgcHVibGljOgogCiAgICAgdm9pZCBwcmVmZXJlbmNlc0RpZENoYW5nZSgpOwogCi0gICAgdm9p ZCBnZXRTdGF0aXN0aWNzKFdLQ29udGV4dFN0YXRpc3RpY3MqKTsKLQogI2lmIEVOQUJMRShUSUxF RF9CQUNLSU5HX1NUT1JFKQogICAgIHZvaWQgc2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91 dFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggODM2YzMyNmU2 NWJhNDlhYmRkMGQ3NWRmYzliZDk5ZTcwYWMzMzJjZS4uMzY5ZjJkZDk4NTc4MTM3NmNiN2M0NTE5 MWU1Y2YwZTM4ZTQxNDk1NCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBi L1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTEyLTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBXS0NvbnRleHRHZXRTdGF0aXN0aWNzIGdh dGhlciBnbG9iYWwgc3RhdGlzdGljcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTA4NTAKKworICAgICAgICBCcmVhayB0aGUgc3RhdGlzdGljcyB3aW5k b3cuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvQnJvd3NlclN0YXRpc3RpY3NXaW5kb3dD b250cm9sbGVyLm06CisgICAgICAgICgtW0Jyb3dzZXJTdGF0aXN0aWNzV2luZG93Q29udHJvbGxl ciByZWZyZXNoU3RhdGlzdGljczpdKToKKwogMjAxMC0xMi0xMCAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyU3RhdGlzdGljc1dpbmRvd0Nv bnRyb2xsZXIubSBiL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyU3RhdGlzdGlj c1dpbmRvd0NvbnRyb2xsZXIubQppbmRleCAyOGRkYjdhYTJlOTA2YmYwNjc3NjllZWJiYWIxNDNj ZmY3ZjJjNzU3Li42YjMzN2EwNzNkNThkZGIyNTExZjM1NjJkMjE1MTdmZTJmYmJkNDEwIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlclN0YXRpc3RpY3NXaW5k b3dDb250cm9sbGVyLm0KKysrIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJT dGF0aXN0aWNzV2luZG93Q29udHJvbGxlci5tCkBAIC00MSwxOCArNDEsNyBAQCAtICh2b2lkKXdp bmRvd0RpZExvYWQKIAogLSAoSUJBY3Rpb24pcmVmcmVzaFN0YXRpc3RpY3M6KGlkKXNlbmRlcgog ewotICAgIFdLQ29udGV4dFN0YXRpc3RpY3MgdGhyZWFkU3RhdHM7Ci0gICAgV0tDb250ZXh0R2V0 U3RhdGlzdGljcyhfdGhyZWFkQ29udGV4dCwgJnRocmVhZFN0YXRzKTsKLQotICAgIFdLQ29udGV4 dFN0YXRpc3RpY3MgcHJvY2Vzc1N0YXRzOwotICAgIFdLQ29udGV4dEdldFN0YXRpc3RpY3MoX3By b2Nlc3NDb250ZXh0LCAmcHJvY2Vzc1N0YXRzKTsKLQotICAgIFtbX2Jhc2ljU3RhdHNNYXRyaXgg Y2VsbFdpdGhUYWc6MTFdIHNldEludFZhbHVlOnByb2Nlc3NTdGF0cy5udW1iZXJPZldLUGFnZXNd OwotICAgIFtbX2Jhc2ljU3RhdHNNYXRyaXggY2VsbFdpdGhUYWc6MTJdIHNldEludFZhbHVlOnBy b2Nlc3NTdGF0cy5udW1iZXJPZldLRnJhbWVzXTsKLQotICAgIFtbX2Jhc2ljU3RhdHNNYXRyaXgg Y2VsbFdpdGhUYWc6MjFdIHNldEludFZhbHVlOnRocmVhZFN0YXRzLm51bWJlck9mV0tQYWdlc107 Ci0gICAgW1tfYmFzaWNTdGF0c01hdHJpeCBjZWxsV2l0aFRhZzoyMl0gc2V0SW50VmFsdWU6dGhy ZWFkU3RhdHMubnVtYmVyT2ZXS0ZyYW1lc107Ci0KKyAgICAvLyBGSVhNRTogKFJlKS1pbXBsZW1l bnQuCiB9CiAKIEBlbmQK