127635 2014-01-25 16:41:54 -0800 Remove more unnecessary #if PLATFORM(IOS)s in ApplicationCacheStorage.cpp 2014-01-25 16:45:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue japhet oldest_to_newest 972082 0 sam 2014-01-25 16:41:54 -0800 Remove more unnecessary #if PLATFORM(IOS)s in ApplicationCacheStorage.cpp 972084 1 222240 sam 2014-01-25 16:42:42 -0800 Created attachment 222240 Patch 972085 2 sam 2014-01-25 16:45:58 -0800 Committed r162789: <http://trac.webkit.org/changeset/162789> 222240 2014-01-25 16:42:42 -0800 2014-01-25 16:43:53 -0800 Patch bug-127635-20140125164236.patch text/plain 4566 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Mjc4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAxLTI1ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIG1vcmUgdW5uZWNlc3Nhcnkg I2lmIFBMQVRGT1JNKElPUylzIGluIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NjM1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvYXBwY2Fj aGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGlj YXRpb25DYWNoZVN0b3JhZ2U6OmV4ZWN1dGVTUUxDb21tYW5kKToKKyAgICAgICAgKFdlYkNvcmU6 OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjp2ZXJpZnlTY2hlbWFWZXJzaW9uKToKKyAgICAgICAg KFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpleGVjdXRlU3RhdGVtZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzdG9yZSk6CisgICAgICAg IChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6ZW5zdXJlT3JpZ2luUmVjb3JkKToK KyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpsb2FkQ2FjaGUpOgor CiAyMDE0LTAxLTI1ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVt b3ZlIHNvbWUgaU9TICNpZmRlZnMgYnkgYWRkaW5nIFNRTGl0ZURhdGFiYXNlVHJhY2tlciB0byBh bGwgdGhlIGJ1aWxkcwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxp Y2F0aW9uQ2FjaGVTdG9yYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuY3BwCShyZXZpc2lvbiAxNjI3ODcp CisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3Jh Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NjYsOSArNTY2LDcgQEAgYm9vbCBBcHBsaWNhdGlv bkNhY2hlU3RvcmFnZTo6c3RvcmVVcGRhdAogCiBib29sIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl OjpleGVjdXRlU1FMQ29tbWFuZChjb25zdCBTdHJpbmcmIHNxbCkKIHsKLSNpZiBQTEFURk9STShJ T1MpCiAgICAgQVNTRVJUKFNRTGl0ZURhdGFiYXNlVHJhY2tlcjo6aGFzVHJhbnNhY3Rpb25JblBy b2dyZXNzKCkpOwotI2VuZGlmCiAgICAgQVNTRVJUKG1fZGF0YWJhc2UuaXNPcGVuKCkpOwogICAg IAogICAgIGJvb2wgcmVzdWx0ID0gbV9kYXRhYmFzZS5leGVjdXRlQ29tbWFuZChzcWwpOwpAQCAt NTg2LDkgKzU4NCw4IEBAIHN0YXRpYyBjb25zdCBpbnQgc2NoZW1hVmVyc2lvbiA9IDc7CiAgICAg CiB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjp2ZXJpZnlTY2hlbWFWZXJzaW9uKCkKIHsK LSNpZiBQTEFURk9STShJT1MpCiAgICAgQVNTRVJUKFNRTGl0ZURhdGFiYXNlVHJhY2tlcjo6aGFz VHJhbnNhY3Rpb25JblByb2dyZXNzKCkpOwotI2VuZGlmCisKICAgICBpbnQgdmVyc2lvbiA9IFNR TGl0ZVN0YXRlbWVudChtX2RhdGFiYXNlLCAiUFJBR01BIHVzZXJfdmVyc2lvbiIpLmdldENvbHVt bkludCgwKTsKICAgICBpZiAodmVyc2lvbiA9PSBzY2hlbWFWZXJzaW9uKQogICAgICAgICByZXR1 cm47CkBAIC02ODIsOSArNjc5LDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6b3Bl bkRhdGFiYQogCiBib29sIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpleGVjdXRlU3RhdGVtZW50 KFNRTGl0ZVN0YXRlbWVudCYgc3RhdGVtZW50KQogewotI2lmIFBMQVRGT1JNKElPUykKICAgICBB U1NFUlQoU1FMaXRlRGF0YWJhc2VUcmFja2VyOjpoYXNUcmFuc2FjdGlvbkluUHJvZ3Jlc3MoKSk7 Ci0jZW5kaWYKICAgICBib29sIHJlc3VsdCA9IHN0YXRlbWVudC5leGVjdXRlQ29tbWFuZCgpOwog ICAgIGlmICghcmVzdWx0KQogICAgICAgICBMT0dfRVJST1IoIkFwcGxpY2F0aW9uIENhY2hlIFN0 b3JhZ2U6IGZhaWxlZCB0byBleGVjdXRlIHN0YXRlbWVudCBcIiVzXCIgZXJyb3IgXCIlc1wiIiwg CkBAIC02OTUsOSArNjkwLDcgQEAgYm9vbCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6ZXhlY3V0 ZVN0YQogCiBib29sIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzdG9yZShBcHBsaWNhdGlvbkNh Y2hlR3JvdXAqIGdyb3VwLCBHcm91cFN0b3JhZ2VJREpvdXJuYWwqIGpvdXJuYWwpCiB7Ci0jaWYg UExBVEZPUk0oSU9TKQogICAgIEFTU0VSVChTUUxpdGVEYXRhYmFzZVRyYWNrZXI6Omhhc1RyYW5z YWN0aW9uSW5Qcm9ncmVzcygpKTsKLSNlbmRpZgogICAgIEFTU0VSVChncm91cC0+c3RvcmFnZUlE KCkgPT0gMCk7CiAgICAgQVNTRVJUKGpvdXJuYWwpOwogCkBAIC03MjQsOSArNzE3LDcgQEAgYm9v bCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c3RvcmUoQXBwbAogCiBib29sIEFwcGxpY2F0aW9u Q2FjaGVTdG9yYWdlOjpzdG9yZShBcHBsaWNhdGlvbkNhY2hlKiBjYWNoZSwgUmVzb3VyY2VTdG9y YWdlSURKb3VybmFsKiBzdG9yYWdlSURKb3VybmFsKQogewotI2lmIFBMQVRGT1JNKElPUykKICAg ICBBU1NFUlQoU1FMaXRlRGF0YWJhc2VUcmFja2VyOjpoYXNUcmFuc2FjdGlvbkluUHJvZ3Jlc3Mo KSk7Ci0jZW5kaWYKICAgICBBU1NFUlQoY2FjaGUtPnN0b3JhZ2VJRCgpID09IDApOwogICAgIEFT U0VSVChjYWNoZS0+Z3JvdXAoKS0+c3RvcmFnZUlEKCkgIT0gMCk7CiAgICAgQVNTRVJUKHN0b3Jh Z2VJREpvdXJuYWwpOwpAQCAtODA4LDkgKzc5OSw3IEBAIGJvb2wgQXBwbGljYXRpb25DYWNoZVN0 b3JhZ2U6OnN0b3JlKEFwcGwKIAogYm9vbCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c3RvcmUo QXBwbGljYXRpb25DYWNoZVJlc291cmNlKiByZXNvdXJjZSwgdW5zaWduZWQgY2FjaGVTdG9yYWdl SUQpCiB7Ci0jaWYgUExBVEZPUk0oSU9TKQogICAgIEFTU0VSVChTUUxpdGVEYXRhYmFzZVRyYWNr ZXI6Omhhc1RyYW5zYWN0aW9uSW5Qcm9ncmVzcygpKTsKLSNlbmRpZgogICAgIEFTU0VSVChjYWNo ZVN0b3JhZ2VJRCk7CiAgICAgQVNTRVJUKCFyZXNvdXJjZS0+c3RvcmFnZUlEKCkpOwogICAgIApA QCAtOTgzLDkgKzk3Miw3IEBAIGJvb2wgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnN0b3JlKEFw cGwKIAogYm9vbCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6ZW5zdXJlT3JpZ2luUmVjb3JkKGNv bnN0IFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiB7Ci0jaWYgUExBVEZPUk0oSU9TKQogICAgIEFT U0VSVChTUUxpdGVEYXRhYmFzZVRyYWNrZXI6Omhhc1RyYW5zYWN0aW9uSW5Qcm9ncmVzcygpKTsK LSNlbmRpZgogICAgIFNRTGl0ZVN0YXRlbWVudCBpbnNlcnRPcmlnaW5TdGF0ZW1lbnQobV9kYXRh YmFzZSwgIklOU0VSVCBJTlRPIE9yaWdpbnMgKG9yaWdpbiwgcXVvdGEpIFZBTFVFUyAoPywgPyki KTsKICAgICBpZiAoaW5zZXJ0T3JpZ2luU3RhdGVtZW50LnByZXBhcmUoKSAhPSBTUUxSZXN1bHRP aykKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTEzMywxMCArMTEyMCw4IEBAIHN0YXRpYyBp bmxpbmUgdm9pZCBwYXJzZUhlYWRlcnMoY29uc3QgU3QKICAgICAKIFBhc3NSZWZQdHI8QXBwbGlj YXRpb25DYWNoZT4gQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OmxvYWRDYWNoZSh1bnNpZ25lZCBz dG9yYWdlSUQpCiB7Ci0jaWYgUExBVEZPUk0oSU9TKQogICAgIEFTU0VSVChTUUxpdGVEYXRhYmFz ZVRyYWNrZXI6Omhhc1RyYW5zYWN0aW9uSW5Qcm9ncmVzcygpKTsKLSNlbmRpZgotICAgIFNRTGl0 ZVN0YXRlbWVudCBjYWNoZVN0YXRlbWVudChtX2RhdGFiYXNlLCAKKyAgICBTUUxpdGVTdGF0ZW1l bnQgY2FjaGVTdGF0ZW1lbnQobV9kYXRhYmFzZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIlNFTEVDVCB1cmwsIHN0YXR1c0NvZGUsIHR5cGUsIG1pbWVUeXBlLCB0ZXh0RW5j b2RpbmdOYW1lLCBoZWFkZXJzLCBDYWNoZVJlc291cmNlRGF0YS5kYXRhLCBDYWNoZVJlc291cmNl RGF0YS5wYXRoIEZST00gQ2FjaGVFbnRyaWVzIElOTkVSIEpPSU4gQ2FjaGVSZXNvdXJjZXMgT04g Q2FjaGVFbnRyaWVzLnJlc291cmNlPUNhY2hlUmVzb3VyY2VzLmlkICIKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIklOTkVSIEpPSU4gQ2FjaGVSZXNvdXJjZURhdGEgT04gQ2Fj aGVSZXNvdXJjZURhdGEuaWQ9Q2FjaGVSZXNvdXJjZXMuZGF0YSBXSEVSRSBDYWNoZUVudHJpZXMu Y2FjaGU9PyIpOwogICAgIGlmIChjYWNoZVN0YXRlbWVudC5wcmVwYXJlKCkgIT0gU1FMUmVzdWx0 T2spIHsK