118772 2013-07-16 21:18:49 -0700 [EFL][WK2] EWK2FaviconDatabaseTest should be defined by inheriting from EWK2UnitTestBase. 2013-07-17 00:17:17 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 118716 0 donggwan.kim webkit-unassigned cdumez commit-queue gyuyoung.kim rakuco oldest_to_newest 909136 0 donggwan.kim 2013-07-16 21:18:49 -0700 Same approach as https://bugs.webkit.org/show_bug.cgi?id=118717 909137 1 206845 donggwan.kim 2013-07-16 21:20:36 -0700 Created attachment 206845 Patch 909178 2 206845 cdumez 2013-07-16 23:48:35 -0700 Comment on attachment 206845 Patch Ok, r=me. 909210 3 206845 commit-queue 2013-07-17 00:17:15 -0700 Comment on attachment 206845 Patch Clearing flags on attachment: 206845 Committed r152766: <http://trac.webkit.org/changeset/152766> 909211 4 commit-queue 2013-07-17 00:17:17 -0700 All reviewed patches have been landed. Closing bug. 206845 2013-07-16 21:20:36 -0700 2013-07-17 00:17:14 -0700 Patch bug-118772-20130716212039.patch text/plain 6222 donggwan.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjJlZDIxY2E1ODYyNzVm MGJiYTI4Zjg2YjFmN2VmOTY3YmY0MWJiMC4uMmMwYzA3YjM4NjdlZGQ3YjlmMjNmMjZlZGM4ZDEx NmNmOGMwNzQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA3LTE2ICBEb25n LUd3YW4gS2ltICA8ZG9uZ2d3YW4ua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dL Ml0gRVdLMkZhdmljb25EYXRhYmFzZVRlc3Qgc2hvdWxkIGJlIGRlZmluZWQgYnkgaW5oZXJpdGlu ZyBmcm9tIEVXSzJVbml0VGVzdEJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTg3NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJdCBzaG91bGQgYmUgZGVmaW5lZCBhcyByZWxldmFudCB0ZXN0IGNs YXNzIHNwZWNpZmljIHRvIGVhY2ggdGVzdCBmaWxlIGZvciBtb3JlIHJlYWRhYmlsaXR5LgorICAg ICAgICBJdCBjb3VsZCBiZSBoZWxwZnVsIHRvIHJlbW92ZSB1bm5lY2Vzc2FyeSBzdGF0aWMgbWV0 aG9kcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9mYXZp Y29uX2RhdGFiYXNlLmNwcDoKKyAgICAgICAgKEVXSzJGYXZpY29uRGF0YWJhc2VUZXN0OjpzZXJ2 ZXJDYWxsYmFjayk6CisgICAgICAgIChFV0syRmF2aWNvbkRhdGFiYXNlVGVzdDo6cmVxdWVzdEZh dmljb25EYXRhKToKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTMtMDctMTYgIEFsZXhleSBQcm9z a3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE1MDI5MSk6 IENoaW5lc2UgcHJlZGljdGl2ZSBpbnB1dCBwb3AtdXAgZGlzYXBwZWFycyBvbiB0d2l0dGVyLmNv bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVz dF9ld2syX2Zhdmljb25fZGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvdGVzdHMvdGVzdF9ld2syX2Zhdmljb25fZGF0YWJhc2UuY3BwCmluZGV4IGMwY2YyMTYx YWI2Y2YzMmFkYzUyZWNmOWVkOTJjOTFhMTJlNDg1ZDcuLmQwZDZjYjFiMGVlM2I2YTI1NjQ0MGYy MmI0ZmEwOWRlZWY4ZGE5ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9mYXZpY29uX2RhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfZmF2aWNvbl9kYXRhYmFz ZS5jcHAKQEAgLTM1LDY1ICszNSw2OCBAQCB1c2luZyBuYW1lc3BhY2UgRVdLMlVuaXRUZXN0Owog CiBleHRlcm4gRVdLMlVuaXRUZXN0RW52aXJvbm1lbnQqIGVudmlyb25tZW50OwogCi1zdGF0aWMg dm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBodHRwU2VydmVyLCBTb3VwTWVzc2FnZSog bWVzc2FnZSwgY29uc3QgY2hhciogcGF0aCwgR0hhc2hUYWJsZSosIFNvdXBDbGllbnRDb250ZXh0 KiwgZ3BvaW50ZXIpCi17Ci0gICAgaWYgKG1lc3NhZ2UtPm1ldGhvZCAhPSBTT1VQX01FVEhPRF9H RVQpIHsKLSAgICAgICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFU VVNfTk9UX0lNUExFTUVOVEVEKTsKK2NsYXNzIEVXSzJGYXZpY29uRGF0YWJhc2VUZXN0IDogcHVi bGljIEVXSzJVbml0VGVzdEJhc2UgeworcHVibGljOgorICAgIHN0cnVjdCBJY29uUmVxdWVzdERh dGEgeworICAgICAgICBFdmFzX09iamVjdCogdmlldzsKKyAgICAgICAgRXZhc19PYmplY3QqIGlj b247CisgICAgfTsKKworICAgIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2ZXIq IGh0dHBTZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKiBwYXRoLCBHSGFz aFRhYmxlKiwgU291cENsaWVudENvbnRleHQqLCBncG9pbnRlcikKKyAgICB7CisgICAgICAgIGlm IChtZXNzYWdlLT5tZXRob2QgIT0gU09VUF9NRVRIT0RfR0VUKSB7CisgICAgICAgICAgICBzb3Vw X21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19OT1RfSU1QTEVNRU5URUQp OwogICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKCFzdHJjbXAocGF0aCwgIi9mYXZp Y29uLmljbyIpKSB7Ci0gICAgICAgIENTdHJpbmcgZmF2aWNvblBhdGggPSBlbnZpcm9ubWVudC0+ cGF0aEZvclJlc291cmNlKCJibGFuay5pY28iKTsKLSAgICAgICAgRWluYV9GaWxlKiBmID0gZWlu YV9maWxlX29wZW4oZmF2aWNvblBhdGguZGF0YSgpLCBmYWxzZSk7Ci0gICAgICAgIGlmICghZikg ewotICAgICAgICAgICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFU VVNfTk9UX0ZPVU5EKTsKLSAgICAgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRlKG1l c3NhZ2UtPnJlc3BvbnNlX2JvZHkpOwotICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAK LSAgICAgICAgc2l6ZV90IGZpbGVTaXplID0gZWluYV9maWxlX3NpemVfZ2V0KGYpOwotCi0gICAg ICAgIHZvaWQqIGNvbnRlbnRzID0gZWluYV9maWxlX21hcF9hbGwoZiwgRUlOQV9GSUxFX1BPUFVM QVRFKTsKLSAgICAgICAgaWYgKCFjb250ZW50cykgewotICAgICAgICAgICAgc291cF9tZXNzYWdl X3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfTk9UX0ZPVU5EKTsKKyAgICAgICAgaWYg KCFzdHJjbXAocGF0aCwgIi9mYXZpY29uLmljbyIpKSB7CisgICAgICAgICAgICBDU3RyaW5nIGZh dmljb25QYXRoID0gZW52aXJvbm1lbnQtPnBhdGhGb3JSZXNvdXJjZSgiYmxhbmsuaWNvIik7Cisg ICAgICAgICAgICBFaW5hX0ZpbGUqIGYgPSBlaW5hX2ZpbGVfb3BlbihmYXZpY29uUGF0aC5kYXRh KCksIGZhbHNlKTsKKyAgICAgICAgICAgIGlmICghZikgeworICAgICAgICAgICAgICAgIHNvdXBf bWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVTX05PVF9GT1VORCk7CisgICAg ICAgICAgICAgICAgc291cF9tZXNzYWdlX2JvZHlfY29tcGxldGUobWVzc2FnZS0+cmVzcG9uc2Vf Ym9keSk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAg ICAgICBzaXplX3QgZmlsZVNpemUgPSBlaW5hX2ZpbGVfc2l6ZV9nZXQoZik7CisKKyAgICAgICAg ICAgIHZvaWQqIGNvbnRlbnRzID0gZWluYV9maWxlX21hcF9hbGwoZiwgRUlOQV9GSUxFX1BPUFVM QVRFKTsKKyAgICAgICAgICAgIGlmICghY29udGVudHMpIHsKKyAgICAgICAgICAgICAgICBzb3Vw X21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19OT1RfRk9VTkQpOworICAg ICAgICAgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJlc3BvbnNl X2JvZHkpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNP VVBfTUVNT1JZX0NPUFksIGNvbnRlbnRzLCBmaWxlU2l6ZSk7CisgICAgICAgICAgICBzb3VwX21l c3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19PSyk7CiAgICAgICAgICAgICBz b3VwX21lc3NhZ2VfYm9keV9jb21wbGV0ZShtZXNzYWdlLT5yZXNwb25zZV9ib2R5KTsKKworICAg ICAgICAgICAgZWluYV9maWxlX21hcF9mcmVlKGYsIGNvbnRlbnRzKTsKKyAgICAgICAgICAgIGVp bmFfZmlsZV9jbG9zZShmKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAg ICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQ X01FTU9SWV9DT1BZLCBjb250ZW50cywgZmlsZVNpemUpOworICAgICAgICBjb25zdCBjaGFyIGNv bnRlbnRzW10gPSAiPGh0bWw+PGJvZHk+ZmF2aWNvbiB0ZXN0PC9ib2R5PjwvaHRtbD4iOwogICAg ICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19PSyk7Cisg ICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBT T1VQX01FTU9SWV9DT1BZLCBjb250ZW50cywgc3RybGVuKGNvbnRlbnRzKSk7CiAgICAgICAgIHNv dXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHkpOwotCi0gICAg ICAgIGVpbmFfZmlsZV9tYXBfZnJlZShmLCBjb250ZW50cyk7Ci0gICAgICAgIGVpbmFfZmlsZV9j bG9zZShmKTsKLSAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGNvbnN0IGNoYXIgY29udGVu dHNbXSA9ICI8aHRtbD48Ym9keT5mYXZpY29uIHRlc3Q8L2JvZHk+PC9odG1sPiI7Ci0gICAgc291 cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0spOwotICAgIHNvdXBf bWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9D T1BZLCBjb250ZW50cywgc3RybGVuKGNvbnRlbnRzKSk7Ci0gICAgc291cF9tZXNzYWdlX2JvZHlf Y29tcGxldGUobWVzc2FnZS0+cmVzcG9uc2VfYm9keSk7Ci19Ci0KLXN0cnVjdCBJY29uUmVxdWVz dERhdGEgewotICAgIEV2YXNfT2JqZWN0KiB2aWV3OwotICAgIEV2YXNfT2JqZWN0KiBpY29uOwot fTsKLQotc3RhdGljIHZvaWQgcmVxdWVzdEZhdmljb25EYXRhKHZvaWQqIHVzZXJEYXRhLCBFdmFz X09iamVjdCosIHZvaWQqIGV2ZW50SW5mbykKLXsKLSAgICBJY29uUmVxdWVzdERhdGEqIGRhdGEg PSBzdGF0aWNfY2FzdDxJY29uUmVxdWVzdERhdGEqPih1c2VyRGF0YSk7CisgICAgc3RhdGljIHZv aWQgcmVxdWVzdEZhdmljb25EYXRhKHZvaWQqIHVzZXJEYXRhLCBFdmFzX09iamVjdCosIHZvaWQq IGV2ZW50SW5mbykKKyAgICB7CisgICAgICAgIEljb25SZXF1ZXN0RGF0YSogZGF0YSA9IHN0YXRp Y19jYXN0PEljb25SZXF1ZXN0RGF0YSo+KHVzZXJEYXRhKTsKIAotICAgIC8vIENoZWNrIHRoZSBB UEkgcmV0cmlldmluZyBhIHZhbGlkIGZhdmljb24gZnJvbSBpY29uIGRhdGFiYXNlLgotICAgIEV3 a19Db250ZXh0KiBjb250ZXh0ID0gZXdrX3ZpZXdfY29udGV4dF9nZXQoZGF0YS0+dmlldyk7Ci0g ICAgRXdrX0Zhdmljb25fRGF0YWJhc2UqIGZhdmljb25EYXRhYmFzZSA9IGV3a19jb250ZXh0X2Zh dmljb25fZGF0YWJhc2VfZ2V0KGNvbnRleHQpOwotICAgIEFTU0VSVF9UUlVFKGZhdmljb25EYXRh YmFzZSk7CisgICAgICAgIC8vIENoZWNrIHRoZSBBUEkgcmV0cmlldmluZyBhIHZhbGlkIGZhdmlj b24gZnJvbSBpY29uIGRhdGFiYXNlLgorICAgICAgICBFd2tfQ29udGV4dCogY29udGV4dCA9IGV3 a192aWV3X2NvbnRleHRfZ2V0KGRhdGEtPnZpZXcpOworICAgICAgICBFd2tfRmF2aWNvbl9EYXRh YmFzZSogZmF2aWNvbkRhdGFiYXNlID0gZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9nZXQo Y29udGV4dCk7CisgICAgICAgIEFTU0VSVF9UUlVFKGZhdmljb25EYXRhYmFzZSk7CiAKLSAgICBF dmFzKiBldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQoZGF0YS0+dmlldyk7Ci0gICAgZGF0YS0+ aWNvbiA9IGV3a19mYXZpY29uX2RhdGFiYXNlX2ljb25fZ2V0KGZhdmljb25EYXRhYmFzZSwgZXdr X3ZpZXdfdXJsX2dldChkYXRhLT52aWV3KSwgZXZhcyk7Ci19CisgICAgICAgIEV2YXMqIGV2YXMg PSBldmFzX29iamVjdF9ldmFzX2dldChkYXRhLT52aWV3KTsKKyAgICAgICAgZGF0YS0+aWNvbiA9 IGV3a19mYXZpY29uX2RhdGFiYXNlX2ljb25fZ2V0KGZhdmljb25EYXRhYmFzZSwgZXdrX3ZpZXdf dXJsX2dldChkYXRhLT52aWV3KSwgZXZhcyk7CisgICAgfQorfTsKIAotVEVTVF9GKEVXSzJVbml0 VGVzdEJhc2UsIGV3a19mYXZpY29uX2RhdGFiYXNlX2FzeW5jX2ljb25fZ2V0KQorVEVTVF9GKEVX SzJGYXZpY29uRGF0YWJhc2VUZXN0LCBld2tfZmF2aWNvbl9kYXRhYmFzZV9hc3luY19pY29uX2dl dCkKIHsKICAgICBPd25QdHI8RVdLMlVuaXRUZXN0U2VydmVyPiBodHRwU2VydmVyID0gYWRvcHRQ dHIobmV3IEVXSzJVbml0VGVzdFNlcnZlcik7CiAgICAgaHR0cFNlcnZlci0+cnVuKHNlcnZlckNh bGxiYWNrKTsK