181217 2018-01-02 12:24:48 -0800 Restrict navigation-time WKWebsiteDataStore swapping to main frame navigations 2018-01-05 16:09:32 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1385190 0 achristensen 2018-01-02 12:24:48 -0800 Restrict navigation-time WKWebsiteDataStore swapping to main frame navigations 1385191 1 330327 achristensen 2018-01-02 12:26:24 -0800 Created attachment 330327 Patch 1386352 2 achristensen 2018-01-05 16:08:18 -0800 http://trac.webkit.org/r226472 1386353 3 webkit-bug-importer 2018-01-05 16:09:32 -0800 <rdar://problem/36329948> 330327 2018-01-02 12:26:24 -0800 2018-01-05 15:59:22 -0800 Patch bug-181217-20180102122624.patch text/plain 6561 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjYzMzApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTAxLTAyICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVzdHJpY3QgbmF2 aWdhdGlvbi10aW1lIFdLV2Vic2l0ZURhdGFTdG9yZSBzd2FwcGluZyB0byBtYWluIGZyYW1lIG5h dmlnYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODEyMTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJZiB3ZSBzd2FwIGR1cmluZyBhbiBpZnJhbWUgbmF2aWdhdGlvbiwgdGhlbiB3ZSBnZXQgYSBw YWdlIGluIGEgc3RyYW5nZSBzdGF0ZS4KKyAgICAgICAgVGhlIGludGVudCBvZiB0aGUgbWFpbiBm cmFtZSBuYXZpZ2F0aW9uIFdLV2Vic2l0ZURhdGFTdG9yZSBzd2FwIGlzIHRoYXQKKyAgICAgICAg dGhhdCBpcyBhIHRpbWUgd2hlbiB3ZSBjYW4gY2hhbmdlIHN0b3JhZ2VzIHdpdGhvdXQgYSBwYWdl IGluIGFuIGluY29uc2lzdGVudCBzdGF0ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9O YXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2 aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisKIDIwMTgt MDEtMDIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBVc2UgQmxvY2tQdHJzIGFuZCBsYW1iZGFzIGluc3RlYWQgb2YgbmV3L2RlbGV0ZSB0byBw YXNzIHBhcmFtZXRlcnMgdG8gYmxvY2tzIGluIFdlYlZpZXdJbXBsOjpwZXJmb3JtRHJhZ09wZXJh dGlvbgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRl Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRp b25TdGF0ZS5tbQkocmV2aXNpb24gMjI2MzI1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MTcsNiArNDE3LDcg QEAgc3RhdGljIHZvaWQgdHJ5QXBwTGluayhSZWY8QVBJOjpOYXZpZ2F0aQogdm9pZCBOYXZpZ2F0 aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b24oV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHksIFJlZjxBUEk6Ok5hdmlnYXRpb25BY3Rpb24+ JiYgbmF2aWdhdGlvbkFjdGlvbiwgUmVmPFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBs aXN0ZW5lciwgQVBJOjpPYmplY3QqIHVzZXJJbmZvKQogewogICAgIFN0cmluZyBtYWluRnJhbWVV UkxTdHJpbmcgPSB3ZWJQYWdlUHJveHkubWFpbkZyYW1lKCktPnVybCgpOworICAgIGJvb2wgc3Vi ZnJhbWVOYXZpZ2F0aW9uID0gbmF2aWdhdGlvbkFjdGlvbi0+dGFyZ2V0RnJhbWUoKSAmJiAhbmF2 aWdhdGlvbkFjdGlvbi0+dGFyZ2V0RnJhbWUoKS0+aXNNYWluRnJhbWUoKTsKIAogICAgIGlmICgh bV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25IYW5kbGVyCiAgICAgICAgICYmICFt X25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9saWNpZXMK QEAgLTQ2MSw3ICs0NjIsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVu dDo6CiAgICAgCiAgICAgYXV0byBjaGVja2VyID0gQ29tcGxldGlvbkhhbmRsZXJDYWxsQ2hlY2tl cjo6Y3JlYXRlKG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSwgZGVsZWdhdGVIYXNXZWJzaXRlUG9s aWNpZXMgPyBAc2VsZWN0b3IoX3dlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bjpkZWNpc2lvbkhhbmRsZXI6KSA6IEBzZWxlY3Rvcih3ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5kbGVyOikpOwogICAgIAotICAgIGF1dG8gZGVjaXNp b25IYW5kbGVyV2l0aFBvbGljaWVzID0gW2xvY2FsTGlzdGVuZXIgPSBXVEZNb3ZlKGxpc3RlbmVy KSwgbmF2aWdhdGlvbkFjdGlvbiA9IG5hdmlnYXRpb25BY3Rpb24uY29weVJlZigpLCBjaGVja2Vy ID0gV1RGTW92ZShjaGVja2VyKSwgbWFpbkZyYW1lVVJMU3RyaW5nLCB3ZWJQYWdlUHJveHkgPSBt YWtlUmVmKHdlYlBhZ2VQcm94eSldKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSBhY3Rpb25Qb2xp Y3ksIF9XS1dlYnNpdGVQb2xpY2llcyAqd2Vic2l0ZVBvbGljaWVzKSBtdXRhYmxlIHsKKyAgICBh dXRvIGRlY2lzaW9uSGFuZGxlcldpdGhQb2xpY2llcyA9IFtsb2NhbExpc3RlbmVyID0gV1RGTW92 ZShsaXN0ZW5lciksIG5hdmlnYXRpb25BY3Rpb24gPSBuYXZpZ2F0aW9uQWN0aW9uLmNvcHlSZWYo KSwgY2hlY2tlciA9IFdURk1vdmUoY2hlY2tlciksIG1haW5GcmFtZVVSTFN0cmluZywgd2ViUGFn ZVByb3h5ID0gbWFrZVJlZih3ZWJQYWdlUHJveHkpLCBzdWJmcmFtZU5hdmlnYXRpb25dKFdLTmF2 aWdhdGlvbkFjdGlvblBvbGljeSBhY3Rpb25Qb2xpY3ksIF9XS1dlYnNpdGVQb2xpY2llcyAqd2Vi c2l0ZVBvbGljaWVzKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKGNoZWNrZXItPmNvbXBsZXRpb25I YW5kbGVySGFzQmVlbkNhbGxlZCgpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBjaGVj a2VyLT5kaWRDYWxsQ29tcGxldGlvbkhhbmRsZXIoKTsKQEAgLTQ3Myw2ICs0NzQsOSBAQCB2b2lk IE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6CiAgICAgICAgICAgICAgICAgYXV0 byYgc2Vzc2lvbklEID0gZGF0YS0+d2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMtPm5ldHdvcmtT ZXNzaW9uUGFyYW1ldGVycy5zZXNzaW9uSUQ7CiAgICAgICAgICAgICAgICAgaWYgKCFzZXNzaW9u SUQuaXNFcGhlbWVyYWwoKSAmJiBzZXNzaW9uSUQgIT0gUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRT ZXNzaW9uSUQoKSkKICAgICAgICAgICAgICAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW52 YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIl9XS1dlYnNpdGVQb2xpY2llcy53ZWJzaXRl RGF0YVN0b3JlIG11c3QgYmUgbmlsLCBkZWZhdWx0LCBvciBub24tcGVyc2lzdGVudC4iXTsKKyAg ICAgICAgICAgICAgICBpZiAoc3ViZnJhbWVOYXZpZ2F0aW9uKQorICAgICAgICAgICAgICAgICAg ICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAi X1dLV2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3RvcmUgbXVzdCBiZSBuaWwgZm9yIHN1YmZy YW1lIG5hdmlnYXRpb25zLiJdOworCiAgICAgICAgICAgICAgICAgd2ViUGFnZVByb3h5LT5jaGFu Z2VXZWJzaXRlRGF0YVN0b3JlKHdlYnNpdGVQb2xpY2llcy0+X3dlYnNpdGVQb2xpY2llcy0+d2Vi c2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkpOwogICAgICAgICAgICAgfQogICAg ICAgICB9CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdl TG9nCShyZXZpc2lvbiAyMjYzMzEpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNCBAQAorMjAxOC0wMS0wMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFJlc3RyaWN0IG5hdmlnYXRpb24tdGltZSBXS1dl YnNpdGVEYXRhU3RvcmUgc3dhcHBpbmcgdG8gbWFpbiBmcmFtZSBuYXZpZ2F0aW9ucworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMjE3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVQb2xpY2llcy5tbToKKyAgICAgICAgKC1bV2Vic2l0 ZVBvbGljaWVzV2Vic2l0ZURhdGFTdG9yZURlbGVnYXRlIF93ZWJWaWV3OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5kbGVyOl0pOgorICAgICAgICAoVEVTVCk6CisK IDIwMTgtMDEtMDIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIFRlc3QgL3dlYmtpdDIvV2ViS2l0V2ViRXh0ZW5zaW9uL2Zvcm0tY29u dHJvbHMtYXNzb2NpYXRlZC1zaWduYWwgaXMgZmxha3kKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tCShy ZXZpc2lvbiAyMjYzMjUpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dlYnNpdGVQb2xpY2llcy5tbQkod29ya2luZyBjb3B5KQpAQCAtODExLDExICs4MTEsMjUgQEAg LSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZQogCiAgICAgICAgIGRvbmUg PSB0cnVlOwogICAgIH0KLSAgICBpZiAoW3VybC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9jaGVj a1N0b3JhZ2UiXSB8fCBbdXJsLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL2NoZWNrQ29va2llcyJd KSB7CisgICAgaWYgKFt1cmwucGF0aCBpc0VxdWFsVG9TdHJpbmc6QCIvY2hlY2tTdG9yYWdlIl0K KyAgICAgICAgfHwgW3VybC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9jaGVja0Nvb2tpZXMiXQor ICAgICAgICB8fCBbdXJsLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL21haW5GcmFtZSJdKSB7CiAg ICAgICAgIF9XS1dlYnNpdGVQb2xpY2llcyAqd2Vic2l0ZVBvbGljaWVzID0gW1tbX1dLV2Vic2l0 ZVBvbGljaWVzIGFsbG9jXSBpbml0XSBhdXRvcmVsZWFzZV07CiAgICAgICAgIHdlYnNpdGVQb2xp Y2llcy53ZWJzaXRlRGF0YVN0b3JlID0gW1dLV2Vic2l0ZURhdGFTdG9yZSBub25QZXJzaXN0ZW50 RGF0YVN0b3JlXTsKICAgICAgICAgZGVjaXNpb25IYW5kbGVyKFdLTmF2aWdhdGlvbkFjdGlvblBv bGljeUFsbG93LCB3ZWJzaXRlUG9saWNpZXMpOwogICAgIH0KKyAgICBpZiAoW3VybC5wYXRoIGlz RXF1YWxUb1N0cmluZzpAIi9zdWJGcmFtZSJdKSB7CisgICAgICAgIF9XS1dlYnNpdGVQb2xpY2ll cyAqd2Vic2l0ZVBvbGljaWVzID0gW1tbX1dLV2Vic2l0ZVBvbGljaWVzIGFsbG9jXSBpbml0XSBh dXRvcmVsZWFzZV07CisgICAgICAgIHdlYnNpdGVQb2xpY2llcy53ZWJzaXRlRGF0YVN0b3JlID0g W1dLV2Vic2l0ZURhdGFTdG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3JlXTsKKyAgICAgICAgYm9v bCBzYXdFeGNlcHRpb24gPSBmYWxzZTsKKyAgICAgICAgQHRyeSB7CisgICAgICAgICAgICBkZWNp c2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5Q2FuY2VsLCB3ZWJzaXRlUG9saWNp ZXMpOworICAgICAgICB9IEBjYXRjaCAoTlNFeGNlcHRpb24gKmV4Y2VwdGlvbikgeworICAgICAg ICAgICAgc2F3RXhjZXB0aW9uID0gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICBFWFBFQ1RfVFJV RShzYXdFeGNlcHRpb24pOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9CiB9CiAKIC0gKHZv aWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzdGFydFVSTFNjaGVtZVRhc2s6KGlkIDxX S1VSTFNjaGVtZVRhc2s+KXRhc2sKQEAgLTg2OSw2ICs4ODMsMTAgQEAgVEVTVChXZWJLaXQsIFVw ZGF0ZVdlYnNpdGVQb2xpY2llc0ludmFsaQogICAgIAogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0 OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0 Oi8vL2ludmFsaWQiXV1dOwogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7Cisg ICAgCisgICAgZG9uZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGlm cmFtZSBzcmM9J3N1YkZyYW1lJz48L2lmcmFtZT4iIGJhc2VVUkw6W05TVVJMIFVSTFdpdGhTdHJp bmc6QCJodHRwOi8vd2Via2l0Lm9yZy9tYWluRnJhbWUiXV07CisgICAgVGVzdFdlYktpdEFQSTo6 VXRpbDo6cnVuKCZkb25lKTsKIH0KIAogVEVTVChXZWJLaXQsIFdlYnNpdGVQb2xpY2llc0RhdGFT dG9yZSkK