125913 2013-12-17 22:33:24 -0800 [iOS] Upstream WebCore/storage changes 2013-12-23 15:25:37 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbates dbates aestes andersca beidson ddkilzer joepeck oldest_to_newest 960849 0 dbates 2013-12-17 22:33:24 -0800 Upstream the iOS related changes to WebCore/storage. 960851 1 219508 dbates 2013-12-17 22:40:37 -0800 Created attachment 219508 Patch 962054 2 219508 ddkilzer 2013-12-20 14:26:49 -0800 Comment on attachment 219508 Patch r=me 962617 3 dbates 2013-12-23 15:25:37 -0800 Committed r161029: <http://trac.webkit.org/changeset/161029> 219508 2013-12-17 22:40:37 -0800 2013-12-20 14:26:49 -0800 Patch bug-125913-20131217224038.patch text/plain 7118 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNzQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTEzZjhkY2NjNWVkNzYz M2QwNWFjN2NmOTg0OTdiMzc1ZDRiYjFjOC4uMzEwN2FjZjBlYTcyN2I4YjE2YjJmOTg4OTFiOWE1 MjdmNzAyYTc1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTEyLTE3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBbaU9TXSBVcHN0cmVhbSBX ZWJDb3JlL3N0b3JhZ2UgY2hhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI1OTEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhU3luYy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTdG9yYWdlQXJlYVN5bmM6Om9wZW5EYXRhYmFzZSk6IEFkZGVkIGlPUy1zcGVjaWZp YyBjb2RlLgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZUFyZWFTeW5jOjpzeW5jKTogRGl0dG8u CisgICAgICAgICogc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdG9yYWdlVHJhY2tlcjo6b3BlblRyYWNrZXJEYXRhYmFzZSk6IERpdHRvLgorICAgICAgICAo V2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6OnN5bmNJbXBvcnRPcmlnaW5JZGVudGlmaWVycyk6IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6OnN5bmNGaWxlU3lzdGVtQW5k VHJhY2tlckRhdGFiYXNlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlVHJhY2tl cjo6c3luY1NldE9yaWdpbkRldGFpbHMpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlN0b3Jh Z2VUcmFja2VyOjpzeW5jRGVsZXRlQWxsT3JpZ2lucyk6IERpdHRvLgorICAgICAgICAoV2ViQ29y ZTo6U3RvcmFnZVRyYWNrZXI6OnN5bmNEZWxldGVPcmlnaW4pOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpkYXRhYmFzZVBhdGhGb3JPcmlnaW4pOiBEaXR0by4KKwor MjAxMy0xMi0xNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKICAgICAgICAg W2lPU10gVXBzdHJlYW0gV2ViQ29yZS9sb2FkZXIgY2hhbmdlcwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1ODc5CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0 b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmNwcAppbmRleCA1NmYzYTQyOTk4NDZhMDk2ODk3NWIyZjcw ZDg2Y2ZhYjc1YzYxYTBiLi43YjAyNjdmMTUwN2FhMDc1ZTU4OGIxZDcxMjUzMTNjZTRjODk5NjJl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhU3luYy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYVN5bmMuY3BwCkBAIC00MSw2 ICs0MSwxMCBAQAogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW5jbHVkZSA8d3RmL3Rl eHQvQ1N0cmluZy5oPgogCisjaWYgUExBVEZPUk0oSU9TKQorI2luY2x1ZGUgIlNRTGl0ZURhdGFi YXNlVHJhY2tlci5oIgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogLy8gSWYgdGhl IFN0b3JhZ2VBcmVhIHVuZGVyZ29lcyByYXBpZCBjaGFuZ2VzLCBkb24ndCBzeW5jIGVhY2ggY2hh bmdlIHRvIGRpc2suCkBAIC0yMzIsNiArMjM2LDkgQEAgdm9pZCBTdG9yYWdlQXJlYVN5bmM6Om9w ZW5EYXRhYmFzZShPcGVuRGF0YWJhc2VQYXJhbVR5cGUgb3BlbmluZ1N0cmF0ZWd5KQogICAgIEFT U0VSVCghbV9kYXRhYmFzZS5pc09wZW4oKSk7CiAgICAgQVNTRVJUKCFtX2RhdGFiYXNlT3BlbkZh aWxlZCk7CiAKKyNpZiBQTEFURk9STShJT1MpCisgICAgU1FMaXRlVHJhbnNhY3Rpb25JblByb2dy ZXNzQXV0b0NvdW50ZXIgdHJhbnNhY3Rpb25Db3VudGVyOworI2VuZGlmCiAgICAgU3RyaW5nIGRh dGFiYXNlRmlsZW5hbWUgPSBtX3N5bmNNYW5hZ2VyLT5mdWxsRGF0YWJhc2VGaWxlbmFtZShtX2Rh dGFiYXNlSWRlbnRpZmllcik7CiAKICAgICBpZiAoIWZpbGVFeGlzdHMoZGF0YWJhc2VGaWxlbmFt ZSkgJiYgb3BlbmluZ1N0cmF0ZWd5ID09IFNraXBJZk5vbkV4aXN0ZW50KQpAQCAtNDAzLDYgKzQx MCw5IEBAIHZvaWQgU3RvcmFnZUFyZWFTeW5jOjpzeW5jKGJvb2wgY2xlYXJJdGVtcywgY29uc3Qg SGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mIGl0ZW1zCiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgCisjaWYgUExBVEZPUk0oSU9TKQorICAgIFNRTGl0ZVRyYW5zYWN0aW9uSW5Qcm9ncmVzc0F1 dG9Db3VudGVyIHRyYW5zYWN0aW9uQ291bnRlcjsKKyNlbmRpZgogICAgIC8vIElmIHRoZSBjbGVh ciBmbGFnIGlzIHNldCwgdGhlbiB3ZSBjbGVhciBhbGwgaXRlbXMgb3V0IGJlZm9yZSB3ZSB3cml0 ZSBhbnkgbmV3IG9uZXMgaW4uCiAgICAgaWYgKGNsZWFySXRlbXMpIHsKICAgICAgICAgU1FMaXRl U3RhdGVtZW50IGNsZWFyKG1fZGF0YWJhc2UsICJERUxFVEUgRlJPTSBJdGVtVGFibGUiKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHAKaW5kZXggM2MyZmE1MzI3OTFj Mjc3ZjIyNmFiMTA0YTU2MzU4YzI4OGQzMmIyNi4uOTc2ZGNkYWVmNGIwOGU2MWJlODQxZTU3YTgy NTAxNWQ3ZGE2YjExNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdl VHJhY2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5j cHAKQEAgLTQyLDYgKzQyLDEwIEBACiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUg PHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAorI2lmIFBMQVRGT1JNKElPUykKKyNpbmNsdWRlICJTUUxp dGVEYXRhYmFzZVRyYWNrZXIuaCIKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0 YXRpYyBTdG9yYWdlVHJhY2tlciogc3RvcmFnZVRyYWNrZXIgPSAwOwpAQCAtMTMyLDYgKzEzNiw5 IEBAIHZvaWQgU3RvcmFnZVRyYWNrZXI6Om9wZW5UcmFja2VyRGF0YWJhc2UoYm9vbCBjcmVhdGVJ ZkRvZXNOb3RFeGlzdCkKIHsKICAgICBBU1NFUlQobV9pc0FjdGl2ZSk7CiAgICAgQVNTRVJUKCFp c01haW5UaHJlYWQoKSk7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIFNRTGl0ZVRyYW5zYWN0aW9u SW5Qcm9ncmVzc0F1dG9Db3VudGVyIHRyYW5zYWN0aW9uQ291bnRlcjsKKyNlbmRpZgogICAgIEFT U0VSVCghbV9kYXRhYmFzZU11dGV4LnRyeUxvY2soKSk7CiAKICAgICBpZiAobV9kYXRhYmFzZS5p c09wZW4oKSkKQEAgLTE5Miw2ICsxOTksOSBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jSW1w b3J0T3JpZ2luSWRlbnRpZmllcnMoKQogICAgICAgICBvcGVuVHJhY2tlckRhdGFiYXNlKGZhbHNl KTsKIAogICAgICAgICBpZiAobV9kYXRhYmFzZS5pc09wZW4oKSkgeworI2lmIFBMQVRGT1JNKElP UykKKyAgICAgICAgICAgIFNRTGl0ZVRyYW5zYWN0aW9uSW5Qcm9ncmVzc0F1dG9Db3VudGVyIHRy YW5zYWN0aW9uQ291bnRlcjsKKyNlbmRpZgogICAgICAgICAgICAgU1FMaXRlU3RhdGVtZW50IHN0 YXRlbWVudChtX2RhdGFiYXNlLCAiU0VMRUNUIG9yaWdpbiBGUk9NIE9yaWdpbnMiKTsKICAgICAg ICAgICAgIGlmIChzdGF0ZW1lbnQucHJlcGFyZSgpICE9IFNRTFJlc3VsdE9rKSB7CiAgICAgICAg ICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gcHJlcGFyZSBzdGF0ZW1lbnQuIik7CkBAIC0y MzIsNiArMjQyLDkgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY0ltcG9ydE9yaWdpbklkZW50 aWZpZXJzKCkKIHZvaWQgU3RvcmFnZVRyYWNrZXI6OnN5bmNGaWxlU3lzdGVtQW5kVHJhY2tlckRh dGFiYXNlKCkKIHsKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKyNpZiBQTEFURk9STShJ T1MpCisgICAgU1FMaXRlVHJhbnNhY3Rpb25JblByb2dyZXNzQXV0b0NvdW50ZXIgdHJhbnNhY3Rp b25Db3VudGVyOworI2VuZGlmCiAgICAgQVNTRVJUKG1faXNBY3RpdmUpOwogCiAgICAgVmVjdG9y PFN0cmluZz4gcGF0aHM7CkBAIC0zMDQsNiArMzE3LDkgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6 c2V0T3JpZ2luRGV0YWlscyhjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFN0 cmkKIHZvaWQgU3RvcmFnZVRyYWNrZXI6OnN5bmNTZXRPcmlnaW5EZXRhaWxzKGNvbnN0IFN0cmlu ZyYgb3JpZ2luSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZUZpbGUpCiB7CiAgICAg QVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIFNRTGl0ZVRy YW5zYWN0aW9uSW5Qcm9ncmVzc0F1dG9Db3VudGVyIHRyYW5zYWN0aW9uQ291bnRlcjsKKyNlbmRp ZgogCiAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fZGF0YWJhc2VNdXRleCk7CiAKQEAgLTM3Myw2 ICszODksOSBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpkZWxldGVBbGxPcmlnaW5zKCkKIHZvaWQg U3RvcmFnZVRyYWNrZXI6OnN5bmNEZWxldGVBbGxPcmlnaW5zKCkKIHsKICAgICBBU1NFUlQoIWlz TWFpblRocmVhZCgpKTsKKyNpZiBQTEFURk9STShJT1MpCisgICAgU1FMaXRlVHJhbnNhY3Rpb25J blByb2dyZXNzQXV0b0NvdW50ZXIgdHJhbnNhY3Rpb25Db3VudGVyOworI2VuZGlmCiAgICAgCiAg ICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fZGF0YWJhc2VNdXRleCk7CiAgICAgCkBAIC00MDIsMTAg KzQyMSwxNSBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlQWxsT3JpZ2lucygpCiAg ICAgCiAgICAgaWYgKHJlc3VsdCAhPSBTUUxSZXN1bHREb25lKQogICAgICAgICBMT0dfRVJST1Io IkZhaWxlZCB0byByZWFkIGluIGFsbCBvcmlnaW5zIGZyb20gdGhlIGRhdGFiYXNlLiIpOwotICAg IAotICAgIGlmIChtX2RhdGFiYXNlLmlzT3BlbigpKQorCisgICAgaWYgKG1fZGF0YWJhc2UuaXNP cGVuKCkpIHsKKyNpZiBQTEFURk9STShJT1MpCisgICAgICAgIFNRTGl0ZUZpbGVTeXN0ZW06OnRy dW5jYXRlRGF0YWJhc2VGaWxlKG1fZGF0YWJhc2Uuc3FsaXRlM0hhbmRsZSgpKTsKKyNlbmRpZgog ICAgICAgICBtX2RhdGFiYXNlLmNsb3NlKCk7Ci0gICAgCisgICAgfQorCisjaWYgIVBMQVRGT1JN KElPUykKICAgICBpZiAoIVNRTGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZURhdGFiYXNlRmlsZSh0cmFj a2VyRGF0YWJhc2VQYXRoKCkpKSB7CiAgICAgICAgIC8vIEluIHRoZSBjYXNlIHdoZXJlIGl0IGlz IG5vdCBwb3NzaWJsZSB0byBkZWxldGUgdGhlIGRhdGFiYXNlIGZpbGUgKGUuZyBzb21lIG90aGVy IHByb2dyYW0KICAgICAgICAgLy8gbGlrZSBhIHZpcnVzIHNjYW5uZXIgaXMgYWNjZXNzaW5nIGl0 KSwgbWFrZSBzdXJlIHRvIHJlbW92ZSBhbGwgZW50cmllcy4KQEAgLTQyMyw2ICs0NDcsNyBAQCB2 b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlQWxsT3JpZ2lucygpCiAgICAgICAgIH0KICAg ICB9CiAgICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFzZURpcmVjdG9yeSht X3N0b3JhZ2VEaXJlY3RvcnlQYXRoKTsKKyNlbmRpZgogfQogCiB2b2lkIFN0b3JhZ2VUcmFja2Vy OjpkZWxldGVPcmlnaW5XaXRoSWRlbnRpZmllcihjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZp ZXIpCkBAIC00NjEsNiArNDg2LDkgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6ZGVsZXRlT3JpZ2lu KFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRl T3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikKIHsKICAgICBBU1NFUlQoIWlz TWFpblRocmVhZCgpKTsKKyNpZiBQTEFURk9STShJT1MpCisgICAgU1FMaXRlVHJhbnNhY3Rpb25J blByb2dyZXNzQXV0b0NvdW50ZXIgdHJhbnNhY3Rpb25Db3VudGVyOworI2VuZGlmCiAKICAgICBN dXRleExvY2tlciBsb2NrZXIobV9kYXRhYmFzZU11dGV4KTsKICAgICAKQEAgLTUwMSw5ICs1Mjks MTQgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY0RlbGV0ZU9yaWdpbihjb25zdCBTdHJpbmcm IG9yaWdpbklkZW50aWZpZXIpCiAgICAgfQogCiAgICAgaWYgKHNob3VsZERlbGV0ZVRyYWNrZXJG aWxlcykgeworI2lmIFBMQVRGT1JNKElPUykKKyAgICAgICAgU1FMaXRlRmlsZVN5c3RlbTo6dHJ1 bmNhdGVEYXRhYmFzZUZpbGUobV9kYXRhYmFzZS5zcWxpdGUzSGFuZGxlKCkpOworI2VuZGlmCiAg ICAgICAgIG1fZGF0YWJhc2UuY2xvc2UoKTsKKyNpZiAhUExBVEZPUk0oSU9TKQogICAgICAgICBT UUxpdGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFzZUZpbGUodHJhY2tlckRhdGFiYXNlUGF0aCgp KTsKICAgICAgICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFzZURpcmVjdG9y eShtX3N0b3JhZ2VEaXJlY3RvcnlQYXRoKTsKKyNlbmRpZgogICAgIH0KIAogICAgIHsKQEAgLTU2 Nyw3ICs2MDAsMTEgQEAgU3RyaW5nIFN0b3JhZ2VUcmFja2VyOjpkYXRhYmFzZVBhdGhGb3JPcmln aW4oY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKQogICAgIAogICAgIGlmICghbV9kYXRh YmFzZS5pc09wZW4oKSkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgIAorCisjaWYgUExB VEZPUk0oSU9TKQorICAgIFNRTGl0ZVRyYW5zYWN0aW9uSW5Qcm9ncmVzc0F1dG9Db3VudGVyIHRy YW5zYWN0aW9uQ291bnRlcjsKKyNlbmRpZgorCiAgICAgU1FMaXRlU3RhdGVtZW50IHBhdGhTdGF0 ZW1lbnQobV9kYXRhYmFzZSwgIlNFTEVDVCBwYXRoIEZST00gT3JpZ2lucyBXSEVSRSBvcmlnaW49 PyIpOwogICAgIGlmIChwYXRoU3RhdGVtZW50LnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPaykgewog ICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBwcmVwYXJlIHNlbGVjdGlvbiBvZiBwYXRoIGZv ciBvcmlnaW4gJyVzJyIsIG9yaWdpbklkZW50aWZpZXIuYXNjaWkoKS5kYXRhKCkpOwo=