151541 2015-11-22 02:14:44 -0800 [GTK] Use the network process unconditionally 2015-11-24 00:01:49 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 140075 151418 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue gustavo mcatanzaro mrobinson oldest_to_newest 1144018 0 cgarcia 2015-11-22 02:14:44 -0800 In preparation for the non-network process option removal. Make the shared secondary process model become multiple secondary process model with a limit of 1 web process. 1144019 1 266048 cgarcia 2015-11-22 02:24:30 -0800 Created attachment 266048 Patch 1144020 2 commit-queue 2015-11-22 02:26:21 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1144274 3 266048 achristensen 2015-11-23 21:40:38 -0800 Comment on attachment 266048 Patch r=me. This conflicts with https://bugs.webkit.org/show_bug.cgi?id=151580 but such is life. I'll update around this if you land first. 1144308 4 cgarcia 2015-11-24 00:01:49 -0800 Committed r192761: <http://trac.webkit.org/changeset/192761> 266048 2015-11-22 02:24:30 -0800 2015-11-23 21:40:38 -0800 Patch wk2-kill-non-network-process.diff text/plain 11995 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzYjk5ZjQ4Li4wM2RmZWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xICsxLDI4IEBA CisyMDE1LTExLTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXSBVc2UgdGhlIG5ldHdvcmsgcHJvY2VzcyB1bmNvbmRpdGlvbmFsbHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTU0MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgdGhl IHNoYXJlZCBzZWNvbmRhcnkgcHJvY2VzcyBtb2RlbCBiZWNvbWUgbXVsdGlwbGUgc2Vjb25kYXJ5 CisgICAgICAgIHByb2Nlc3MgbW9kZWwgd2l0aCBhIGxpbWl0IG9mIDEgd2ViIHByb2Nlc3MuIFVz ZSB0aGUgc2FtZSBvcHRpb25zCisgICAgICAgIHdoZW4gY3JlYXRpbmcgYSBjb250ZXh0IHdpdGgg bGVnYWN5IGNvbmZpZ3VyYXRpb24gKHVuaXQgdGVzdHMgYW5kCisgICAgICAgIGluc3BlY3RvciBw cm94eSkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9ndGsvTmV0d29ya1Byb2Nlc3NNYWlu R3RrLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJh dGlvbi5jcHA6CisgICAgICAgIChBUEk6OlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y3JlYXRl V2l0aExlZ2FjeU9wdGlvbnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkNvbnRleHQuY3BwOgorICAgICAgICAod2Via2l0V2ViQ29udGV4dENvbnN0cnVjdGVkKToKKyAg ICAgICAgKHdlYmtpdF93ZWJfY29udGV4dF9zZXRfcHJvY2Vzc19tb2RlbCk6CisgICAgICAgICh3 ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3Byb2Nlc3NfbW9kZWwpOgorICAgICAgICAod2Via2l0X3dl Yl9jb250ZXh0X3NldF93ZWJfcHJvY2Vzc19jb3VudF9saW1pdCk6CisgICAgICAgICh3ZWJraXRf d2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNzX2NvdW50X2xpbWl0KToKKyAgICAgICAgKHRvV2Vi S2l0UHJvY2Vzc01vZGVsKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYklu c3BlY3RvclByb3h5R3RrLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQ b29sR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnNldElnbm9yZVRM U0Vycm9ycyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcm9jZXNzKToKKwogPT0gUm9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIwMTUtMTEt MjEgPT0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2d0ay9OZXR3 b3JrUHJvY2Vzc01haW5HdGsuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvZ3Rr L05ldHdvcmtQcm9jZXNzTWFpbkd0ay5jcHAKaW5kZXggYWViYzI4NS4uNTViOWNjZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvZ3RrL05ldHdvcmtQcm9jZXNzTWFp bkd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvZ3RrL05ldHdvcmtQ cm9jZXNzTWFpbkd0ay5jcHAKQEAgLTQzLDE2ICs0Myw2IEBAIHB1YmxpYzoKICAgICAgICAgU291 cE5ldHdvcmtTZXNzaW9uOjpkZWZhdWx0U2Vzc2lvbigpLnNldFNTTFBvbGljeShTb3VwTmV0d29y a1Nlc3Npb246OlNTTFVzZVN5c3RlbUNBRmlsZSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KLQotICAgIHZvaWQgcGxhdGZvcm1GaW5hbGl6ZSgpIG92ZXJyaWRlCi0gICAgewotI2lmICFF TkFCTEUoTkVUV09SS19DQUNIRSkKLSAgICAgICAgaWYgKFNvdXBDYWNoZSogc291cENhY2hlID0g U291cE5ldHdvcmtTZXNzaW9uOjpkZWZhdWx0U2Vzc2lvbigpLmNhY2hlKCkpIHsKLSAgICAgICAg ICAgIHNvdXBfY2FjaGVfZmx1c2goc291cENhY2hlKTsKLSAgICAgICAgICAgIHNvdXBfY2FjaGVf ZHVtcChzb3VwQ2FjaGUpOwotICAgICAgICB9Ci0jZW5kaWYKLSAgICB9CiB9OwogCiBpbnQgTmV0 d29ya1Byb2Nlc3NNYWluVW5peChpbnQgYXJnYywgY2hhcioqIGFyZ3YpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJh dGlvbi5jcHAKaW5kZXggMGRjOGUyOS4uOWFmNzUyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNw cApAQCAtNDEsOCArNDEsMTYgQEAgUmVmPFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbj4gUHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uOjpjcmVhdGVXaXRoTGVnYWN5T3B0aW9ucygKICAgICBhdXRvIGNv bmZpZ3VyYXRpb24gPSBQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOwogCiAgICAg Y29uZmlndXJhdGlvbi0+bV9zaG91bGRIYXZlTGVnYWN5RGF0YVN0b3JlID0gdHJ1ZTsKKyNpZiBQ TEFURk9STShHVEspCisgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIGlmZGVmIG9uY2UgYWxsIHBv cnRzIGhhdmUgc3dpdGNoZWQgdG8gdXNlIGFsd2F5cyBOZXR3b3JrUHJvY2Vzcy4KKyAgICAvLyBT ZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTQxOC4KKyAgICBj b25maWd1cmF0aW9uLT5tX3Byb2Nlc3NNb2RlbCA9IFdlYktpdDo6UHJvY2Vzc01vZGVsTXVsdGlw bGVTZWNvbmRhcnlQcm9jZXNzZXM7CisgICAgY29uZmlndXJhdGlvbi0+bV9tYXhpbXVtUHJvY2Vz c0NvdW50ID0gMTsKKyAgICBjb25maWd1cmF0aW9uLT5tX3VzZU5ldHdvcmtQcm9jZXNzID0gdHJ1 ZTsKKyNlbHNlCiAgICAgY29uZmlndXJhdGlvbi0+bV9wcm9jZXNzTW9kZWwgPSBXZWJLaXQ6OlBy b2Nlc3NNb2RlbFNoYXJlZFNlY29uZGFyeVByb2Nlc3M7CiAgICAgY29uZmlndXJhdGlvbi0+bV91 c2VOZXR3b3JrUHJvY2VzcyA9IGZhbHNlOworI2VuZGlmCiAgICAgY29uZmlndXJhdGlvbi0+bV9j YWNoZU1vZGVsID0gV2ViS2l0OjpDYWNoZU1vZGVsRG9jdW1lbnRWaWV3ZXI7CiAKICAgICBjb25m aWd1cmF0aW9uLT5tX2FwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkgPSBXZWJLaXQ6OldlYlByb2Nl c3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJD b250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNv bnRleHQuY3BwCmluZGV4IDlmYmM1MTEuLjk1YTM4YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC0xNzksNiAr MTc5LDggQEAgc3RydWN0IF9XZWJLaXRXZWJDb250ZXh0UHJpdmF0ZSB7CiAKICAgICBDU3RyaW5n IGZhdmljb25EYXRhYmFzZURpcmVjdG9yeTsKICAgICBXZWJLaXRUTFNFcnJvcnNQb2xpY3kgdGxz RXJyb3JzUG9saWN5OworICAgIFdlYktpdFByb2Nlc3NNb2RlbCBwcm9jZXNzTW9kZWw7CisgICAg dW5zaWduZWQgcHJvY2Vzc0NvdW50TGltaXQ7CiAKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBXZWJL aXRXZWJWaWV3Kj4gd2ViVmlld3M7CiAKQEAgLTE5MywzMiArMTk1LDYgQEAgc3RhdGljIGd1aW50 IHNpZ25hbHNbTEFTVF9TSUdOQUxdID0geyAwLCB9OwogCiBXRUJLSVRfREVGSU5FX1RZUEUoV2Vi S2l0V2ViQ29udGV4dCwgd2Via2l0X3dlYl9jb250ZXh0LCBHX1RZUEVfT0JKRUNUKQogCi1zdGF0 aWMgaW5saW5lIFdlYktpdDo6UHJvY2Vzc01vZGVsIHRvUHJvY2Vzc01vZGVsKFdlYktpdFByb2Nl c3NNb2RlbCB3ZWJLaXRQcm9jZXNzTW9kZWwpCi17Ci0gICAgc3dpdGNoICh3ZWJLaXRQcm9jZXNz TW9kZWwpIHsKLSAgICBjYXNlIFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllf UFJPQ0VTUzoKLSAgICAgICAgcmV0dXJuIFByb2Nlc3NNb2RlbFNoYXJlZFNlY29uZGFyeVByb2Nl c3M7Ci0gICAgY2FzZSBXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNPTkRBUllfUFJP Q0VTU0VTOgotICAgICAgICByZXR1cm4gUHJvY2Vzc01vZGVsTXVsdGlwbGVTZWNvbmRhcnlQcm9j ZXNzZXM7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg ICAgIHJldHVybiBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQcm9jZXNzOwotICAgIH0KLX0K LQotc3RhdGljIGlubGluZSBXZWJLaXRQcm9jZXNzTW9kZWwgdG9XZWJLaXRQcm9jZXNzTW9kZWwo V2ViS2l0OjpQcm9jZXNzTW9kZWwgcHJvY2Vzc01vZGVsKQotewotICAgIHN3aXRjaCAocHJvY2Vz c01vZGVsKSB7Ci0gICAgY2FzZSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQcm9jZXNzOgot ICAgICAgICByZXR1cm4gV0VCS0lUX1BST0NFU1NfTU9ERUxfU0hBUkVEX1NFQ09OREFSWV9QUk9D RVNTOwotICAgIGNhc2UgUHJvY2Vzc01vZGVsTXVsdGlwbGVTZWNvbmRhcnlQcm9jZXNzZXM6Ci0g ICAgICAgIHJldHVybiBXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNPTkRBUllfUFJP Q0VTU0VTOwotICAgIGRlZmF1bHQ6Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAg ICAgICByZXR1cm4gV0VCS0lUX1BST0NFU1NfTU9ERUxfU0hBUkVEX1NFQ09OREFSWV9QUk9DRVNT OwotICAgIH0KLX0KLQogc3RhdGljIGNvbnN0IGNoYXIqIGluamVjdGVkQnVuZGxlRGlyZWN0b3J5 KCkKIHsKICNpZiBFTkFCTEUoREVWRUxPUEVSX01PREUpCkBAIC0yODUsOCArMjYxLDcgQEAgc3Rh dGljIHZvaWQgd2Via2l0V2ViQ29udGV4dENvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKIAog ICAgIEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGNvbmZpZ3VyYXRpb247CiAgICAgY29u ZmlndXJhdGlvbi5zZXRJbmplY3RlZEJ1bmRsZVBhdGgoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmlu ZyhidW5kbGVGaWxlbmFtZS5nZXQoKSkpOwotICAgIGNvbmZpZ3VyYXRpb24uc2V0UHJvY2Vzc01v ZGVsKFByb2Nlc3NNb2RlbFNoYXJlZFNlY29uZGFyeVByb2Nlc3MpOwotICAgIGNvbmZpZ3VyYXRp b24uc2V0VXNlTmV0d29ya1Byb2Nlc3MoZmFsc2UpOworICAgIGNvbmZpZ3VyYXRpb24uc2V0TWF4 aW11bVByb2Nlc3NDb3VudCgxKTsKIAogICAgIFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnRleHQg PSBXRUJLSVRfV0VCX0NPTlRFWFQob2JqZWN0KTsKICAgICBXZWJLaXRXZWJDb250ZXh0UHJpdmF0 ZSogcHJpdiA9IHdlYkNvbnRleHQtPnByaXY7CkBAIC0xMTY5LDEzICsxMTQ0LDE4IEBAIHZvaWQg d2Via2l0X3dlYl9jb250ZXh0X3NldF9wcm9jZXNzX21vZGVsKFdlYktpdFdlYkNvbnRleHQqIGNv bnRleHQsIFdlYktpdFByb2NlCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VC X0NPTlRFWFQoY29udGV4dCkpOwogCi0gICAgUHJvY2Vzc01vZGVsIG5ld1Byb2Nlc3NNb2RlbCh0 b1Byb2Nlc3NNb2RlbChwcm9jZXNzTW9kZWwpKTsKLQotICAgIGlmIChuZXdQcm9jZXNzTW9kZWwg PT0gY29udGV4dC0+cHJpdi0+Y29udGV4dC0+cHJvY2Vzc01vZGVsKCkpCisgICAgaWYgKHByb2Nl c3NNb2RlbCA9PSBjb250ZXh0LT5wcml2LT5wcm9jZXNzTW9kZWwpCiAgICAgICAgIHJldHVybjsK IAotICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnNldFVzZXNOZXR3b3JrUHJvY2VzcyhuZXdQ cm9jZXNzTW9kZWwgPT0gUHJvY2Vzc01vZGVsTXVsdGlwbGVTZWNvbmRhcnlQcm9jZXNzZXMpOwot ICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnNldFByb2Nlc3NNb2RlbChuZXdQcm9jZXNzTW9k ZWwpOworICAgIGNvbnRleHQtPnByaXYtPnByb2Nlc3NNb2RlbCA9IHByb2Nlc3NNb2RlbDsKKyAg ICBzd2l0Y2ggKGNvbnRleHQtPnByaXYtPnByb2Nlc3NNb2RlbCkgeworICAgIGNhc2UgV0VCS0lU X1BST0NFU1NfTU9ERUxfU0hBUkVEX1NFQ09OREFSWV9QUk9DRVNTOgorICAgICAgICBjb250ZXh0 LT5wcml2LT5jb250ZXh0LT5zZXRNYXhpbXVtTnVtYmVyT2ZQcm9jZXNzZXMoMSk7CisgICAgICAg IGJyZWFrOworICAgIGNhc2UgV0VCS0lUX1BST0NFU1NfTU9ERUxfTVVMVElQTEVfU0VDT05EQVJZ X1BST0NFU1NFUzoKKyAgICAgICAgY29udGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0TWF4aW11bU51 bWJlck9mUHJvY2Vzc2VzKGNvbnRleHQtPnByaXYtPnByb2Nlc3NDb3VudExpbWl0KTsKKyAgICAg ICAgYnJlYWs7CisgICAgfQogfQogCiAvKioKQEAgLTExOTMsNyArMTE3Myw3IEBAIFdlYktpdFBy b2Nlc3NNb2RlbCB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3Byb2Nlc3NfbW9kZWwoV2ViS2l0V2Vi Q29udGV4dCogY29udGV4CiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dF Ql9DT05URVhUKGNvbnRleHQpLCBXRUJLSVRfUFJPQ0VTU19NT0RFTF9TSEFSRURfU0VDT05EQVJZ X1BST0NFU1MpOwogCi0gICAgcmV0dXJuIHRvV2ViS2l0UHJvY2Vzc01vZGVsKGNvbnRleHQtPnBy aXYtPmNvbnRleHQtPnByb2Nlc3NNb2RlbCgpKTsKKyAgICByZXR1cm4gY29udGV4dC0+cHJpdi0+ cHJvY2Vzc01vZGVsOwogfQogCiAvKioKQEAgLTEyMTQsMTAgKzExOTQsMTIgQEAgdm9pZCB3ZWJr aXRfd2ViX2NvbnRleHRfc2V0X3dlYl9wcm9jZXNzX2NvdW50X2xpbWl0KFdlYktpdFdlYkNvbnRl eHQqIGNvbnRleHQsIGcKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfQ09O VEVYVChjb250ZXh0KSk7CiAKLSAgICBpZiAobGltaXQgPT0gY29udGV4dC0+cHJpdi0+Y29udGV4 dC0+Y29uZmlndXJhdGlvbigpLm1heGltdW1Qcm9jZXNzQ291bnQoKSkKKyAgICBpZiAoY29udGV4 dC0+cHJpdi0+cHJvY2Vzc0NvdW50TGltaXQgPT0gbGltaXQpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnNldE1heGltdW1OdW1iZXJPZlByb2Nlc3Nlcyhs aW1pdCk7CisgICAgY29udGV4dC0+cHJpdi0+cHJvY2Vzc0NvdW50TGltaXQgPSBsaW1pdDsKKyAg ICBpZiAoY29udGV4dC0+cHJpdi0+cHJvY2Vzc01vZGVsICE9IFdFQktJVF9QUk9DRVNTX01PREVM X1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUykKKyAgICAgICAgY29udGV4dC0+cHJpdi0+Y29udGV4 dC0+c2V0TWF4aW11bU51bWJlck9mUHJvY2Vzc2VzKGxpbWl0KTsKIH0KIAogLyoqCkBAIC0xMjM0 LDcgKzEyMTYsNyBAQCBndWludCB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3dlYl9wcm9jZXNzX2Nv dW50X2xpbWl0KFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgZ19yZXR1cm5fdmFs X2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpLCAwKTsKIAotICAgIHJldHVy biBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5jb25maWd1cmF0aW9uKCkubWF4aW11bVByb2Nlc3ND b3VudCgpOworICAgIHJldHVybiBjb250ZXh0LT5wcml2LT5wcm9jZXNzQ291bnRMaW1pdDsKIH0K IAogV2ViS2l0RG93bmxvYWQqIHdlYmtpdFdlYkNvbnRleHRHZXRPckNyZWF0ZURvd25sb2FkKERv d25sb2FkUHJveHkqIGRvd25sb2FkUHJveHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCmluZGV4IDRkNmE3MjMuLjJkZWJk NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9y UHJveHlHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVj dG9yUHJveHlHdGsuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAKICNpbmNsdWRlICJXZWJLaXRXZWJW aWV3QmFzZVByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJQYWdlR3JvdXAuaCIKKyNpbmNsdWRlICJX ZWJQcm9jZXNzUG9vbC5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgogI2luY2x1ZGUg PFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3RrVXRpbGl0aWVzLmg+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQb29s R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc1Bvb2xHdGsu Y3BwCmluZGV4IDc2YzQzNzkuLmQ4MjZhMDE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQb29sR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQb29sR3RrLmNwcApAQCAtOTUsMTYgKzk1LDYgQEAgdm9p ZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzJgogICAgICAgICBwYXJhbWV0ZXJzLnVybFNjaGVtZXNSZWdpc3Rl cmVkQXNMb2NhbC5hcHBlbmQoInJlc291cmNlIik7CiAgICAgfQogCi0gICAgaWYgKCF1c2VzTmV0 d29ya1Byb2Nlc3MoKSkgewotICAgICAgICBwYXJhbWV0ZXJzLnVybFNjaGVtZXNSZWdpc3RlcmVk Rm9yQ3VzdG9tUHJvdG9jb2xzID0gc3VwcGxlbWVudDxXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1 ZXN0TWFuYWdlcj4oKS0+cmVnaXN0ZXJlZFNjaGVtZXNGb3JDdXN0b21Qcm90b2NvbHMoKTsKLQot ICAgICAgICBzdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4oKS0+Z2V0Q29va2llUGVy c2lzdGVudFN0b3JhZ2UocGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVBhdGgsIHBh cmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlKTsKLSAgICAgICAgcGFyYW1ldGVy cy5jb29raWVBY2NlcHRQb2xpY3kgPSBtX2luaXRpYWxIVFRQQ29va2llQWNjZXB0UG9saWN5Owot Ci0gICAgICAgIHBhcmFtZXRlcnMuaWdub3JlVExTRXJyb3JzID0gbV9pZ25vcmVUTFNFcnJvcnM7 Ci0gICAgICAgIHBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5ID0gbV9jb25maWd1cmF0aW9u LT5kaXNrQ2FjaGVEaXJlY3RvcnkoKTsKLSAgICB9Ci0KICAgICBwYXJhbWV0ZXJzLm1lbW9yeUNh Y2hlRGlzYWJsZWQgPSBtX21lbW9yeUNhY2hlRGlzYWJsZWQgfHwgY2FjaGVNb2RlbCgpID09IENh Y2hlTW9kZWxEb2N1bWVudFZpZXdlcjsKIH0KIApAQCAtMTQ2LDExICsxMzYsOCBAQCBTdHJpbmcg V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9y eSgpCiB2b2lkIFdlYlByb2Nlc3NQb29sOjpzZXRJZ25vcmVUTFNFcnJvcnMoYm9vbCBpZ25vcmVU TFNFcnJvcnMpCiB7CiAgICAgbV9pZ25vcmVUTFNFcnJvcnMgPSBpZ25vcmVUTFNFcnJvcnM7Ci0g ICAgaWYgKHVzZXNOZXR3b3JrUHJvY2VzcygpICYmIG5ldHdvcmtQcm9jZXNzKCkpIHsKKyAgICBp ZiAobmV0d29ya1Byb2Nlc3MoKSkKICAgICAgICAgbmV0d29ya1Byb2Nlc3MoKS0+c2VuZChNZXNz YWdlczo6TmV0d29ya1Byb2Nlc3M6OlNldElnbm9yZVRMU0Vycm9ycyhtX2lnbm9yZVRMU0Vycm9y cyksIDApOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIHNlbmRUb0FsbFByb2Nlc3NlcyhN ZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0SWdub3JlVExTRXJyb3JzKG1faWdub3JlVExTRXJyb3Jz KSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQxODhmYmMuLjM4Zjc1NjAgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAog MjAxNS0xMS0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK KyAgICAgICAgW0dUS10gVXNlIHRoZSBuZXR3b3JrIHByb2Nlc3MgdW5jb25kaXRpb25hbGx5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE1NDEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggVGVzdElu c3BlY3RvclNlcnZlciB0ZXN0LiBEbyBub3QgYXNzdW1lIHdlIGFscmVhZHkgaGF2ZSB0aGUKKyAg ICAgICAgdGl0bGUgd2Ugd2FudCB3aGVuIHRoZSBwYWdlIGhhcyBiZWVuIGxvYWRlZCwgc2luY2Ug dGhlIHRpdGxlIGlzCisgICAgICAgIGNoYW5nZWQgYWZ0ZXJ3YXJkcy4gU28sIGNoZWNrIGlmIHRo ZSB0aXRsZSBoYXMgYWxyZWFkeSBiZWVuIHNldCwKKyAgICAgICAgYW5kIGlmIG5vdCB3YWl0IGZv ciBpdC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0SW5z cGVjdG9yU2VydmVyLmNwcDoKKyAgICAgICAgKG9wZW5SZW1vdGVEZWJ1Z2dpbmdTZXNzaW9uKToK KworMjAxNS0xMS0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKICAgICAgICAgW0dUS10gU29tZSB1bml0IHRlc3RzIGZhaWwgd2hlbiB1c2luZyB0aGUgbmV0 d29yayBwcm9jZXNzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTE0OTAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyR3RrL1Rlc3RJbnNwZWN0b3JTZXJ2ZXIuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyR3RrL1Rlc3RJbnNwZWN0b3JTZXJ2ZXIuY3BwCmluZGV4IDQzZjRkNDguLmJiZGQx MDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0 SW5zcGVjdG9yU2VydmVyLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJHdGsvVGVzdEluc3BlY3RvclNlcnZlci5jcHAKQEAgLTIzNywxMiArMjM3LDEwIEBAIHN0YXRp YyB2b2lkIG9wZW5SZW1vdGVEZWJ1Z2dpbmdTZXNzaW9uKEluc3BlY3RvclNlcnZlclRlc3QqIHRl c3QsIGdjb25zdHBvaW50ZXIpCiAgICAgdGVzdC0+bG9hZFVSSShyZXNvbHZlZFVSTC51dGY4KCku ZGF0YSgpKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAotICAgIGphdmFz Y3JpcHRSZXN1bHQgPSB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoImRv Y3VtZW50LnRpdGxlIiwgJmVycm9yLm91dFB0cigpKTsKLSAgICBnX2Fzc2VydChqYXZhc2NyaXB0 UmVzdWx0KTsKLSAgICBnX2Fzc2VydCghZXJyb3IuZ2V0KCkpOwotCi0gICAgR1VuaXF1ZVB0cjxj aGFyPiB0aXRsZShXZWJWaWV3VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmluZyhqYXZhc2Ny aXB0UmVzdWx0KSk7Ci0gICAgZ19hc3NlcnRfY21wc3RyKHRpdGxlLmdldCgpLCA9PSwgIjEyNy4w LjAuMSIpOworICAgIGNvbnN0IGNoYXIqIHRpdGxlID0gd2Via2l0X3dlYl92aWV3X2dldF90aXRs ZSh0ZXN0LT5tX3dlYlZpZXcpOworICAgIGlmICghdGl0bGUgfHwgISp0aXRsZSkKKyAgICAgICAg dGVzdC0+d2FpdFVudGlsVGl0bGVDaGFuZ2VkKCk7CisgICAgZ19hc3NlcnRfY21wc3RyKHdlYmtp dF93ZWJfdmlld19nZXRfdGl0bGUodGVzdC0+bV93ZWJWaWV3KSwgPT0sICIxMjcuMC4wLjEiKTsK IH0KIAogc3RhdGljIHZvaWQgc2VuZEluY29tcGxldGVSZXF1ZXN0KEluc3BlY3RvclNlcnZlclRl c3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCg==