131326 2014-04-07 16:17:37 -0700 Fallback to default storage session when there isn't a valid session ID 2014-04-08 09:10:02 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates ap beidson oldest_to_newest 998277 0 dbates 2014-04-07 16:17:37 -0700 We should fallback to the default storage session in WebKit1 and WebKit2 without NetworkProcess when we have a null private browsing session so as to make our behavior consistent with the analogous behavior in WebKit2 with NetworkProcess. 998278 1 dbates 2014-04-07 16:17:50 -0700 <rdar://problem/16231679> 998287 2 228771 dbates 2014-04-07 16:49:17 -0700 Created attachment 228771 Patch 998295 3 dbates 2014-04-07 16:59:40 -0700 I didn't include a test for this change because it's not obvious to me how to write a test that disables private browsing via WebKit preferences and starts a load before WebKit notifies WebCore of the preference change ([-WebView _preferencesChanged] is called in WebKit1) such that we update the session ID of the page. I am open to suggestions. 998588 4 dbates 2014-04-08 09:10:02 -0700 Committed r166928: <http://trac.webkit.org/changeset/166928> 228771 2014-04-07 16:49:17 -0700 2014-04-07 17:23:13 -0700 Patch bug-131326-20140407164903.patch text/plain 5355 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZDliNTY2OWI0 YzY5ZjQ5NWE5ZDM2NDA4MTk2Y2NjY2JkY2Q3MDEzNC4uMzU4YmQ5MzhlMGRmZTVlNzZiNDQwOWZh NjkzYTY5YTBiMmVkYmQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0 LTA0LTA3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBGYWxs YmFjayB0byBkZWZhdWx0IHN0b3JhZ2Ugc2Vzc2lvbiB3aGVuIHRoZXJlIGlzbid0IGEgdmFsaWQg c2Vzc2lvbiBJRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMxMzI2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjIzMTY3OT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlcyBhbmQgaXNzdWUgd2hl cmUgd2UgbWF5IHVzZSB0aGUgd3Jvbmcgc3RvcmFnZSBzZXNzaW9uIGFmdGVyIGRpc2FibGluZwor ICAgICAgICBhIHByaXZhdGUgYnJvd3Npbmcgc2Vzc2lvbi4KKworICAgICAgICBDdXJyZW50bHkg V2ViS2l0MSBhbmQgV2ViS2l0MiB3aXRob3V0IE5ldHdvcmtQcm9jZXNzIGFzc3VtZSB0aGF0IHRo ZXJlCisgICAgICAgIGlzIGFsd2F5cyBhIG5vbi1udWxsIHByaXZhdGUgYnJvd3Npbmcgc3RvcmFn ZSBzZXNzaW9uIHNvIGxvbmcgYXMgdGhlIHBhZ2UKKyAgICAgICAgaGFzIGEgbm9uLWRlZmF1bHQg c2Vzc2lvbiBJRC4gSW5zdGVhZCB3ZSBzaG91bGQgb25seSB1c2UgdGhlIHByaXZhdGUgYnJvd3Np bmcKKyAgICAgICAgc3RvcmFnZSBzZXNzaW9uIHdoZW4gaXQncyBub24tbnVsbCBhbmQgdGhlIHBh Z2UgaGFzIGEgbm9uLWRlZmF1bHQgc2Vzc2lvbiBJRDsKKyAgICAgICAgb3RoZXJ3aXNlLCB3ZSBz aG91bGQgdXNlIHRoZSBkZWZhdWx0IHN0b3JhZ2Ugc2Vzc2lvbi4gVGhpcyBjaGFuZ2Ugd2lsbCBt YWtlCisgICAgICAgIHRoZSBiZWhhdmlvciBpbiBXZWJLaXQxIGFuZCBXZWJLaXQyIHdpdGhvdXQg TmV0d29ya1Byb2Nlc3MgY29uc2lzdGVudCB3aXRoCisgICAgICAgIHRoZSBiZWhhdmlvciBpbiBX ZWJLaXQyIHdpdGggTmV0d29ya1Byb2Nlc3MuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tOgorICAgICAgICAoV2ViRnJhbWVOZXR3b3JraW5n Q29udGV4dDo6c3RvcmFnZVNlc3Npb24pOgorCiAyMDE0LTA0LTA0ICBCcmlhbiBKLiBCdXJnICA8 YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KIAogICAgICAgICBFbmFibGUgV0VCX1JFUExBWSBmb3Ig UExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDY3ODJhODFkY2RmNmQ4ZmM3OGZlMDI1Y2IwMDY5 YTcyMjkzOTFmZjIuLjViODk2YjJmMDdmNmMxYjM4ZWMzYTE5ZDNmNzgzMWI0YjA1ZTRiNDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNC0wNC0wNyAgRGFuaWVsIEJhdGVzICA8ZGFi YXRlc0BhcHBsZS5jb20+CisKKyAgICAgICAgRmFsbGJhY2sgdG8gZGVmYXVsdCBzdG9yYWdlIHNl c3Npb24gd2hlbiB0aGVyZSBpc24ndCBhIHZhbGlkIHNlc3Npb24gSUQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTMyNgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTYyMzE2Nzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRml4ZXMgYW5kIGlzc3VlIHdoZXJlIHdlIG1heSB1c2UgdGhlIHdyb25nIHN0 b3JhZ2Ugc2Vzc2lvbiBhZnRlciBkaXNhYmxpbmcKKyAgICAgICAgYSBwcml2YXRlIGJyb3dzaW5n IHNlc3Npb24uCisKKyAgICAgICAgQ3VycmVudGx5IFdlYktpdDEgYW5kIFdlYktpdDIgd2l0aG91 dCBOZXR3b3JrUHJvY2VzcyBhc3N1bWUgdGhhdCB0aGVyZQorICAgICAgICBpcyBhbHdheXMgYSBu b24tbnVsbCBwcml2YXRlIGJyb3dzaW5nIHN0b3JhZ2Ugc2Vzc2lvbiBzbyBsb25nIGFzIHRoZSBw YWdlCisgICAgICAgIGhhcyBhIG5vbi1kZWZhdWx0IHNlc3Npb24gSUQuIEluc3RlYWQgd2Ugc2hv dWxkIG9ubHkgdXNlIHRoZSBwcml2YXRlIGJyb3dzaW5nCisgICAgICAgIHN0b3JhZ2Ugc2Vzc2lv biB3aGVuIGl0J3Mgbm9uLW51bGwgYW5kIHRoZSBwYWdlIGhhcyBhIG5vbi1kZWZhdWx0IHNlc3Np b24gSUQ7CisgICAgICAgIG90aGVyd2lzZSwgd2Ugc2hvdWxkIHVzZSB0aGUgZGVmYXVsdCBzdG9y YWdlIHNlc3Npb24uIFRoaXMgY2hhbmdlIHdpbGwgbWFrZQorICAgICAgICB0aGUgYmVoYXZpb3Ig aW4gV2ViS2l0MSBhbmQgV2ViS2l0MiB3aXRob3V0IE5ldHdvcmtQcm9jZXNzIGNvbnNpc3RlbnQg d2l0aAorICAgICAgICB0aGUgYmVoYXZpb3IgaW4gV2ViS2l0MiB3aXRoIE5ldHdvcmtQcm9jZXNz LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3 b3JraW5nQ29udGV4dC5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVOZXR3b3JraW5nQ29u dGV4dDo6c3RvcmFnZVNlc3Npb24pOgorCiAyMDE0LTA0LTA0ICBCcmlhbiBKLiBCdXJnICA8YnVy Z0Bjcy53YXNoaW5ndG9uLmVkdT4KIAogICAgICAgICBFbmFibGUgV0VCX1JFUExBWSBmb3IgUExB VEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0KaW5kZXggNzFhY2UzNGEyNDZhZmQ3 YjM0NjhhMDBiMDhmY2VkYzYxYzZmOTBhYS4uZjAwMDViMWMyMWM2MmZjNGY1YTA4NGI5OTgzNWVh MDQ3ZDg5ZDY2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCkBAIC0xMTIsOSArMTEyLDEx IEBAIFJlc291cmNlRXJyb3IgV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6YmxvY2tlZEVycm9y KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxCiBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIFdlYkZy YW1lTmV0d29ya2luZ0NvbnRleHQ6OnN0b3JhZ2VTZXNzaW9uKCkgY29uc3QKIHsKICAgICBBU1NF UlQoaXNNYWluVGhyZWFkKCkpOwotCi0gICAgaWYgKGZyYW1lKCkgJiYgZnJhbWUoKS0+cGFnZSgp LT5zZXNzaW9uSUQoKS5pc0VwaGVtZXJhbCgpKQotICAgICAgICByZXR1cm4gKnByaXZhdGVTZXNz aW9uKCk7Ci0KKyAgICBpZiAoZnJhbWUoKSAmJiBmcmFtZSgpLT5wYWdlKCktPnNlc3Npb25JRCgp LmlzRXBoZW1lcmFsKCkpIHsKKyAgICAgICAgaWYgKE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiogc2Vz c2lvbiA9IHByaXZhdGVTZXNzaW9uKCkuZ2V0KCkpCisgICAgICAgICAgICByZXR1cm4gKnNlc3Np b247CisgICAgICAgIC8vIFNvbWUgcmVxdWVzdHMgbWF5IHN0aWxsIGJlIGNvbWluZyBzaG9ydGx5 IGJlZm9yZSBXZWJDb3JlIHVwZGF0ZXMgdGhlIHNlc3Npb24gSUQgYW5kIGFmdGVyIFdlYktpdCBk ZXN0cm95cyB0aGUgcHJpdmF0ZSBicm93c2luZyBzZXNzaW9uLgorICAgICAgICBMT0dfRVJST1Io IkludmFsaWQgc2Vzc2lvbiBJRC4gUGxlYXNlIGZpbGUgYSBidWcgdW5sZXNzIHlvdSBqdXN0IGRp c2FibGVkIHByaXZhdGUgYnJvd3NpbmcsIGluIHdoaWNoIGNhc2UgaXQncyBhbiBleHBlY3RlZCBy YWNlLiIpOworICAgIH0KICAgICByZXR1cm4gTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0 U3RvcmFnZVNlc3Npb24oKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtp bmdDb250ZXh0Lm1tCmluZGV4IDQ2ZDg5MmU4NzI0ODhiNjVlNmRhMGUzYzllNThhYTIyN2NiYjZj MjIuLmJiYzkyZDljM2Q0MThkOTFjZThlOGI5NmIyYmI2MGRlMTdlOGIwZjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkZyYW1lTmV0 d29ya2luZ0NvbnRleHQubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbQpAQCAtMTA5LDcgKzEwOSwx MyBAQCBSZXNvdXJjZUVycm9yIFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OmJsb2NrZWRFcnJv cihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcQogTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBXZWJG cmFtZU5ldHdvcmtpbmdDb250ZXh0OjpzdG9yYWdlU2Vzc2lvbigpIGNvbnN0CiB7CiAgICAgQVNT RVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICByZXR1cm4gKlNlc3Npb25UcmFja2VyOjpzZXNz aW9uKGZyYW1lKCkgPyBmcmFtZSgpLT5wYWdlKCktPnNlc3Npb25JRCgpIDogU2Vzc2lvbklEOjpk ZWZhdWx0U2Vzc2lvbklEKCkpOworICAgIGlmIChmcmFtZSgpKSB7CisgICAgICAgIGlmIChOZXR3 b3JrU3RvcmFnZVNlc3Npb24qIHNlc3Npb24gPSBTZXNzaW9uVHJhY2tlcjo6c2Vzc2lvbihmcmFt ZSgpLT5wYWdlKCktPnNlc3Npb25JRCgpKSkKKyAgICAgICAgICAgIHJldHVybiAqc2Vzc2lvbjsK KyAgICAgICAgLy8gU29tZSByZXF1ZXN0cyBtYXkgc3RpbGwgYmUgY29taW5nIHNob3J0bHkgYWZ0 ZXIgV2ViUHJvY2VzcyB3YXMgdG9sZCB0byBkZXN0cm95IGl0cyBzZXNzaW9uLgorICAgICAgICBM T0dfRVJST1IoIkludmFsaWQgc2Vzc2lvbiBJRC4gUGxlYXNlIGZpbGUgYSBidWcgdW5sZXNzIHlv dSBqdXN0IGRpc2FibGVkIHByaXZhdGUgYnJvd3NpbmcsIGluIHdoaWNoIGNhc2UgaXQncyBhbiBl eHBlY3RlZCByYWNlLiIpOworICAgIH0KKyAgICByZXR1cm4gTmV0d29ya1N0b3JhZ2VTZXNzaW9u OjpkZWZhdWx0U3RvcmFnZVNlc3Npb24oKTsKIH0KIAogV2ViRnJhbWVMb2FkZXJDbGllbnQqIFdl YkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OndlYkZyYW1lTG9hZGVyQ2xpZW50KCkgY29uc3QK