162487 2016-09-23 05:11:38 -0700 [GTK] Make all WebView tests have a WebKitUserContentManager 2016-09-23 08:48:20 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 161607 1 cgarcia webkit-unassigned bugs-noreply lforschler oldest_to_newest 1232828 0 cgarcia 2016-09-23 05:11:38 -0700 It simplifies tests using the user content manager, and allows to use it without having to subclass WebViewTest. 1232829 1 289676 cgarcia 2016-09-23 05:15:30 -0700 Created attachment 289676 Patch 1232853 2 cgarcia 2016-09-23 08:48:20 -0700 Committed r206302: <http://trac.webkit.org/changeset/206302> 289676 2016-09-23 05:15:30 -0700 2016-09-23 07:17:21 -0700 Patch wk2-tests-user-content.diff text/plain 14180 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzMWJl NzdhLi5mNDZhNTViIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjkgQEAKIDIwMTYtMDktMjMgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIE1ha2UgYWxsIFdlYlZpZXcg dGVzdHMgaGF2ZSBhIFdlYktpdFVzZXJDb250ZW50TWFuYWdlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYyNDg3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgc2ltcGxpZmllcyB0ZXN0cyB1c2luZyB0 aGUgdXNlciBjb250ZW50IG1hbmFnZXIsIGFuZCBhbGxvd3MgdG8gdXNlIGl0IHdpdGhvdXQgaGF2 aW5nIHRvIHN1YmNsYXNzIFdlYlZpZXdUZXN0LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyR3RrL1Rlc3RDb25zb2xlTWVzc2FnZS5jcHA6CisgICAgICAgIChDb25zb2xl TWVzc2FnZVRlc3Q6OkNvbnNvbGVNZXNzYWdlVGVzdCk6CisgICAgICAgIChDb25zb2xlTWVzc2Fn ZVRlc3Q6On5Db25zb2xlTWVzc2FnZVRlc3QpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Mkd0ay9UZXN0VUlDbGllbnQuY3BwOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcDoKKyAgICAg ICAgKHRlc3RVc2VyQ29udGVudE1hbmFnZXJJbmplY3RlZFN0eWxlU2hlZXQpOgorICAgICAgICAo dGVzdFVzZXJDb250ZW50TWFuYWdlckluamVjdGVkU2NyaXB0KToKKyAgICAgICAgKFVzZXJTY3Jp cHRNZXNzYWdlVGVzdDo6VXNlclNjcmlwdE1lc3NhZ2VUZXN0KToKKyAgICAgICAgKGJlZm9yZUFs bCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRX ZWJWaWV3LmNwcDoKKyAgICAgICAgKHRlc3RXZWJWaWV3SXNQbGF5aW5nQXVkaW8pOgorICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvV2ViVmlld1Rlc3QuY3BwOgorICAgICAg ICAoV2ViVmlld1Rlc3Q6OldlYlZpZXdUZXN0KToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2d0 ay9XZWJLaXQyR3RrL1dlYlZpZXdUZXN0Lmg6CisKKzIwMTYtMDktMjMgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFJFR1JFU1NJT04ocjE5NDM4 Nyk6IENyYXNoIG9uIGdpdGh1Yi5jb20gaW4gSW50bERhdGVUaW1lRm9ybWF0OjpyZXNvbHZlZE9w dGlvbnMgaW4gQyBsb2NhbGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2MjEzOQogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDJHdGsvVGVzdENvbnNvbGVNZXNzYWdlLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mkd0ay9UZXN0Q29uc29sZU1lc3NhZ2UuY3BwCmluZGV4IDEwZGQ4Y2EuLjc1 MWI1MGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9U ZXN0Q29uc29sZU1lc3NhZ2UuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9UZXN0Q29uc29sZU1lc3NhZ2UuY3BwCkBAIC02NCwxOCArNjQsMTUgQEAgcHVibGlj OgogICAgIH0KIAogICAgIENvbnNvbGVNZXNzYWdlVGVzdCgpCi0gICAgICAgIDogV2ViVmlld1Rl c3Qod2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX25ldygpKQogICAgIHsKLSAgICAgICAgV2Vi S2l0VXNlckNvbnRlbnRNYW5hZ2VyKiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2Vy X2NvbnRlbnRfbWFuYWdlcihtX3dlYlZpZXcpOwotICAgICAgICB3ZWJraXRfdXNlcl9jb250ZW50 X21hbmFnZXJfcmVnaXN0ZXJfc2NyaXB0X21lc3NhZ2VfaGFuZGxlcihtYW5hZ2VyLCAiY29uc29s ZSIpOwotICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1hbmFnZXIsICJzY3JpcHQtbWVzc2FnZS1y ZWNlaXZlZDo6Y29uc29sZSIsIEdfQ0FMTEJBQ0soY29uc29sZU1lc3NhZ2VSZWNlaXZlZENhbGxi YWNrKSwgdGhpcyk7CisgICAgICAgIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZWdpc3Rl cl9zY3JpcHRfbWVzc2FnZV9oYW5kbGVyKG1fdXNlckNvbnRlbnRNYW5hZ2VyLmdldCgpLCAiY29u c29sZSIpOworICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fdXNlckNvbnRlbnRNYW5hZ2VyLmdl dCgpLCAic2NyaXB0LW1lc3NhZ2UtcmVjZWl2ZWQ6OmNvbnNvbGUiLCBHX0NBTExCQUNLKGNvbnNv bGVNZXNzYWdlUmVjZWl2ZWRDYWxsYmFjayksIHRoaXMpOwogICAgIH0KIAogICAgIH5Db25zb2xl TWVzc2FnZVRlc3QoKQogICAgIHsKLSAgICAgICAgV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKiBt YW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdlcihtX3dlYlZp ZXcpOwotICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQobWFuYWdl ciwgR19TSUdOQUxfTUFUQ0hfREFUQSwgMCwgMCwgbnVsbHB0ciwgbnVsbHB0ciwgdGhpcyk7Ci0g ICAgICAgIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl91bnJlZ2lzdGVyX3NjcmlwdF9tZXNz YWdlX2hhbmRsZXIobWFuYWdlciwgImNvbnNvbGUiKTsKKyAgICAgICAgZ19zaWduYWxfaGFuZGxl cnNfZGlzY29ubmVjdF9tYXRjaGVkKG1fdXNlckNvbnRlbnRNYW5hZ2VyLmdldCgpLCBHX1NJR05B TF9NQVRDSF9EQVRBLCAwLCAwLCBudWxscHRyLCBudWxscHRyLCB0aGlzKTsKKyAgICAgICAgd2Vi a2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3VucmVnaXN0ZXJfc2NyaXB0X21lc3NhZ2VfaGFuZGxl cihtX3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSwgImNvbnNvbGUiKTsKICAgICB9CiAKICAgICB2 b2lkIHdhaXRVbnRpbENvbnNvbGVNZXNzYWdlUmVjZWl2ZWQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5jcHAgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFVJQ2xpZW50LmNwcAppbmRleCA3NDIx N2Q3Li5mOGZlNTljIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJHdGsvVGVzdFVJQ2xpZW50LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdDJHdGsvVGVzdFVJQ2xpZW50LmNwcApAQCAtMjMyLDggKzIzMiw3IEBAIHB1YmxpYzoKICAg ICB9CiAKICAgICBVSUNsaWVudFRlc3QoKQotICAgICAgICA6IFdlYlZpZXdUZXN0KHdlYmtpdF91 c2VyX2NvbnRlbnRfbWFuYWdlcl9uZXcoKSkKLSAgICAgICAgLCBtX3NjcmlwdERpYWxvZ1R5cGUo V0VCS0lUX1NDUklQVF9ESUFMT0dfQUxFUlQpCisgICAgICAgIDogbV9zY3JpcHREaWFsb2dUeXBl KFdFQktJVF9TQ1JJUFRfRElBTE9HX0FMRVJUKQogICAgICAgICAsIG1fc2NyaXB0RGlhbG9nQ29u ZmlybWVkKHRydWUpCiAgICAgICAgICwgbV9hbGxvd1Blcm1pc3Npb25SZXF1ZXN0cyhmYWxzZSkK ICAgICAgICAgLCBtX3ZlcmlmeU1lZGlhVHlwZXMoZmFsc2UpCkBAIC0yNDYsMTcgKzI0NSwxNSBA QCBwdWJsaWM6CiAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJWaWV3LCAic2NyaXB0LWRp YWxvZyIsIEdfQ0FMTEJBQ0soc2NyaXB0RGlhbG9nKSwgdGhpcyk7CiAgICAgICAgIGdfc2lnbmFs X2Nvbm5lY3QobV93ZWJWaWV3LCAibW91c2UtdGFyZ2V0LWNoYW5nZWQiLCBHX0NBTExCQUNLKG1v dXNlVGFyZ2V0Q2hhbmdlZCksIHRoaXMpOwogICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2Vi VmlldywgInBlcm1pc3Npb24tcmVxdWVzdCIsIEdfQ0FMTEJBQ0socGVybWlzc2lvblJlcXVlc3Rl ZCksIHRoaXMpOwotICAgICAgICBXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIqIG1hbmFnZXIgPSB3 ZWJraXRfd2ViX3ZpZXdfZ2V0X3VzZXJfY29udGVudF9tYW5hZ2VyKG1fd2ViVmlldyk7Ci0gICAg ICAgIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZWdpc3Rlcl9zY3JpcHRfbWVzc2FnZV9o YW5kbGVyKG1hbmFnZXIsICJwZXJtaXNzaW9uIik7Ci0gICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Qo bWFuYWdlciwgInNjcmlwdC1tZXNzYWdlLXJlY2VpdmVkOjpwZXJtaXNzaW9uIiwgR19DQUxMQkFD SyhwZXJtaXNzaW9uUmVzdWx0TWVzc2FnZVJlY2VpdmVkQ2FsbGJhY2spLCB0aGlzKTsKKyAgICAg ICAgd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3JlZ2lzdGVyX3NjcmlwdF9tZXNzYWdlX2hh bmRsZXIobV91c2VyQ29udGVudE1hbmFnZXIuZ2V0KCksICJwZXJtaXNzaW9uIik7CisgICAgICAg IGdfc2lnbmFsX2Nvbm5lY3QobV91c2VyQ29udGVudE1hbmFnZXIuZ2V0KCksICJzY3JpcHQtbWVz c2FnZS1yZWNlaXZlZDo6cGVybWlzc2lvbiIsIEdfQ0FMTEJBQ0socGVybWlzc2lvblJlc3VsdE1l c3NhZ2VSZWNlaXZlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgfQogCiAgICAgflVJQ2xpZW50VGVz dCgpCiAgICAgewogICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQo bV93ZWJWaWV3LCBHX1NJR05BTF9NQVRDSF9EQVRBLCAwLCAwLCAwLCAwLCB0aGlzKTsKLSAgICAg ICAgV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dl dF91c2VyX2NvbnRlbnRfbWFuYWdlcihtX3dlYlZpZXcpOwotICAgICAgICBnX3NpZ25hbF9oYW5k bGVyc19kaXNjb25uZWN0X21hdGNoZWQobWFuYWdlciwgR19TSUdOQUxfTUFUQ0hfREFUQSwgMCwg MCwgMCwgMCwgdGhpcyk7Ci0gICAgICAgIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl91bnJl Z2lzdGVyX3NjcmlwdF9tZXNzYWdlX2hhbmRsZXIobWFuYWdlciwgInBlcm1pc3Npb24iKTsKKyAg ICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9tYXRjaGVkKG1fdXNlckNvbnRlbnRN YW5hZ2VyLmdldCgpLCBHX1NJR05BTF9NQVRDSF9EQVRBLCAwLCAwLCAwLCAwLCB0aGlzKTsKKyAg ICAgICAgd2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX3VucmVnaXN0ZXJfc2NyaXB0X21lc3Nh Z2VfaGFuZGxlcihtX3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSwgInBlcm1pc3Npb24iKTsKICAg ICB9CiAKICAgICBzdGF0aWMgdm9pZCB0cnlXZWJWaWV3Q2xvc2VDYWxsYmFjayhVSUNsaWVudFRl c3QqIHRlc3QpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJH dGsvVGVzdFdlYktpdFVzZXJDb250ZW50TWFuYWdlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFVzZXJDb250ZW50TWFuYWdlci5jcHAKaW5kZXgg ZGQ3NDdjNy4uMTM0YWQzOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyR3RrL1Rlc3RXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2Vy LmNwcApAQCAtMjcsMjMgKzI3LDYgQEAKICNpbmNsdWRlIDx3dGYvZ2xpYi9HUmVmUHRyLmg+CiAj aW5jbHVkZSA8d3RmL2dsaWIvR1VuaXF1ZVB0ci5oPgogCi1jbGFzcyBVc2VyQ29udGVudE1hbmFn ZXJUZXN0IDogcHVibGljIFdlYlZpZXdUZXN0IHsKLXB1YmxpYzoKLSAgICBNQUtFX0dMSUJfVEVT VF9GSVhUVVJFKFVzZXJDb250ZW50TWFuYWdlclRlc3QpOwotCi0gICAgVXNlckNvbnRlbnRNYW5h Z2VyVGVzdCgpCi0gICAgICAgIDogV2ViVmlld1Rlc3Qod2Via2l0X3VzZXJfY29udGVudF9tYW5h Z2VyX25ldygpKQotICAgIHsKLSAgICAgICAgLy8gQSByZWZlcmVuY2UgaXMgbGVha2VkIHdoZW4g cGFzc2luZyB0aGUgcmVzdWx0IG9mIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9uZXcoKQot ICAgICAgICAvLyBkaXJlY3RseSB0byB3ZWJraXRfd2ViX3ZpZXdfbmV3X3dpdGhfdXNlcl9jb250 ZW50X21hbmFnZXIoKSBhYm92ZS4gQWRvcHRpbmcgdGhlCi0gICAgICAgIC8vIHJlZmVyZW5jZSBo ZXJlIGF2b2lkcyB0aGUgbGVhay4KLSAgICAgICAgbV91c2VyQ29udGVudE1hbmFnZXIgPSBhZG9w dEdSZWYod2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdlcihtX3dlYlZpZXcp KTsKLSAgICAgICAgYXNzZXJ0T2JqZWN0SXNEZWxldGVkV2hlblRlc3RGaW5pc2hlcyhHX09CSkVD VChtX3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSkpOwotICAgIH0KLQotICAgIEdSZWZQdHI8V2Vi S2l0VXNlckNvbnRlbnRNYW5hZ2VyPiBtX3VzZXJDb250ZW50TWFuYWdlcjsKLX07Ci0KIHN0YXRp YyBXZWJLaXRUZXN0U2VydmVyKiBrU2VydmVyOwogCiAvLyBUaGVzZSBhcmUgYWxsIGhlcmUgc28g dGhhdCB0aGV5IGNhbiBiZSBjaGFuZ2VkIGVhc2lseSwgaWYgbmVjZXNzYXJ5LgpAQCAtMTI3LDcg KzExMCw3IEBAIHN0YXRpYyB2b2lkIHJlbW92ZU9sZEluamVjdGVkQ29udGVudEFuZFJlc2V0TGlz dHMoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKiB1c2VyCiAgICAgfQogfQogCi1zdGF0aWMgdm9p ZCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VySW5qZWN0ZWRTdHlsZVNoZWV0KFVzZXJDb250ZW50TWFu YWdlclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCitzdGF0aWMgdm9pZCB0ZXN0VXNlckNvbnRl bnRNYW5hZ2VySW5qZWN0ZWRTdHlsZVNoZWV0KFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2lu dGVyKQogewogICAgIGNoYXIqIHdoaXRlbGlzdFszXSA9IHsgMCwgMCwgMCB9OwogICAgIGNoYXIq IGJsYWNrbGlzdFszXSA9IHsgMCwgMCwgMCB9OwpAQCAtMTcwLDcgKzE1Myw3IEBAIHN0YXRpYyB2 b2lkIHRlc3RVc2VyQ29udGVudE1hbmFnZXJJbmplY3RlZFN0eWxlU2hlZXQoVXNlckNvbnRlbnRN YW5hZ2VyVGVzdCogdGVzCiAgICAgcmVtb3ZlT2xkSW5qZWN0ZWRDb250ZW50QW5kUmVzZXRMaXN0 cyh0ZXN0LT5tX3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSwgd2hpdGVsaXN0LCBibGFja2xpc3Qp OwogfQogCi1zdGF0aWMgdm9pZCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VySW5qZWN0ZWRTY3JpcHQo VXNlckNvbnRlbnRNYW5hZ2VyVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3N0YXRpYyB2b2lk IHRlc3RVc2VyQ29udGVudE1hbmFnZXJJbmplY3RlZFNjcmlwdChXZWJWaWV3VGVzdCogdGVzdCwg Z2NvbnN0cG9pbnRlcikKIHsKICAgICBjaGFyKiB3aGl0ZWxpc3RbM10gPSB7IDAsIDAsIDAgfTsK ICAgICBjaGFyKiBibGFja2xpc3RbM10gPSB7IDAsIDAsIDAgfTsKQEAgLTIxMywxMyArMTk2LDEy IEBAIHN0YXRpYyB2b2lkIHRlc3RVc2VyQ29udGVudE1hbmFnZXJJbmplY3RlZFNjcmlwdChVc2Vy Q29udGVudE1hbmFnZXJUZXN0KiB0ZXN0LCBnCiAgICAgcmVtb3ZlT2xkSW5qZWN0ZWRDb250ZW50 QW5kUmVzZXRMaXN0cyh0ZXN0LT5tX3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSwgd2hpdGVsaXN0 LCBibGFja2xpc3QpOwogfQogCi1jbGFzcyBVc2VyU2NyaXB0TWVzc2FnZVRlc3QgOiBwdWJsaWMg VXNlckNvbnRlbnRNYW5hZ2VyVGVzdCB7CitjbGFzcyBVc2VyU2NyaXB0TWVzc2FnZVRlc3QgOiBw dWJsaWMgV2ViVmlld1Rlc3QgewogcHVibGljOgogICAgIE1BS0VfR0xJQl9URVNUX0ZJWFRVUkUo VXNlclNjcmlwdE1lc3NhZ2VUZXN0KTsKIAogICAgIFVzZXJTY3JpcHRNZXNzYWdlVGVzdCgpCi0g ICAgICAgIDogVXNlckNvbnRlbnRNYW5hZ2VyVGVzdCgpCi0gICAgICAgICwgbV91c2VyU2NyaXB0 TWVzc2FnZShudWxscHRyKQorICAgICAgICA6IG1fdXNlclNjcmlwdE1lc3NhZ2UobnVsbHB0cikK ICAgICB7CiAgICAgfQogCkBAIC0zNjYsOCArMzQ4LDggQEAgdm9pZCBiZWZvcmVBbGwoKQogICAg IGtTZXJ2ZXItPnJ1bihzZXJ2ZXJDYWxsYmFjayk7CiAKICAgICBUZXN0OjphZGQoIldlYktpdFdl YlZpZXciLCAibmV3LXdpdGgtdXNlci1jb250ZW50LW1hbmFnZXIiLCB0ZXN0V2ViVmlld05ld1dp dGhVc2VyQ29udGVudE1hbmFnZXIpOwotICAgIFVzZXJDb250ZW50TWFuYWdlclRlc3Q6OmFkZCgi V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyIiwgImluamVjdGVkLXN0eWxlLXNoZWV0IiwgdGVzdFVz ZXJDb250ZW50TWFuYWdlckluamVjdGVkU3R5bGVTaGVldCk7Ci0gICAgVXNlckNvbnRlbnRNYW5h Z2VyVGVzdDo6YWRkKCJXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIiLCAiaW5qZWN0ZWQtc2NyaXB0 IiwgdGVzdFVzZXJDb250ZW50TWFuYWdlckluamVjdGVkU2NyaXB0KTsKKyAgICBXZWJWaWV3VGVz dDo6YWRkKCJXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIiLCAiaW5qZWN0ZWQtc3R5bGUtc2hlZXQi LCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VySW5qZWN0ZWRTdHlsZVNoZWV0KTsKKyAgICBXZWJWaWV3 VGVzdDo6YWRkKCJXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIiLCAiaW5qZWN0ZWQtc2NyaXB0Iiwg dGVzdFVzZXJDb250ZW50TWFuYWdlckluamVjdGVkU2NyaXB0KTsKICAgICBVc2VyU2NyaXB0TWVz c2FnZVRlc3Q6OmFkZCgiV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyIiwgInNjcmlwdC1tZXNzYWdl LXJlY2VpdmVkIiwgdGVzdFVzZXJDb250ZW50TWFuYWdlclNjcmlwdE1lc3NhZ2VSZWNlaXZlZCk7 CiAgICAgVXNlclNjcmlwdE1lc3NhZ2VUZXN0OjphZGQoIldlYktpdFVzZXJDb250ZW50TWFuYWdl ciIsICJzY3JpcHQtbWVzc2FnZS1mcm9tLWRvbS1iaW5kaW5ncyIsIHRlc3RVc2VyQ29udGVudE1h bmFnZXJTY3JpcHRNZXNzYWdlRnJvbURPTUJpbmRpbmdzKTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViVmlldy5jcHAgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdlYlZpZXcuY3Bw CmluZGV4IDNhYWZkNzguLmY4ZTNjYmY3IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdlYlZpZXcuY3BwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViVmlldy5jcHAKQEAgLTY5OSwy MyArNjk5LDIwIEBAIHB1YmxpYzoKICAgICB9CiAKICAgICBOb3RpZmljYXRpb25XZWJWaWV3VGVz dCgpCi0gICAgICAgIDogV2ViVmlld1Rlc3Qod2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX25l dygpKQotICAgICAgICAsIG1fbm90aWZpY2F0aW9uKG51bGxwdHIpCisgICAgICAgIDogbV9ub3Rp ZmljYXRpb24obnVsbHB0cikKICAgICAgICAgLCBtX2V2ZW50KE5vbmUpCiAgICAgewogICAgICAg ICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmlldywgInBlcm1pc3Npb24tcmVxdWVzdCIsIEdfQ0FM TEJBQ0socGVybWlzc2lvblJlcXVlc3RDYWxsYmFjayksIHRoaXMpOwogICAgICAgICBnX3NpZ25h bF9jb25uZWN0KG1fd2ViVmlldywgInNob3ctbm90aWZpY2F0aW9uIiwgR19DQUxMQkFDSyhzaG93 Tm90aWZpY2F0aW9uQ2FsbGJhY2spLCB0aGlzKTsKLSAgICAgICAgV2ViS2l0VXNlckNvbnRlbnRN YW5hZ2VyKiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdl cihtX3dlYlZpZXcpOwotICAgICAgICB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVnaXN0 ZXJfc2NyaXB0X21lc3NhZ2VfaGFuZGxlcihtYW5hZ2VyLCAibm90aWZpY2F0aW9ucyIpOwotICAg ICAgICBnX3NpZ25hbF9jb25uZWN0KG1hbmFnZXIsICJzY3JpcHQtbWVzc2FnZS1yZWNlaXZlZDo6 bm90aWZpY2F0aW9ucyIsIEdfQ0FMTEJBQ0sobm90aWZpY2F0aW9uc01lc3NhZ2VSZWNlaXZlZENh bGxiYWNrKSwgdGhpcyk7CisgICAgICAgIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl9yZWdp c3Rlcl9zY3JpcHRfbWVzc2FnZV9oYW5kbGVyKG1fdXNlckNvbnRlbnRNYW5hZ2VyLmdldCgpLCAi bm90aWZpY2F0aW9ucyIpOworICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fdXNlckNvbnRlbnRN YW5hZ2VyLmdldCgpLCAic2NyaXB0LW1lc3NhZ2UtcmVjZWl2ZWQ6Om5vdGlmaWNhdGlvbnMiLCBH X0NBTExCQUNLKG5vdGlmaWNhdGlvbnNNZXNzYWdlUmVjZWl2ZWRDYWxsYmFjayksIHRoaXMpOwog ICAgIH0KIAogICAgIH5Ob3RpZmljYXRpb25XZWJWaWV3VGVzdCgpCiAgICAgewogICAgICAgICBn X3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQobV93ZWJWaWV3LCBHX1NJR05BTF9N QVRDSF9EQVRBLCAwLCAwLCAwLCAwLCB0aGlzKTsKLSAgICAgICAgV2ViS2l0VXNlckNvbnRlbnRN YW5hZ2VyKiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdl cihtX3dlYlZpZXcpOwotICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNo ZWQobWFuYWdlciwgR19TSUdOQUxfTUFUQ0hfREFUQSwgMCwgMCwgMCwgMCwgdGhpcyk7Ci0gICAg ICAgIHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl91bnJlZ2lzdGVyX3NjcmlwdF9tZXNzYWdl X2hhbmRsZXIobWFuYWdlciwgIm5vdGlmaWNhdGlvbnMiKTsKKyAgICAgICAgZ19zaWduYWxfaGFu ZGxlcnNfZGlzY29ubmVjdF9tYXRjaGVkKG1fdXNlckNvbnRlbnRNYW5hZ2VyLmdldCgpLCBHX1NJ R05BTF9NQVRDSF9EQVRBLCAwLCAwLCAwLCAwLCB0aGlzKTsKKyAgICAgICAgd2Via2l0X3VzZXJf Y29udGVudF9tYW5hZ2VyX3VucmVnaXN0ZXJfc2NyaXB0X21lc3NhZ2VfaGFuZGxlcihtX3VzZXJD b250ZW50TWFuYWdlci5nZXQoKSwgIm5vdGlmaWNhdGlvbnMiKTsKICAgICB9CiAKICAgIHZvaWQg cmVxdWVzdFBlcm1pc3Npb25BbmRXYWl0VW50aWxHaXZlbigpCkBAIC04MTgsMTMgKzgxNSwxNSBA QCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld0lzUGxheWluZ0F1ZGlvKElzUGxheWluZ0F1ZGlvV2Vi Vmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaQogICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hl ZCgpOwogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbyh0ZXN0 LT5tX3dlYlZpZXcpKTsKIAotICAgIHdlYmtpdF93ZWJfdmlld19ydW5famF2YXNjcmlwdCh0ZXN0 LT5tX3dlYlZpZXcsICJwbGF5VmlkZW8oKTsiLCBudWxscHRyLCBudWxscHRyLCBudWxscHRyKTsK LSAgICB0ZXN0LT53YWl0VW50aWxJc1BsYXlpbmdBdWRpb0NoYW5nZWQoKTsKKyAgICB0ZXN0LT5y dW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoInBsYXlWaWRlbygpOyIsIG51bGxwdHIp OworICAgIGlmICghd2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJW aWV3KSkKKyAgICAgICAgdGVzdC0+d2FpdFVudGlsSXNQbGF5aW5nQXVkaW9DaGFuZ2VkKCk7CiAg ICAgZ19hc3NlcnQod2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJW aWV3KSk7CiAKICAgICAvLyBQYXVzZSB0aGUgdmlkZW8sIGFuZCBjaGVjayBhZ2Fpbi4KLSAgICB3 ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFzY3JpcHQodGVzdC0+bV93ZWJWaWV3LCAiZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ3Rlc3QtdmlkZW8nKS5wYXVzZSgpOyIsIG51bGxwdHIsIG51bGxwdHIs IG51bGxwdHIpOwotICAgIHRlc3QtPndhaXRVbnRpbElzUGxheWluZ0F1ZGlvQ2hhbmdlZCgpOwor ICAgIHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZCgiZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ3Rlc3QtdmlkZW8nKS5wYXVzZSgpOyIsIG51bGxwdHIpOworICAgIGlmICh3 ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbyh0ZXN0LT5tX3dlYlZpZXcpKQorICAgICAg ICB0ZXN0LT53YWl0VW50aWxJc1BsYXlpbmdBdWRpb0NoYW5nZWQoKTsKICAgICBnX2Fzc2VydCgh d2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvV2ViVmlld1Rl c3QuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9XZWJWaWV3VGVzdC5j cHAKaW5kZXggYjAyMTdhZS4uNGEyMjE0NSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9ndGsvV2ViS2l0Mkd0ay9XZWJWaWV3VGVzdC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9ndGsvV2ViS2l0Mkd0ay9XZWJWaWV3VGVzdC5jcHAKQEAgLTI0LDggKzI0LDkgQEAKICNpbmNs dWRlIDxKYXZhU2NyaXB0Q29yZS9KU1JldGFpblB0ci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR1Vu aXF1ZVB0ckd0ay5oPgogCi1XZWJWaWV3VGVzdDo6V2ViVmlld1Rlc3QoV2ViS2l0VXNlckNvbnRl bnRNYW5hZ2VyKiB1c2VyQ29udGVudE1hbmFnZXIpCi0gICAgOiBtX3dlYlZpZXcoV0VCS0lUX1dF Ql9WSUVXKGdfb2JqZWN0X3JlZl9zaW5rKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklF VywgIndlYi1jb250ZXh0IiwgbV93ZWJDb250ZXh0LmdldCgpLCAidXNlci1jb250ZW50LW1hbmFn ZXIiLCB1c2VyQ29udGVudE1hbmFnZXIsIG51bGxwdHIpKSkpCitXZWJWaWV3VGVzdDo6V2ViVmll d1Rlc3QoKQorICAgIDogbV91c2VyQ29udGVudE1hbmFnZXIoYWRvcHRHUmVmKHdlYmtpdF91c2Vy X2NvbnRlbnRfbWFuYWdlcl9uZXcoKSkpCisgICAgLCBtX3dlYlZpZXcoV0VCS0lUX1dFQl9WSUVX KGdfb2JqZWN0X3JlZl9zaW5rKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfVklFVywgIndl Yi1jb250ZXh0IiwgbV93ZWJDb250ZXh0LmdldCgpLCAidXNlci1jb250ZW50LW1hbmFnZXIiLCBt X3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSwgbnVsbHB0cikpKSkKICAgICAsIG1fbWFpbkxvb3Ao Z19tYWluX2xvb3BfbmV3KG51bGxwdHIsIFRSVUUpKQogICAgICwgbV9wYXJlbnRXaW5kb3cobnVs bHB0cikKICAgICAsIG1famF2YXNjcmlwdFJlc3VsdChudWxscHRyKQpAQCAtMzQsNiArMzUsNyBA QCBXZWJWaWV3VGVzdDo6V2ViVmlld1Rlc3QoV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKiB1c2Vy Q29udGVudE1hbmFnZXIpCiAgICAgLCBtX2V4cGVjdGVkV2ViUHJvY2Vzc0NyYXNoKGZhbHNlKQog ewogICAgIGFzc2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1QobV93 ZWJWaWV3KSk7CisgICAgYXNzZXJ0T2JqZWN0SXNEZWxldGVkV2hlblRlc3RGaW5pc2hlcyhHX09C SkVDVChtX3VzZXJDb250ZW50TWFuYWdlci5nZXQoKSkpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qo bV93ZWJWaWV3LCAid2ViLXByb2Nlc3MtY3Jhc2hlZCIsIEdfQ0FMTEJBQ0soV2ViVmlld1Rlc3Q6 OndlYlByb2Nlc3NDcmFzaGVkKSwgdGhpcyk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvV2ViVmlld1Rlc3QuaCBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvZ3RrL1dlYktpdDJHdGsvV2ViVmlld1Rlc3QuaAppbmRleCBmOWQwNWRhLi5hMzAwMWIyIDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3RrL1dlYlZpZXdUZXN0 LmgKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9XZWJWaWV3VGVzdC5o CkBAIC0yOCw3ICsyOCw3IEBACiBjbGFzcyBXZWJWaWV3VGVzdDogcHVibGljIFRlc3QgewogcHVi bGljOgogICAgIE1BS0VfR0xJQl9URVNUX0ZJWFRVUkUoV2ViVmlld1Rlc3QpOwotICAgIFdlYlZp ZXdUZXN0KFdlYktpdFVzZXJDb250ZW50TWFuYWdlciogPSBudWxscHRyKTsKKyAgICBXZWJWaWV3 VGVzdCgpOwogICAgIHZpcnR1YWwgfldlYlZpZXdUZXN0KCk7CiAKICAgICB2aXJ0dWFsIHZvaWQg bG9hZFVSSShjb25zdCBjaGFyKiB1cmkpOwpAQCAtODAsNiArODAsNyBAQCBwdWJsaWM6CiAKICAg ICBzdGF0aWMgZ2Jvb2xlYW4gd2ViUHJvY2Vzc0NyYXNoZWQoV2ViS2l0V2ViVmlldyosIFdlYlZp ZXdUZXN0Kik7CiAKKyAgICBHUmVmUHRyPFdlYktpdFVzZXJDb250ZW50TWFuYWdlcj4gbV91c2Vy Q29udGVudE1hbmFnZXI7CiAgICAgV2ViS2l0V2ViVmlldyogbV93ZWJWaWV3OwogICAgIEdNYWlu TG9vcCogbV9tYWluTG9vcDsKICAgICBDU3RyaW5nIG1fYWN0aXZlVVJJOwo=