124030 2013-11-07 21:19:33 -0800 Update an out-dated ASSERT in IconDatabase code 2013-11-07 21:38:40 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson commit-queue japhet oldest_to_newest 948538 0 beidson 2013-11-07 21:19:33 -0800 Update an out-dated ASSERT in IconDatabase code The ASSERT in IconDatabase.cpp: ASSERT(iconRecord || m_retainedPageURLs.contains(pageURLOriginal)); ... was added when the IconDatabase interface was largely synchronous and only about WebKit1 With the asynchronous interfaces that have been added and the support for WK2 that has been added, the ASSERT can incorrectly fire if an icon is asked for before database cleanup is allowed. It should be updated to: ASSERT(iconRecord || databaseCleanupCounter || m_retainedPageURLs.contains(pageURLOriginal)); In radar as <rdar://problem/15171118> 948542 1 216359 beidson 2013-11-07 21:25:09 -0800 Created attachment 216359 Patch v1 948543 2 216359 kling 2013-11-07 21:25:45 -0800 Comment on attachment 216359 Patch v1 rs=me 948544 3 beidson 2013-11-07 21:38:40 -0800 http://trac.webkit.org/changeset/158904 216359 2013-11-07 21:25:09 -0800 2013-11-07 21:25:44 -0800 Patch v1 patch text/plain 1918 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3YTcxMTY2Li44YjM4OTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTMtMTEtMDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLgorICAgICAgICA8cmRhcjovL3By b2JsZW0vMTUxNzExMTg+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI0MDMwLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdpdGggdGhlIGFzeW5jaHJvbm91cyBpbnRlcmZhY2VzIHRoYXQgaGF2ZSBiZWVuIGFkZGVk IGFuZCB0aGUgc3VwcG9ydCBmb3IgV0syIHRoYXQgaGFzIGJlZW4gYWRkZWQsIAorICAgICAgICB0 aGlzIEFTU0VSVCBjYW4gaW5jb3JyZWN0bHkgZmlyZSBpZiBhbiBpY29uIGlzIGFza2VkIGZvciBi ZWZvcmUgZGF0YWJhc2UgY2xlYW51cCBpcyBhbGxvd2VkLgorCisgICAgICAgICogbG9hZGVyL2lj b24vSWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6c3lu Y2hyb25vdXNJY29uRm9yUGFnZVVSTCk6IFVwZGF0ZSBhbiBpbnZhbGlkIEFTU0VSVC4KKworMjAx My0xMS0wNyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgRW5o YW5jZSBTUUwgam91cm5hbF9tb2RlIHNldHRpbmcgY29kZSB0byBiZSBsZXNzIGxpa2VseSB0byBs b2cgYW4gZXJyb3IuCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTQxODU3Nz4gYW5kIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQwMTgKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAKaW5kZXggYjFkYmEzMy4uNWJjOTg1MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwCkBAIC0yNjEs OSArMjYxLDEwIEBAIEltYWdlKiBJY29uRGF0YWJhc2U6OnN5bmNocm9ub3VzSWNvbkZvclBhZ2VV UkwoY29uc3QgU3RyaW5nJiBwYWdlVVJMT3JpZ2luYWwsIGNvCiAgICAgLy8gd2UgY2FuIGp1c3Qg YmFpbCBub3cKICAgICBpZiAoIW1faWNvblVSTEltcG9ydENvbXBsZXRlICYmICFpY29uUmVjb3Jk KQogICAgICAgICByZXR1cm4gMDsKLSAgICAKLSAgICAvLyBUaGUgb25seSB3YXkgd2Ugc2hvdWxk ICpub3QqIGhhdmUgYW4gaWNvbiByZWNvcmQgaXMgaWYgdGhpcyBwYWdlVVJMIGlzIHJldGFpbmVk IGJ1dCBoYXMgbm8gaWNvbiB5ZXQgLSBtYWtlIHN1cmUgb2YgdGhhdAotICAgIEFTU0VSVChpY29u UmVjb3JkIHx8IG1fcmV0YWluZWRQYWdlVVJMcy5jb250YWlucyhwYWdlVVJMT3JpZ2luYWwpKTsK KworICAgIC8vIEFzc3VtaW5nIHdlJ3JlIGRvbmUgaW5pdGlhbGl6aW5nIGFuZCBjbGVhbnVwIGlz IGFsbG93ZWQsCisgICAgLy8gdGhlIG9ubHkgd2F5IHdlIHNob3VsZCAqbm90KiBoYXZlIGFuIGlj b24gcmVjb3JkIGlzIGlmIHRoaXMgcGFnZVVSTCBpcyByZXRhaW5lZCBidXQgaGFzIG5vIGljb24g eWV0LgorICAgIEFTU0VSVChpY29uUmVjb3JkIHx8IGRhdGFiYXNlQ2xlYW51cENvdW50ZXIgfHwg bV9yZXRhaW5lZFBhZ2VVUkxzLmNvbnRhaW5zKHBhZ2VVUkxPcmlnaW5hbCkpOwogICAgIAogICAg IGlmICghaWNvblJlY29yZCkKICAgICAgICAgcmV0dXJuIDA7Cg==