136962 2014-09-19 14:54:01 -0700 [iOS] ASSERTION FAILED: WTF::isMainThread() in WebCore::memoryCache() when using WebKit1 2014-09-22 17:47:56 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 psolanki psolanki commit-queue psolanki simon.fraser oldest_to_newest 1036214 0 psolanki 2014-09-19 14:54:01 -0700 Loading Safari causes the above assertion to trigger. This is because the disk image caching callback is happening on the main (UI) thread instead of the web thread when using WebKit1. 1036215 1 psolanki 2014-09-19 14:54:16 -0700 <rdar://problem/18342344> 1036216 2 238390 psolanki 2014-09-19 15:04:50 -0700 Created attachment 238390 Patch 1036237 3 238390 ggaren 2014-09-19 16:30:56 -0700 Comment on attachment 238390 Patch r=me 1036244 4 238390 commit-queue 2014-09-19 17:05:20 -0700 Comment on attachment 238390 Patch Clearing flags on attachment: 238390 Committed r173782: <http://trac.webkit.org/changeset/173782> 1036245 5 commit-queue 2014-09-19 17:05:23 -0700 All reviewed patches have been landed. Closing bug. 1036350 6 238390 darin 2014-09-21 11:05:30 -0700 Comment on attachment 238390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238390&action=review > Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm:111 > + CFCachedURLResponseCallBackBlock blockToRun = ^ (const CFCachedURLResponseRef response) This const is incorrect and unneeded. Also would be nice to have consistent syntax with the definition of "block" above. 1036609 7 238390 psolanki 2014-09-22 15:14:06 -0700 Comment on attachment 238390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238390&action=review >> Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm:111 >> + CFCachedURLResponseCallBackBlock blockToRun = ^ (const CFCachedURLResponseRef response) > > This const is incorrect and unneeded. Also would be nice to have consistent syntax with the definition of "block" above. You're right. I am not sure how I ended up with a const there. Will fix. 1036632 8 psolanki 2014-09-22 17:47:56 -0700 (In reply to comment #7) > (From update of attachment 238390 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=238390&action=review > > >> Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm:111 > >> + CFCachedURLResponseCallBackBlock blockToRun = ^ (const CFCachedURLResponseRef response) > > > > This const is incorrect and unneeded. Also would be nice to have consistent syntax with the definition of "block" above. > > You're right. I am not sure how I ended up with a const there. Will fix. Fixed in r173858 - <http://trac.webkit.org/changeset/173858>. 238390 2014-09-19 15:04:50 -0700 2014-09-22 15:14:05 -0700 Patch bug-136962-20140919150448.patch text/plain 3027 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQ3NzYxYWIzMzY3YWRi YjlhM2I3OWYyYjc4MGVjZjYwZTk2MzVmMy4uMjhiOWUyZWM1ZjExNDg5NDVjNzE4NjgxZmNiNmU2 Y2JlNjcyYzQyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA5LTE5ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBU1NFUlRJ T04gRkFJTEVEOiBXVEY6OmlzTWFpblRocmVhZCgpIGluIFdlYkNvcmU6Om1lbW9yeUNhY2hlKCkg d2hlbiB1c2luZyBXZWJLaXQxCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzY5NjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4MzQyMzQ0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBkaXNrIGNh Y2hlIG1vbml0b3IgY2FsbGJhY2sgY29kZSB3YXMgYmVpbmcgZXhlY3V0ZWQgb24gdGhlIG1haW4g dGhyZWFkLiBUaGlzIGlzIHdyb25nCisgICAgICAgIHdoZW4gdGhlIHdlYiB0aHJlYWQgaXMgYmVp bmcgdXNlZCBpbiBXZWJLaXQxIG9uIGlPUy4gVGhlIGNvZGUgbmVlZHMgdG8gcnVuIG9uIHRoZSB3 ZWIKKyAgICAgICAgdGhyZWFkLiBVc2UgV2ViVGhyZWFkUnVuIHRvIGRpc3BhdGNoIHRoZSBibG9j ayB0byB0aGUgd2ViIHRocmVhZC4gVGhpcyB3b3JrcyBmb3IgV2ViS2l0MiBhcworICAgICAgICB3 ZWxsIHNpbmNlIHdoZW4gd2ViIHRocmVhZCBpcyBub3QgYmVpbmcgdXNlZCwgV2ViVGhyZWFkUnVu IGludm9rZXMgdGhlIGJsb2NrIGRpcmVjdGx5LgorCisgICAgICAgICogbG9hZGVyL2NvY29hL0Rp c2tDYWNoZU1vbml0b3JDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkRpc2tDYWNoZU1vbml0 b3I6OkRpc2tDYWNoZU1vbml0b3IpOgorCiAyMDE0LTA5LTE5ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgT3B0aW1pemUgTWFya3VwQWNjdW11bGF0b3I6OmFwcGVu ZFRleHQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NvY29hL0Rpc2tDYWNo ZU1vbml0b3JDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jb2NvYS9EaXNrQ2FjaGVN b25pdG9yQ29jb2EubW0KaW5kZXggYjliZTYzYTQ0MGI5MjY5NjAzMzU1YjY0Yzg3NmY4NjZmY2Rj MDBlNy4uYzMzMDIyMDY2YWM5Y2U2OThlNzI2NzYxZjY2NmIxOGNjMzkzOTAzMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NvY29hL0Rpc2tDYWNoZU1vbml0b3JDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY29jb2EvRGlza0NhY2hlTW9uaXRvckNvY29hLm1t CkBAIC00Myw2ICs0MywxMCBAQAogI2VuZGlmCiAjZW5kaWYKIAorI2lmIFVTRShXRUJfVEhSRUFE KQorI2luY2x1ZGUgIldlYkNvcmVUaHJlYWRSdW4uaCIKKyNlbmRpZgorCiAjaWYgKFBMQVRGT1JN KElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gODAwMDApIHx8IChQ TEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MCkK IAogdHlwZWRlZiB2b2lkICheQ0ZDYWNoZWRVUkxSZXNwb25zZUNhbGxCYWNrQmxvY2spKENGQ2Fj aGVkVVJMUmVzcG9uc2VSZWYpOwpAQCAtODgsNiArOTIsNyBAQCBEaXNrQ2FjaGVNb25pdG9yOjpE aXNrQ2FjaGVNb25pdG9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgU2Vzc2lvbklE IHNlcwogICAgIC8vIFNldCB1cCB0aGUgZGlzayBjYWNoaW5nIGNhbGxiYWNrIHRvIGNyZWF0ZSB0 aGUgU2hhcmVhYmxlUmVzb3VyY2UgYW5kIHNlbmQgaXQgdG8gdGhlIFdlYlByb2Nlc3MuCiAgICAg Q0ZDYWNoZWRVUkxSZXNwb25zZUNhbGxCYWNrQmxvY2sgYmxvY2sgPSBeKENGQ2FjaGVkVVJMUmVz cG9uc2VSZWYgY2FjaGVkUmVzcG9uc2UpCiAgICAgeworICAgICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwogICAgICAgICAvLyBJZiB0aGUgbW9uaXRvciBpc24ndCB0aGVyZSB0aGVuIGl0IHRp bWVkIG91dCBiZWZvcmUgdGhpcyByZXNvdXJjZSB3YXMgY2FjaGVkIHRvIGRpc2suCiAgICAgICAg IGlmICghcmF3TW9uaXRvcikKICAgICAgICAgICAgIHJldHVybjsKQEAgLTEwMiw3ICsxMDcsMTcg QEAgRGlza0NhY2hlTW9uaXRvcjo6RGlza0NhY2hlTW9uaXRvcihjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIFNlc3Npb25JRCBzZXMKICAgICAgICAgbW9uaXRvci0+cmVzb3VyY2VCZWNh bWVGaWxlQmFja2VkKGZpbGVCYWNrZWRCdWZmZXIpOwogICAgIH07CiAKLSAgICBfQ0ZDYWNoZWRV UkxSZXNwb25zZVNldEJlY2FtZUZpbGVCYWNrZWRDYWxsQmFja0Jsb2NrKGNhY2hlZFJlc3BvbnNl LCBibG9jaywgZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSk7CisjaWYgVVNFKFdFQl9USFJFQUQp CisgICAgQ0ZDYWNoZWRVUkxSZXNwb25zZUNhbGxCYWNrQmxvY2sgYmxvY2tUb1J1biA9IF4gKGNv bnN0IENGQ2FjaGVkVVJMUmVzcG9uc2VSZWYgcmVzcG9uc2UpCisgICAgeworICAgICAgICBXZWJU aHJlYWRSdW4oXiB7CisgICAgICAgICAgICBibG9jayhyZXNwb25zZSk7CisgICAgICAgIH0pOwor ICAgIH07CisjZWxzZQorICAgIENGQ2FjaGVkVVJMUmVzcG9uc2VDYWxsQmFja0Jsb2NrIGJsb2Nr VG9SdW4gPSBibG9jazsKKyNlbmRpZgorICAgIF9DRkNhY2hlZFVSTFJlc3BvbnNlU2V0QmVjYW1l RmlsZUJhY2tlZENhbGxCYWNrQmxvY2soY2FjaGVkUmVzcG9uc2UsIGJsb2NrVG9SdW4sIGRpc3Bh dGNoX2dldF9tYWluX3F1ZXVlKCkpOwogfQogCiB2b2lkIERpc2tDYWNoZU1vbml0b3I6OnJlc291 cmNlQmVjYW1lRmlsZUJhY2tlZChQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZmlsZUJhY2tlZEJ1 ZmZlcikK