145950 2015-06-12 17:26:14 -0700 Reimplement WKApplicationCacheManagerRef as WKWebsiteDataStoreRef 2015-06-12 17:31:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1101748 0 andersca 2015-06-12 17:26:14 -0700 Reimplement WKApplicationCacheManagerRef as WKWebsiteDataStoreRef 1101749 1 254837 andersca 2015-06-12 17:27:32 -0700 Created attachment 254837 Patch 1101750 2 andersca 2015-06-12 17:31:04 -0700 Committed r185527: <http://trac.webkit.org/changeset/185527> 254837 2015-06-12 17:27:32 -0700 2015-06-12 17:29:48 -0700 Patch bug-145950-20150612172701.patch text/plain 6491 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWM2OGQ1OTExODkyNTVj ODBmMTAzNmE0NTFmMmZlOWU5NWI5Mjk1ZC4uNTJjZTkxMThkZTMyNjQxZDJhYmVjNWQ2OWY5Yzkw ZjQ1MjY5YTc3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE1LTA2LTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVpbXBsZW1lbnQg V0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclJlZiBhcyBXS1dlYnNpdGVEYXRhU3RvcmVSZWYKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTk1MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLQVBJQ2FzdC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0FwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJH ZXRUeXBlSUQpOgorICAgICAgICAoV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckdldEFwcGxpY2F0 aW9uQ2FjaGVPcmlnaW5zKToKKyAgICAgICAgKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJEZWxl dGVFbnRyaWVzRm9yT3JpZ2luKToKKyAgICAgICAgKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJE ZWxldGVBbGxFbnRyaWVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNw cDoKKyAgICAgICAgKFdLQ29udGV4dEdldEFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyKToKKyAgICAg ICAgKFdLQ29udGV4dEdldFBsdWdpblNpdGVEYXRhTWFuYWdlcik6CisKKzIwMTUtMDYtMTIgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBDbGVhbiB1cCBJ bmRleGVkREIgd2Vic2l0ZSBkYXRhIHJldHJpZXZhbCBhbmQgcmVtb3ZhbAogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTQxCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaAppbmRleCBkZjQ5OWEyZjE2Zjk0YTZjNDAy ZjhmMjI3MWM2NzQ4MWM4YjEzYTA5Li5lODMzY2FmZjlhNzk2MDliOWVkNDIxZGZiM2ZhMDg3MmU3 MjViMmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tBUElD YXN0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQVBJQ2FzdC5oCkBA IC0xMTIsNyArMTEyLDYgQEAgY2xhc3MgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHk7CiBj bGFzcyBXZWJWaWJyYXRpb25Qcm94eTsKIGNsYXNzIFdlYlZpZXdwb3J0QXR0cmlidXRlczsKIAot V0tfQUREX0FQSV9NQVBQSU5HKFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJSZWYsIFdlYkFwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHkpCiBXS19BRERfQVBJX01BUFBJTkcoV0tBdXRoZW50aWNh dGlvbkNoYWxsZW5nZVJlZiwgQXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eSkKIFdLX0FERF9B UElfTUFQUElORyhXS0F1dGhlbnRpY2F0aW9uRGVjaXNpb25MaXN0ZW5lclJlZiwgQXV0aGVudGlj YXRpb25EZWNpc2lvbkxpc3RlbmVyKQogV0tfQUREX0FQSV9NQVBQSU5HKFdLQmFja0ZvcndhcmRM aXN0SXRlbVJlZiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmNw cAppbmRleCBjNmVhYTYwZjg1MTJhMWZkNmQyYmM2NDZjOWNjNzNmZjdjMGJhZDNkLi45NzM2ZTU5 ZDE1N2E5NGFhNzFjY2YxZTI1MmRkODczMTIxMDVkNDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlci5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQXBwbGljYXRpb25DYWNoZU1hbmFnZXIu Y3BwCkBAIC0yNiwyNyArMjYsNDMgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJX S0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmgiCiAKKyNpbmNsdWRlICJBUElXZWJzaXRlRGF0YVN0 b3JlLmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCi0jaW5jbHVkZSAiV2ViQXBwbGljYXRpb25D YWNoZU1hbmFnZXJQcm94eS5oIgorI2luY2x1ZGUgIldlYnNpdGVEYXRhUmVjb3JkLmgiCiAKIHVz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlwZUlEIFdLQXBwbGljYXRpb25DYWNoZU1hbmFn ZXJHZXRUeXBlSUQoKQogewotICAgIHJldHVybiB0b0FQSShXZWJBcHBsaWNhdGlvbkNhY2hlTWFu YWdlclByb3h5OjpBUElUeXBlKTsKKyAgICByZXR1cm4gdG9BUEkoQVBJOjpXZWJzaXRlRGF0YVN0 b3JlOjpBUElUeXBlKTsKIH0KIAotdm9pZCBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyR2V0QXBw bGljYXRpb25DYWNoZU9yaWdpbnMoV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclJlZiBhcHBsaWNh dGlvbkNhY2hlTWFuYWdlclJlZiwgdm9pZCogY29udGV4dCwgV0tBcHBsaWNhdGlvbkNhY2hlTWFu YWdlckdldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5zRnVuY3Rpb24gY2FsbGJhY2spCit2b2lkIFdL QXBwbGljYXRpb25DYWNoZU1hbmFnZXJHZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2lucyhXS0FwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyUmVmIGFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLCB2b2lkKiBjb250 ZXh0LCBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyR2V0QXBwbGljYXRpb25DYWNoZU9yaWdpbnNG dW5jdGlvbiBjYWxsYmFjaykKIHsKLSAgICB0b0ltcGwoYXBwbGljYXRpb25DYWNoZU1hbmFnZXJS ZWYpLT5nZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2lucyh0b0dlbmVyaWNDYWxsYmFja0Z1bmN0aW9u KGNvbnRleHQsIGNhbGxiYWNrKSk7CisgICAgYXV0byYgd2Vic2l0ZURhdGFTdG9yZSA9IHRvSW1w bChyZWludGVycHJldF9jYXN0PFdLV2Vic2l0ZURhdGFTdG9yZVJlZj4oYXBwbGljYXRpb25DYWNo ZU1hbmFnZXIpKS0+d2Vic2l0ZURhdGFTdG9yZSgpOworICAgIHdlYnNpdGVEYXRhU3RvcmUuZmV0 Y2hEYXRhKFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlLCBbY29udGV4dCwgY2FsbGJhY2tdKFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4g ZGF0YVJlY29yZHMpIHsKKyAgICAgICAgVmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+IHNlY3Vy aXR5T3JpZ2luczsKKyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBkYXRhUmVjb3JkIDogZGF0YVJl Y29yZHMpIHsKKyAgICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgb3JpZ2luIDogZGF0YVJlY29y ZC5vcmlnaW5zKQorICAgICAgICAgICAgICAgIHNlY3VyaXR5T3JpZ2lucy5hcHBlbmQoQVBJOjpT ZWN1cml0eU9yaWdpbjo6Y3JlYXRlKG9yaWdpbikpOworICAgICAgICB9CisKKyAgICAgICAgY2Fs bGJhY2sodG9BUEkoQVBJOjpBcnJheTo6Y3JlYXRlKFdURjo6bW92ZShzZWN1cml0eU9yaWdpbnMp KS5wdHIoKSksIG51bGxwdHIsIGNvbnRleHQpOworICAgIH0pOwogfQogCi12b2lkIFdLQXBwbGlj YXRpb25DYWNoZU1hbmFnZXJEZWxldGVFbnRyaWVzRm9yT3JpZ2luKFdLQXBwbGljYXRpb25DYWNo ZU1hbmFnZXJSZWYgYXBwbGljYXRpb25DYWNoZU1hbmFnZXJSZWYsIFdLU2VjdXJpdHlPcmlnaW5S ZWYgb3JpZ2luUmVmKQordm9pZCBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyRGVsZXRlRW50cmll c0Zvck9yaWdpbihXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUmVmIGFwcGxpY2F0aW9uQ2FjaGVN YW5hZ2VyLCBXS1NlY3VyaXR5T3JpZ2luUmVmIG9yaWdpbikKIHsKLSAgICB0b0ltcGwoYXBwbGlj YXRpb25DYWNoZU1hbmFnZXJSZWYpLT5kZWxldGVFbnRyaWVzRm9yT3JpZ2luKHRvSW1wbChvcmln aW5SZWYpKTsKKyAgICBhdXRvJiB3ZWJzaXRlRGF0YVN0b3JlID0gdG9JbXBsKHJlaW50ZXJwcmV0 X2Nhc3Q8V0tXZWJzaXRlRGF0YVN0b3JlUmVmPihhcHBsaWNhdGlvbkNhY2hlTWFuYWdlcikpLT53 ZWJzaXRlRGF0YVN0b3JlKCk7CisKKyAgICBXZWJzaXRlRGF0YVJlY29yZCBkYXRhUmVjb3JkOwor ICAgIGRhdGFSZWNvcmQuYWRkKFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZUluZGV4 ZWREQkRhdGFiYXNlcywgJnRvSW1wbChvcmlnaW4pLT5zZWN1cml0eU9yaWdpbigpKTsKKworICAg IHdlYnNpdGVEYXRhU3RvcmUucmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0 YVR5cGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSwgeyBkYXRhUmVjb3JkIH0sIFtdIHsgfSk7 CiB9CiAKLXZvaWQgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckRlbGV0ZUFsbEVudHJpZXMoV0tB cHBsaWNhdGlvbkNhY2hlTWFuYWdlclJlZiBhcHBsaWNhdGlvbkNhY2hlTWFuYWdlclJlZikKK3Zv aWQgV0tBcHBsaWNhdGlvbkNhY2hlTWFuYWdlckRlbGV0ZUFsbEVudHJpZXMoV0tBcHBsaWNhdGlv bkNhY2hlTWFuYWdlclJlZiBhcHBsaWNhdGlvbkNhY2hlTWFuYWdlcikKIHsKLSAgICB0b0ltcGwo YXBwbGljYXRpb25DYWNoZU1hbmFnZXJSZWYpLT5kZWxldGVBbGxFbnRyaWVzKCk7CisgICAgYXV0 byYgd2Vic2l0ZURhdGFTdG9yZSA9IHRvSW1wbChyZWludGVycHJldF9jYXN0PFdLV2Vic2l0ZURh dGFTdG9yZVJlZj4oYXBwbGljYXRpb25DYWNoZU1hbmFnZXIpKS0+d2Vic2l0ZURhdGFTdG9yZSgp OworICAgIHdlYnNpdGVEYXRhU3RvcmUucmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzOjpXZWJz aXRlRGF0YVR5cGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSwgc3RkOjpjaHJvbm86OnN5c3Rl bV9jbG9jazo6dGltZV9wb2ludDo6bWluKCksIFtdIHsgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCmluZGV4IDg0NWZiM2Y3YTk0YjI2MmY4M2Nh NWM3ZTYwODBhYmZkODRhNDdjOWIuLjgxZTBkMWZhZDdkNWI1ZDBhMGU4MWMwMzg0MDg0Y2Q3NTNj Y2IxZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRl eHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3Bw CkBAIC00MTcsOSArNDE3LDkgQEAgV0tXZWJzaXRlRGF0YVN0b3JlUmVmIFdLQ29udGV4dEdldFdl YnNpdGVEYXRhU3RvcmUoV0tDb250ZXh0UmVmIGNvbnRleHQpCiAgICAgcmV0dXJuIHRvQVBJKHRv SW1wbChjb250ZXh0KS0+d2Vic2l0ZURhdGFTdG9yZSgpKTsKIH0KIAotV0tBcHBsaWNhdGlvbkNh Y2hlTWFuYWdlclJlZiBXS0NvbnRleHRHZXRBcHBsaWNhdGlvbkNhY2hlTWFuYWdlcihXS0NvbnRl eHRSZWYgY29udGV4dFJlZikKK1dLQXBwbGljYXRpb25DYWNoZU1hbmFnZXJSZWYgV0tDb250ZXh0 R2V0QXBwbGljYXRpb25DYWNoZU1hbmFnZXIoV0tDb250ZXh0UmVmIGNvbnRleHQpCiB7Ci0gICAg cmV0dXJuIHRvQVBJKHRvSW1wbChjb250ZXh0UmVmKS0+c3VwcGxlbWVudDxXZWJBcHBsaWNhdGlv bkNhY2hlTWFuYWdlclByb3h5PigpKTsKKyAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxXS0Fw cGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUmVmPihXS0NvbnRleHRHZXRXZWJzaXRlRGF0YVN0b3JlKGNv bnRleHQpKTsKIH0KIAogV0tCYXR0ZXJ5TWFuYWdlclJlZiBXS0NvbnRleHRHZXRCYXR0ZXJ5TWFu YWdlcihXS0NvbnRleHRSZWYgY29udGV4dFJlZikKQEAgLTQ2NSw3ICs0NjUsNyBAQCBXS05vdGlm aWNhdGlvbk1hbmFnZXJSZWYgV0tDb250ZXh0R2V0Tm90aWZpY2F0aW9uTWFuYWdlcihXS0NvbnRl eHRSZWYgY29udGV4dFJlZgogV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXJSZWYgV0tDb250ZXh0R2V0 UGx1Z2luU2l0ZURhdGFNYW5hZ2VyKFdLQ29udGV4dFJlZiBjb250ZXh0KQogewogI2lmIEVOQUJM RShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFdLUGx1 Z2luU2l0ZURhdGFNYW5hZ2VyUmVmPih0b0FQSSh0b0ltcGwoY29udGV4dCktPndlYnNpdGVEYXRh U3RvcmUoKSkpOworICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFdLUGx1Z2luU2l0ZURhdGFN YW5hZ2VyUmVmPihXS0NvbnRleHRHZXRXZWJzaXRlRGF0YVN0b3JlKGNvbnRleHQpKTsKICNlbHNl CiAgICAgVU5VU0VEX1BBUkFNKGNvbnRleHQpOwogICAgIHJldHVybiBudWxscHRyOwo=