143063 2015-03-25 16:04:03 -0700 Add network and application cache directories to WebsiteDataStore 2015-03-25 16:37:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1080082 0 andersca 2015-03-25 16:04:03 -0700 Add network and application cache directories to WebsiteDataStore 1080084 1 249437 andersca 2015-03-25 16:09:13 -0700 Created attachment 249437 Patch 1080095 2 andersca 2015-03-25 16:37:49 -0700 Committed r181984: <http://trac.webkit.org/changeset/181984> 249437 2015-03-25 16:09:13 -0700 2015-03-25 16:12:55 -0700 Patch bug-143063-20150325160835.patch text/plain 6603 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxOTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2JmY2U0NmE1NDVhYzlm YzMwZDJjNjlhNjY1YmM5YTIxZDU2MTEyNS4uM2MxYzA0OGVhMDk1ZDQwZDE5MzY2ZDY2YzNlZjk3 YjFlMDE2ZmRlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTAzLTI1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIG5ldHdvcmsg YW5kIGFwcGxpY2F0aW9uIGNhY2hlIGRpcmVjdG9yaWVzIHRvIFdlYnNpdGVEYXRhU3RvcmUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzA2MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENyZWF0ZSBhIFdl YktpdCBkaXJlY3RvcnkgdW5kZXIgfi9MaWJyYXJ5L0NhY2hlcy88QnVuZGxlIElEPiBmb3Igbm9u LXNhbmRib3hlZCBhcHBsaWNhdGlvbnMsCisgICAgICAgIGFuZCB+L0xpYnJhcnkvQ2FjaGVzIGZv ciBzYW5kYm94ZWQgYXBwbGljYXRpb25zLiBDcmVhdGUgTmV0d29ya0NhY2hlIGFuZCBPZmZsaW5l V2ViQXBwbGljYXRpb25DYWNoZQorICAgICAgICBzdWJkaXJlY3Rvcmllcy4gVGhlc2UgZGlyZWN0 b3JpZXMgd2lsbCBiZSB1c2VkIHdpdGggdGhlIG1vZGVybiBXZWJLaXQgQVBJLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmg6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9BUElXZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06CisgICAgICAgIChBUEk6 OldlYnNpdGVEYXRhU3RvcmU6OmNhY2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u KToKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZp Z3VyYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0 b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6V2Vic2l0ZURhdGFT dG9yZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu aDoKKwogMjAxNS0wMy0yNSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIGEgcHJlZiB0byBlbmFibGUgdGhlIG5ldyBibG9jay1pbnNpZGUtaW5saW5lIG1vZGVs CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVEYXRh U3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9y ZS5oCmluZGV4IGMxNTVmYTM2ZjE4NWMwY2U4MzNjN2M3NWZhNjRhMDQ3YjU3NzExZGMuLjA4MDc1 ZjkyNDJhNGNmN2QyMDExNTIwNzAxNzkzOTYzNWNkYzM4M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5oCkBAIC00NCw2ICs0NCw3 IEBAIHB1YmxpYzoKIAogICAgIFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZSYgd2Vic2l0ZURhdGFT dG9yZSgpIHsgcmV0dXJuICptX3dlYnNpdGVEYXRhU3RvcmU7IH0KIAorICAgIHN0YXRpYyBTdHJp bmcgY2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29uc3QgU3RyaW5nJiBk aXJlY3RvcnlOYW1lKTsKICAgICBzdGF0aWMgU3RyaW5nIHdlYnNpdGVEYXRhRGlyZWN0b3J5Rmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5TmFtZSk7CiAKIHBy aXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL0FQ SVdlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCmluZGV4IGEzNjNkOWI4ZTI3ZTIwNWIy YTM5ZmY1MzRlZDQ5YzlmMmE0YWM2NTUuLmZhNzg4OTQ5ZWQ2MGYzZjYwZGM5M2Q2MDNiMTQxZmIy ZDM1NDQwN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev QVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvQVBJV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCkBAIC0zMCw2ICszMCwzMyBA QAogCiBuYW1lc3BhY2UgQVBJIHsKIAorU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmNhY2hlRGly ZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5TmFt ZSkKK3sKKyAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsKKyAgICBzdGF0aWMg TlNVUkwgKmNhY2hlVVJMOworCisgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRva2VuLCBeeworICAg ICAgICBOU1VSTCAqdXJsID0gW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBVUkxGb3JE aXJlY3Rvcnk6TlNDYWNoZXNEaXJlY3RvcnkgaW5Eb21haW46TlNVc2VyRG9tYWluTWFzayBhcHBy b3ByaWF0ZUZvclVSTDpudWxscHRyIGNyZWF0ZTpOTyBlcnJvcjpudWxscHRyXTsKKyAgICAgICAg aWYgKCF1cmwpCisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworCisg ICAgICAgIGlmICghV2ViS2l0Ojpwcm9jZXNzSGFzQ29udGFpbmVyKCkpIHsKKyAgICAgICAgICAg IE5TU3RyaW5nICpidW5kbGVJZGVudGlmaWVyID0gW05TQnVuZGxlIG1haW5CdW5kbGVdLmJ1bmRs ZUlkZW50aWZpZXI7CisgICAgICAgICAgICBpZiAoIWJ1bmRsZUlkZW50aWZpZXIpCisgICAgICAg ICAgICAgICAgYnVuZGxlSWRlbnRpZmllciA9IFtOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXS5w cm9jZXNzTmFtZTsKKyAgICAgICAgICAgIHVybCA9IFt1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29t cG9uZW50OmJ1bmRsZUlkZW50aWZpZXIgaXNEaXJlY3Rvcnk6WUVTXTsKKyAgICAgICAgfQorCisg ICAgICAgIGNhY2hlVVJMID0gW1t1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2Vi S2l0IiBpc0RpcmVjdG9yeTpZRVNdIHJldGFpbl07CisgICAgfSk7CisKKyAgICBOU1VSTCAqdXJs ID0gW2NhY2hlVVJMIFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpkaXJlY3RvcnlOYW1lIGlz RGlyZWN0b3J5OllFU107CisgICAgaWYgKCFbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJd IGNyZWF0ZURpcmVjdG9yeUF0VVJMOnVybCB3aXRoSW50ZXJtZWRpYXRlRGlyZWN0b3JpZXM6WUVT IGF0dHJpYnV0ZXM6bmlsIGVycm9yOm51bGxwdHJdKQorICAgICAgICBMT0dfRVJST1IoIkZhaWxl ZCB0byBjcmVhdGUgZGlyZWN0b3J5ICVAIiwgdXJsKTsKKworICAgIHJldHVybiB1cmwuYWJzb2x1 dGVVUkwucGF0aC5maWxlU3lzdGVtUmVwcmVzZW50YXRpb247Cit9CisKIFN0cmluZyBXZWJzaXRl RGF0YVN0b3JlOjp3ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihj b25zdCBTdHJpbmcmIGRpcmVjdG9yeU5hbWUpCiB7CiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2Vf dCBvbmNlVG9rZW47CkBAIC02MSwxMSArODgsMTMgQEAgU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6 OndlYnNpdGVEYXRhRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFN0cmkK IAogV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpDb25maWd1cmF0aW9uIFdlYnNpdGVEYXRhU3Rv cmU6OmRlZmF1bHREYXRhU3RvcmVDb25maWd1cmF0aW9uKCkKIHsKLSAgICAvLyBGSVhNRTogRmls bCBldmVyeXRoaW5nIGluLgogICAgIFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Q29uZmlndXJh dGlvbiBjb25maWd1cmF0aW9uOwogCi0gICAgY29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJl Y3RvcnkgPSB3ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiTG9j YWxTdG9yYWdlIik7CisgICAgY29uZmlndXJhdGlvbi5uZXR3b3JrQ2FjaGVEaXJlY3RvcnkgPSBj YWNoZURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiTmV0d29ya0NhY2hlIik7Cisg ICAgY29uZmlndXJhdGlvbi5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5ID0gY2FjaGVEaXJlY3Rv cnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oIk9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlIik7 CisKICAgICBjb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gd2Vic2l0ZURh dGFEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oIldlYlNRTCIpOworICAgIGNvbmZp Z3VyYXRpb24ubG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0gd2Vic2l0ZURhdGFEaXJlY3RvcnlGaWxl U3lzdGVtUmVwcmVzZW50YXRpb24oIkxvY2FsU3RvcmFnZSIpOwogCiAgICAgcmV0dXJuIGNvbmZp Z3VyYXRpb247CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0 ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggY2RlNGVkNjIxYTU2NWRjZDk3ZTc1 MjkxMWEwOTBhZTYwZTE4OWM5MC4uZTBkMGE2ZTM0NmJlNDZiNmI5ZWQ3ZWMwZDFkMzc4ZWEyOGQw Y2JmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl YnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtNjQsNiArNjQsOCBAQCBSZWZQdHI8V2Vic2l0 ZURhdGFTdG9yZT4gV2Vic2l0ZURhdGFTdG9yZTo6Y3JlYXRlKENvbmZpZ3VyYXRpb24gY29uZmln dXJhdGlvbikKIFdlYnNpdGVEYXRhU3RvcmU6OldlYnNpdGVEYXRhU3RvcmUoQ29uZmlndXJhdGlv biBjb25maWd1cmF0aW9uKQogICAgIDogbV9pZGVudGlmaWVyKGdlbmVyYXRlSWRlbnRpZmllcigp KQogICAgICwgbV9zZXNzaW9uSUQoV2ViQ29yZTo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklE KCkpCisgICAgLCBtX25ldHdvcmtDYWNoZURpcmVjdG9yeShXVEY6Om1vdmUoY29uZmlndXJhdGlv bi5uZXR3b3JrQ2FjaGVEaXJlY3RvcnkpKQorICAgICwgbV9hcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3J5KFdURjo6bW92ZShjb25maWd1cmF0aW9uLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpKQog ICAgICwgbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeShXVEY6Om1vdmUoY29uZmlndXJhdGlvbi53 ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSkpCiAgICAgLCBtX3N0b3JhZ2VNYW5hZ2VyKFN0b3JhZ2VN YW5hZ2VyOjpjcmVhdGUoV1RGOjptb3ZlKGNvbmZpZ3VyYXRpb24ubG9jYWxTdG9yYWdlRGlyZWN0 b3J5KSkpCiAgICAgLCBtX3F1ZXVlKFdvcmtRdWV1ZTo6Y3JlYXRlKCJjb20uYXBwbGUuV2ViS2l0 LldlYnNpdGVEYXRhU3RvcmUiKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IGViYzhmM2QxZTBkZjE3NmM2 ZmIwMzFiOWMyZGQyNTMzODM5MDI3MjIuLmE2MTdhN2M2MWU4MmFkZDZlNWE4ODhhZTZkZDU0MDA3 YjE5OTQyZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9XZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaApAQCAtNDUsNiArNDUsOSBAQCBzdHJ1Y3QgV2Vic2l0 ZURhdGFSZWNvcmQ7CiBjbGFzcyBXZWJzaXRlRGF0YVN0b3JlIDogcHVibGljIFJlZkNvdW50ZWQ8 V2Vic2l0ZURhdGFTdG9yZT4sIHB1YmxpYyBXZWJQcm9jZXNzTGlmZXRpbWVPYnNlcnZlciB7CiBw dWJsaWM6CiAgICAgc3RydWN0IENvbmZpZ3VyYXRpb24geworICAgICAgICBTdHJpbmcgbmV0d29y a0NhY2hlRGlyZWN0b3J5OworICAgICAgICBTdHJpbmcgYXBwbGljYXRpb25DYWNoZURpcmVjdG9y eTsKKwogICAgICAgICBTdHJpbmcgd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CiAgICAgICAgIFN0 cmluZyBsb2NhbFN0b3JhZ2VEaXJlY3Rvcnk7CiAgICAgfTsKQEAgLTgzLDYgKzg2LDkgQEAgcHJp dmF0ZToKICAgICBjb25zdCB1aW50NjRfdCBtX2lkZW50aWZpZXI7CiAgICAgY29uc3QgV2ViQ29y ZTo6U2Vzc2lvbklEIG1fc2Vzc2lvbklEOwogCisgICAgY29uc3QgU3RyaW5nIG1fbmV0d29ya0Nh Y2hlRGlyZWN0b3J5OworICAgIGNvbnN0IFN0cmluZyBtX2FwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rv cnk7CisKICAgICBjb25zdCBTdHJpbmcgbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeTsKICAgICBj b25zdCBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IG1fc3RvcmFnZU1hbmFnZXI7CiAK