156859 2016-04-21 12:30:14 -0700 Stop using ApplicationCacheStorage::singleton() in WebKitLegacy 2016-04-21 13:05:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1185879 0 andersca 2016-04-21 12:30:14 -0700 Stop using ApplicationCacheStorage::singleton() in WebKitLegacy 1185881 1 276943 andersca 2016-04-21 12:35:56 -0700 Created attachment 276943 Patch 1185890 2 andersca 2016-04-21 13:05:35 -0700 Committed r199829: <http://trac.webkit.org/changeset/199829> 276943 2016-04-21 12:35:56 -0700 2016-04-21 12:53:29 -0700 Patch bug-156859-20160421123618.patch text/plain 7150 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5Nzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZTM5MDU1Y2Vm NzE0ZmQ0YjUwMDBkNTZkYzVkMDY0NjE2NDUxMzk1ZS4uMzI1NjI4MDE4NzlkMGNiMzVmZDJjNDY4 OGM4MTFjNzkzZWUwMTZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE2 LTA0LTIxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg U3RvcCB1c2luZyBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkgaW4gV2ViS2l0 TGVnYWN5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTY4NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1dlYkFwcGxpY2F0aW9uQ2FjaGUubW06CisgICAgICAgICgrW1dlYkFw cGxpY2F0aW9uQ2FjaGUgaW5pdGlhbGl6ZVdpdGhCdW5kbGVJZGVudGlmaWVyOl0pOgorICAgICAg ICBDaGFuZ2UgdGhpcyB0byBqdXN0IHN0b3JlIHRoZSBidW5kbGUgaWRlbnRpZmllci4KKworICAg ICAgICAoYXBwbGljYXRpb25DYWNoZUJ1bmRsZUlkZW50aWZpZXIpOgorICAgICAgICBIZWxwZXIg ZnVuY3Rpb24gdGhhdCByZXR1cm5zIHRoZSBidW5kbGUgaWRlbnRpZmllciBmb3IgdGhlIGFwcCBj YWNoZS4KKworICAgICAgICAoYXBwbGljYXRpb25DYWNoZVBhdGgpOgorICAgICAgICBSZXR1cm4g dGhlIGFwcGxpY2F0aW9uIGNhY2hlIHBhdGguCisKKyAgICAgICAgKHdlYkFwcGxpY2F0aW9uQ2Fj aGVTdG9yYWdlKToKKyAgICAgICAgQ3JlYXRlIGEgbmV3IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl IG9iamVjdC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2Vi VmlldyBfY29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYW1lOmdyb3VwTmFtZTpdKToKKyAg ICAgICAgKC1bV2ViVmlldyBpbml0U2ltcGxlSFRNTERvY3VtZW50V2l0aFN0eWxlOmZyYW1lOnBy ZWZlcmVuY2VzOmdyb3VwTmFtZTpdKToKKyAgICAgICAgU2V0IHBhZ2VDb25maWd1cmF0aW9uLmFw cGxpY2F0aW9uQ2FjaGVTdG9yYWdlIHRvIHdlYkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCkuCisK KyAgICAgICAgKFdlYktpdEluaXRpYWxpemVBcHBsaWNhdGlvbkNhY2hlUGF0aElmTmVjZXNzYXJ5 KTogRGVsZXRlZC4KKwogMjAxNi0wNC0yMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgTW9kZXJuIElEQiAoV29ya2Vycyk6IEVuYWJsZSBJTkRFWEVEX0RBVEFC QVNFX0lOX1dPUktFUlMgY29tcGlsZSB0aW1lIGZsYWcsIGJ1dCBkaXNhYmxlZCBpbiBSdW50aW1l RW5hYmxlZEZlYXR1cmVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViQXBwbGljYXRpb25DYWNoZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYkFwcGxpY2F0aW9uQ2FjaGUubW0KaW5kZXggNTFjZWNjYmUyODk5ZTMzMmQ3ZTQ5 YjgzZjk3Y2E4OGIyYWQ4NGIxZS4uNGVmODQ3MjQxZmZkYjJlYWQwMzc0Yjk2ODFlZGRlODljZTI5 NGIzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQXBw bGljYXRpb25DYWNoZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJBcHBsaWNhdGlvbkNhY2hlLm1tCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbXBvcnQgIldlYkFw cGxpY2F0aW9uQ2FjaGVJbnRlcm5hbC5oIgogCisjaW1wb3J0ICJXZWJLaXROU1N0cmluZ0V4dHJh cy5oIgogI2ltcG9ydCAiV2ViU2VjdXJpdHlPcmlnaW5JbnRlcm5hbC5oIgogI2ltcG9ydCA8V2Vi Q29yZS9BcHBsaWNhdGlvbkNhY2hlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0FwcGxpY2F0aW9uQ2Fj aGVTdG9yYWdlLmg+CkBAIC0zMiw4ICszMyw4IEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+ CiAKICNpZiBQTEFURk9STShJT1MpCi0jaW1wb3J0ICJXZWJLaXROU1N0cmluZ0V4dHJhcy5oIgog I2ltcG9ydCAiV2ViU1FMaXRlRGF0YWJhc2VUcmFja2VyQ2xpZW50LmgiCisjaW1wb3J0IDxXZWJD b3JlL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oPgogI2ltcG9ydCA8V2ViQ29yZS9TUUxpdGVE YXRhYmFzZVRyYWNrZXIuaD4KICNlbmRpZgogCkBAIC00Miw2ICs0Myw4IEBAIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwogQGltcGxlbWVudGF0aW9uIFdlYkFwcGxpY2F0aW9uQ2FjaGUKIAogI2lm IFBMQVRGT1JNKElPUykKK3N0YXRpYyBOU1N0cmluZyAqb3ZlcnJpZGVCdW5kbGVJZGVudGlmaWVy OworCiAvLyBGSVhNRTogVGhpcyB3aWxsIGJlIHJlbW92ZWQgd2hlbiBXZWJLaXRJbml0aWFsaXpl QXBwbGljYXRpb25DYWNoZVBhdGhJZk5lY2Vzc2FyeSgpCiAvLyBpcyBtb3ZlZCBmcm9tIFdlYlZp ZXcubW0gdG8gV2ViS2l0SW5pdGlhbGl6ZUFwcGxpY2F0aW9uQ2FjaGVJZk5lY2Vzc2FyeSgpIGlu IHRoaXMgZmlsZS4KIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NzU2NyAKQEAgLTUwLDE1ICs1MywzOCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKICAgICBz dGF0aWMgQk9PTCBpbml0aWFsaXplZCA9IE5POwogICAgIGlmIChpbml0aWFsaXplZCkKICAgICAg ICAgcmV0dXJuOwotICAgIAorCiAgICAgU1FMaXRlRGF0YWJhc2VUcmFja2VyOjpzZXRDbGllbnQo V2ViU1FMaXRlRGF0YWJhc2VUcmFja2VyQ2xpZW50OjpzaGFyZWRXZWJTUUxpdGVEYXRhYmFzZVRy YWNrZXJDbGllbnQoKSk7CiAKLSAgICB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLnNldENh Y2hlRGlyZWN0b3J5KFtOU1N0cmluZyBfd2Via2l0X2xvY2FsQ2FjaGVEaXJlY3RvcnlXaXRoQnVu ZGxlSWRlbnRpZmllcjpidW5kbGVJZGVudGlmaWVyXSk7Ci0gICAgCisgICAgQVNTRVJUKCFvdmVy cmlkZUJ1bmRsZUlkZW50aWZpZXIpOworICAgIG92ZXJyaWRlQnVuZGxlSWRlbnRpZmllciA9IFti dW5kbGVJZGVudGlmaWVyIGNvcHldOworCiAgICAgaW5pdGlhbGl6ZWQgPSBZRVM7CiB9CiAjZW5k aWYKIAorc3RhdGljIE5TU3RyaW5nICphcHBsaWNhdGlvbkNhY2hlQnVuZGxlSWRlbnRpZmllcigp Cit7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIGlmIChvdmVycmlkZUJ1bmRsZUlkZW50aWZpZXIp CisgICAgICAgIHJldHVybiBvdmVycmlkZUJ1bmRsZUlkZW50aWZpZXI7CisgICAgaWYgKFdlYkNv cmU6OklPU0FwcGxpY2F0aW9uOjppc01vYmlsZVNhZmFyaSgpIHx8IFdlYkNvcmU6OklPU0FwcGxp Y2F0aW9uOjppc1dlYkFwcCgpKQorICAgICAgICByZXR1cm4gQCJjb20uYXBwbGUuV2ViQXBwQ2Fj aGUiOworI2VuZGlmCisKKyAgICBOU1N0cmluZyAqYXBwTmFtZSA9IFtbTlNCdW5kbGUgbWFpbkJ1 bmRsZV0gYnVuZGxlSWRlbnRpZmllcl07CisgICAgaWYgKCFhcHBOYW1lKQorICAgICAgICBhcHBO YW1lID0gW1tOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXSBwcm9jZXNzTmFtZV07CisKKyAgICBB U1NFUlQoYXBwTmFtZSk7CisgICAgcmV0dXJuIGFwcE5hbWU7Cit9CisKK3N0YXRpYyBOU1N0cmlu ZyAqYXBwbGljYXRpb25DYWNoZVBhdGgoKQoreworICAgIHJldHVybiBbTlNTdHJpbmcgX3dlYmtp dF9sb2NhbENhY2hlRGlyZWN0b3J5V2l0aEJ1bmRsZUlkZW50aWZpZXI6YXBwbGljYXRpb25DYWNo ZUJ1bmRsZUlkZW50aWZpZXIoKV07Cit9CisKICsgKGxvbmcgbG9uZyltYXhpbXVtU2l6ZQogewog ICAgIHJldHVybiB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLm1heGltdW1TaXplKCk7CkBA IC0xMTUsNSArMTQxLDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIFdlYkNvcmU6OkFw cGxpY2F0aW9uQ2FjaGVTdG9yYWdlJiB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpCiB7Ci0g ICAgcmV0dXJuIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKTsKKyAgICBzdGF0 aWMgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UmIHN0b3JhZ2UgPSBBcHBsaWNhdGlvbkNhY2hlU3Rv cmFnZTo6Y3JlYXRlKGFwcGxpY2F0aW9uQ2FjaGVQYXRoKCksICJBcHBsaWNhdGlvbkNhY2hlIiku bGVha1JlZigpOworCisgICAgcmV0dXJuIHN0b3JhZ2U7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXcubW0KaW5kZXggNDM1NDRlNjBlYjQwYmY3NDZkN2YzZDk2ZGNjZDg2MGE4YWRkZDhk Ny4uNzNjYmRjOWRhM2Y4M2VlMmFlNTY1MzJmMzllODkzZmJiOTg1NjdhYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtNzMwLDI5ICs3MzAsNiBAQCBzdGF0aWMgU3RyaW5n IHdlYktpdEJ1bmRsZVZlcnNpb25TdHJpbmcoKQogICAgIHJlcG9ydEV4Y2VwdGlvbihleGVjU3Rh dGUsIHRvSlMoZXhlY1N0YXRlLCBleGNlcHRpb24pKTsKIH0KIAotc3RhdGljIHZvaWQgV2ViS2l0 SW5pdGlhbGl6ZUFwcGxpY2F0aW9uQ2FjaGVQYXRoSWZOZWNlc3NhcnkoKQotewotICAgIHN0YXRp YyBCT09MIGluaXRpYWxpemVkID0gTk87Ci0gICAgaWYgKGluaXRpYWxpemVkKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICBOU1N0cmluZyAqYXBwTmFtZSA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0g YnVuZGxlSWRlbnRpZmllcl07Ci0gICAgaWYgKCFhcHBOYW1lKQotICAgICAgICBhcHBOYW1lID0g W1tOU1Byb2Nlc3NJbmZvIHByb2Nlc3NJbmZvXSBwcm9jZXNzTmFtZV07Ci0jaWYgUExBVEZPUk0o SU9TKQotICAgIGlmIChXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNNb2JpbGVTYWZhcmkoKSB8 fCBXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNXZWJBcHAoKSkKLSAgICAgICAgYXBwTmFtZSA9 IEAiY29tLmFwcGxlLldlYkFwcENhY2hlIjsKLSNlbmRpZgotCi0gICAgQVNTRVJUKGFwcE5hbWUp OwotCi0gICAgTlNTdHJpbmcqIGNhY2hlRGlyID0gW05TU3RyaW5nIF93ZWJraXRfbG9jYWxDYWNo ZURpcmVjdG9yeVdpdGhCdW5kbGVJZGVudGlmaWVyOmFwcE5hbWVdOwotCi0gICAgd2ViQXBwbGlj YXRpb25DYWNoZVN0b3JhZ2UoKS5zZXRDYWNoZURpcmVjdG9yeShjYWNoZURpcik7Ci0gICAgCi0g ICAgaW5pdGlhbGl6ZWQgPSBZRVM7Ci19Ci0KIHN0YXRpYyB2b2lkIFdlYktpdEluaXRpYWxpemVB cHBsaWNhdGlvblN0YXRpc3RpY3NTdG9yYWdlUGF0aElmTmVjZXNzYXJ5KCkKIHsKICAgICBzdGF0 aWMgQk9PTCBpbml0aWFsaXplZCA9IE5POwpAQCAtOTYyLDcgKzkzOSw2IEBAIHN0YXRpYyB2b2lk IFdlYktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlkZXJJZk5lY2Vzc2FyeSgpCiAgICAgICAgIGlm IChbc3RhbmRhcmRQcmVmZXJlbmNlcyBzdG9yYWdlVHJhY2tlckVuYWJsZWRdKQogI2VuZGlmCiAg ICAgICAgIFdlYktpdEluaXRpYWxpemVTdG9yYWdlSWZOZWNlc3NhcnkoKTsKLSAgICAgICAgV2Vi S2l0SW5pdGlhbGl6ZUFwcGxpY2F0aW9uQ2FjaGVQYXRoSWZOZWNlc3NhcnkoKTsKICAgICAgICAg V2ViS2l0SW5pdGlhbGl6ZUFwcGxpY2F0aW9uU3RhdGlzdGljc1N0b3JhZ2VQYXRoSWZOZWNlc3Nh cnkoKTsKICNpZiBFTkFCTEUoR0FNRVBBRCkKICAgICAgICAgV2ViS2l0SW5pdGlhbGl6ZUdhbWVw YWRQcm92aWRlcklmTmVjZXNzYXJ5KCk7CkBAIC0xMDAyLDYgKzk3OCw3IEBAIHN0YXRpYyB2b2lk IFdlYktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlkZXJJZk5lY2Vzc2FyeSgpCiAgICAgcGFnZUNv bmZpZ3VyYXRpb24uYWx0ZXJuYXRpdmVUZXh0Q2xpZW50ID0gbmV3IFdlYkFsdGVybmF0aXZlVGV4 dENsaWVudChzZWxmKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWlu RnJhbWUgPSBuZXcgV2ViRnJhbWVMb2FkZXJDbGllbnQ7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24u cHJvZ3Jlc3NUcmFja2VyQ2xpZW50ID0gbmV3IFdlYlByb2dyZXNzVHJhY2tlckNsaWVudChzZWxm KTsKKyAgICBwYWdlQ29uZmlndXJhdGlvbi5hcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSA9ICZ3ZWJB cHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLmRhdGFiYXNl UHJvdmlkZXIgPSAmV2ViRGF0YWJhc2VQcm92aWRlcjo6c2luZ2xldG9uKCk7CiAgICAgcGFnZUNv bmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyID0gJl9wcml2YXRlLT5ncm91cC0+ c3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udXNlckNv bnRlbnRQcm92aWRlciA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnVzZXJDb250ZW50Q29udHJvbGxlcigp OwpAQCAtMTI0NSw2ICsxMjIyLDcgQEAgc3RhdGljIHZvaWQgV2ViS2l0SW5pdGlhbGl6ZUdhbWVw YWRQcm92aWRlcklmTmVjZXNzYXJ5KCkKICAgICBwYWdlQ29uZmlndXJhdGlvbi5pbnNwZWN0b3JD bGllbnQgPSBuZXcgV2ViSW5zcGVjdG9yQ2xpZW50KHNlbGYpOwogICAgIHBhZ2VDb25maWd1cmF0 aW9uLmxvYWRlckNsaWVudEZvck1haW5GcmFtZSA9IG5ldyBXZWJGcmFtZUxvYWRlckNsaWVudDsK ICAgICBwYWdlQ29uZmlndXJhdGlvbi5wcm9ncmVzc1RyYWNrZXJDbGllbnQgPSBuZXcgV2ViUHJv Z3Jlc3NUcmFja2VyQ2xpZW50KHNlbGYpOworICAgIHBhZ2VDb25maWd1cmF0aW9uLmFwcGxpY2F0 aW9uQ2FjaGVTdG9yYWdlID0gJndlYkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCk7CiAgICAgcGFn ZUNvbmZpZ3VyYXRpb24uZGF0YWJhc2VQcm92aWRlciA9ICZXZWJEYXRhYmFzZVByb3ZpZGVyOjpz aW5nbGV0b24oKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNlUHJvdmlk ZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsKICAgICBw YWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudFByb3ZpZGVyID0gJl9wcml2YXRlLT5ncm91cC0+ dXNlckNvbnRlbnRDb250cm9sbGVyKCk7Cg==