173146 2017-06-09 03:34:12 -0700 [GTK] Use API::IconDatabaseClient in WebKitFaviconDatabase 2017-06-13 03:31:50 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 173145 1 cgarcia webkit-unassigned berto bugs-noreply buildbot gustavo mcatanzaro zan oldest_to_newest 1317327 0 cgarcia 2017-06-09 03:34:12 -0700 Instead of the C API. 1317330 1 312420 cgarcia 2017-06-09 03:36:12 -0700 Created attachment 312420 Patch 1317332 2 buildbot 2017-06-09 03:38:59 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1318623 3 cgarcia 2017-06-13 03:31:50 -0700 Committed r218172: <http://trac.webkit.org/changeset/218172> 312420 2017-06-09 03:36:12 -0700 2017-06-13 03:20:52 -0700 Patch wk2-gtk-icondatabase-pi.diff text/plain 5157 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMzA4ZDQ0OWI3MC4uZDQ1ZWYwY2RlYjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOCBAQAogMjAxNy0wNi0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIEFQSTo6SWNvbkRhdGFiYXNlQ2xpZW50IGlu IFdlYktpdEZhdmljb25EYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTczMTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2Uu Y3BwOgorICAgICAgICAoX1dlYktpdEZhdmljb25EYXRhYmFzZVByaXZhdGU6On5fV2ViS2l0RmF2 aWNvbkRhdGFiYXNlUHJpdmF0ZSk6CisgICAgICAgICh3ZWJraXRGYXZpY29uRGF0YWJhc2VDcmVh dGUpOgorICAgICAgICAoZGlkQ2hhbmdlSWNvbkZvclBhZ2VVUkxDYWxsYmFjayk6IERlbGV0ZWQu CisgICAgICAgIChpY29uRGF0YVJlYWR5Rm9yUGFnZVVSTENhbGxiYWNrKTogRGVsZXRlZC4KKwor MjAxNy0wNi0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK ICAgICAgICAgQWRkIEFQSTo6SWNvbkRhdGFiYXNlQ2xpZW50CiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMxNDUKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmljb25EYXRhYmFzZS5jcHAK aW5kZXggZGJlMDU2NjlkYjkuLjIwMDZkOGEyZmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmljb25EYXRhYmFzZS5jcHAKQEAg LTY3LDYgKzY3LDExIEBAIHR5cGVkZWYgVmVjdG9yPEdSZWZQdHI8R1Rhc2s+ID4gUGVuZGluZ0lj b25SZXF1ZXN0VmVjdG9yOwogdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgUGVuZGluZ0ljb25SZXF1 ZXN0VmVjdG9yKj4gUGVuZGluZ0ljb25SZXF1ZXN0TWFwOwogCiBzdHJ1Y3QgX1dlYktpdEZhdmlj b25EYXRhYmFzZVByaXZhdGUgeworICAgIH5fV2ViS2l0RmF2aWNvbkRhdGFiYXNlUHJpdmF0ZSgp CisgICAgeworICAgICAgICBpY29uRGF0YWJhc2UtPnNldENsaWVudChudWxscHRyKTsKKyAgICB9 CisKICAgICBSZWZQdHI8V2ViSWNvbkRhdGFiYXNlPiBpY29uRGF0YWJhc2U7CiAgICAgUGVuZGlu Z0ljb25SZXF1ZXN0TWFwIHBlbmRpbmdJY29uUmVxdWVzdHM7CiAgICAgSGFzaE1hcDxTdHJpbmcs IFN0cmluZz4gcGFnZVVSTFRvSWNvblVSTE1hcDsKQEAgLTE3OSw0OSArMTg0LDQ4IEBAIHN0YXRp YyB2b2lkIHByb2Nlc3NQZW5kaW5nSWNvbnNGb3JQYWdlVVJMKFdlYktpdEZhdmljb25EYXRhYmFz ZSogZGF0YWJhc2UsIGNvbnN0CiAgICAgZGVsZXRlUGVuZGluZ0ljb25SZXF1ZXN0cyhkYXRhYmFz ZSwgcGVuZGluZ0ljb25SZXF1ZXN0cywgcGFnZVVSTCk7CiB9CiAKLXN0YXRpYyB2b2lkIGRpZENo YW5nZUljb25Gb3JQYWdlVVJMQ2FsbGJhY2soV0tJY29uRGF0YWJhc2VSZWYsIFdLVVJMUmVmIHdr UGFnZVVSTCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAgICBXZWJLaXRGYXZpY29uRGF0 YWJhc2UqIGRhdGFiYXNlID0gV0VCS0lUX0ZBVklDT05fREFUQUJBU0UoY2xpZW50SW5mbyk7Ci0g ICAgaWYgKCFkYXRhYmFzZS0+cHJpdi0+aWNvbkRhdGFiYXNlLT5pc1VybEltcG9ydENvbXBsZXRl ZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBXYWl0IHVudGlsIHRoZXJlJ3MgYW4gaWNv biByZWNvcmQgaW4gdGhlIGRhdGFiYXNlIGZvciB0aGlzIHBhZ2UgVVJMLgotICAgIFN0cmluZyBw YWdlVVJMID0gdG9JbXBsKHdrUGFnZVVSTCktPnN0cmluZygpOwotICAgIFdlYkNvcmU6OkltYWdl KiBpY29uSW1hZ2UgPSBkYXRhYmFzZS0+cHJpdi0+aWNvbkRhdGFiYXNlLT5pbWFnZUZvclBhZ2VV UkwocGFnZVVSTCwgV2ViQ29yZTo6SW50U2l6ZSgxLCAxKSk7Ci0gICAgaWYgKCFpY29uSW1hZ2Ug fHwgaWNvbkltYWdlLT5pc051bGwoKSkKLSAgICAgICAgcmV0dXJuOworY2xhc3MgV2ViS2l0SWNv bkRhdGFiYXNlQ2xpZW50IGZpbmFsIDogcHVibGljIEFQSTo6SWNvbkRhdGFiYXNlQ2xpZW50IHsK K3B1YmxpYzoKKyAgICBleHBsaWNpdCBXZWJLaXRJY29uRGF0YWJhc2VDbGllbnQoV2ViS2l0RmF2 aWNvbkRhdGFiYXNlKiBkYXRhYmFzZSkKKyAgICAgICAgOiBtX2RhdGFiYXNlKGRhdGFiYXNlKQor ICAgIHsKKyAgICB9CiAKLSAgICBTdHJpbmcgY3VycmVudEljb25VUkw7Ci0gICAgZGF0YWJhc2Ut PnByaXYtPmljb25EYXRhYmFzZS0+c3luY2hyb25vdXNJY29uVVJMRm9yUGFnZVVSTChwYWdlVVJM LCBjdXJyZW50SWNvblVSTCk7Ci0gICAgY29uc3QgU3RyaW5nJiBpY29uVVJMID0gZGF0YWJhc2Ut PnByaXYtPnBhZ2VVUkxUb0ljb25VUkxNYXAuZ2V0KHBhZ2VVUkwpOwotICAgIGlmIChpY29uVVJM ID09IGN1cnJlbnRJY29uVVJMKQotICAgICAgICByZXR1cm47Citwcml2YXRlOgorICAgIHZvaWQg ZGlkQ2hhbmdlSWNvbkZvclBhZ2VVUkwoV2ViSWNvbkRhdGFiYXNlJiwgY29uc3QgU3RyaW5nJiBw YWdlVVJMKSBvdmVycmlkZQorICAgIHsKKyAgICAgICAgaWYgKCFtX2RhdGFiYXNlLT5wcml2LT5p Y29uRGF0YWJhc2UtPmlzVXJsSW1wb3J0Q29tcGxldGVkKCkpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgLy8gV2FpdCB1bnRpbCB0aGVyZSdzIGFuIGljb24gcmVjb3JkIGluIHRoZSBk YXRhYmFzZSBmb3IgdGhpcyBwYWdlIFVSTC4KKyAgICAgICAgV2ViQ29yZTo6SW1hZ2UqIGljb25J bWFnZSA9IG1fZGF0YWJhc2UtPnByaXYtPmljb25EYXRhYmFzZS0+aW1hZ2VGb3JQYWdlVVJMKHBh Z2VVUkwsIFdlYkNvcmU6OkludFNpemUoMSwgMSkpOworICAgICAgICBpZiAoIWljb25JbWFnZSB8 fCBpY29uSW1hZ2UtPmlzTnVsbCgpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIFN0 cmluZyBjdXJyZW50SWNvblVSTDsKKyAgICAgICAgbV9kYXRhYmFzZS0+cHJpdi0+aWNvbkRhdGFi YXNlLT5zeW5jaHJvbm91c0ljb25VUkxGb3JQYWdlVVJMKHBhZ2VVUkwsIGN1cnJlbnRJY29uVVJM KTsKKyAgICAgICAgY29uc3QgU3RyaW5nJiBpY29uVVJMID0gbV9kYXRhYmFzZS0+cHJpdi0+cGFn ZVVSTFRvSWNvblVSTE1hcC5nZXQocGFnZVVSTCk7CisgICAgICAgIGlmIChpY29uVVJMID09IGN1 cnJlbnRJY29uVVJMKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIG1fZGF0YWJhc2Ut PnByaXYtPnBhZ2VVUkxUb0ljb25VUkxNYXAuc2V0KHBhZ2VVUkwsIGN1cnJlbnRJY29uVVJMKTsK KyAgICAgICAgZ19zaWduYWxfZW1pdChtX2RhdGFiYXNlLCBzaWduYWxzW0ZBVklDT05fQ0hBTkdF RF0sIDAsIHBhZ2VVUkwudXRmOCgpLmRhdGEoKSwgY3VycmVudEljb25VUkwudXRmOCgpLmRhdGEo KSk7CisgICAgfQogCi0gICAgZGF0YWJhc2UtPnByaXYtPnBhZ2VVUkxUb0ljb25VUkxNYXAuc2V0 KHBhZ2VVUkwsIGN1cnJlbnRJY29uVVJMKTsKLSAgICBnX3NpZ25hbF9lbWl0KGRhdGFiYXNlLCBz aWduYWxzW0ZBVklDT05fQ0hBTkdFRF0sIDAsIHBhZ2VVUkwudXRmOCgpLmRhdGEoKSwgY3VycmVu dEljb25VUkwudXRmOCgpLmRhdGEoKSk7Ci19CisgICAgdm9pZCBpY29uRGF0YVJlYWR5Rm9yUGFn ZVVSTChXZWJJY29uRGF0YWJhc2UmLCBjb25zdCBTdHJpbmcmIHBhZ2VVUkwpIG92ZXJyaWRlCisg ICAgeworICAgICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworICAgICAgICBwcm9jZXNz UGVuZGluZ0ljb25zRm9yUGFnZVVSTChtX2RhdGFiYXNlLCBwYWdlVVJMKTsKKyAgICB9CiAKLXN0 YXRpYyB2b2lkIGljb25EYXRhUmVhZHlGb3JQYWdlVVJMQ2FsbGJhY2soV0tJY29uRGF0YWJhc2VS ZWYsIFdLVVJMUmVmIHdrUGFnZVVSTCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAgICBB U1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwotICAgIHByb2Nlc3NQZW5kaW5nSWNvbnNGb3JQYWdl VVJMKFdFQktJVF9GQVZJQ09OX0RBVEFCQVNFKGNsaWVudEluZm8pLCB0b0ltcGwod2tQYWdlVVJM KS0+c3RyaW5nKCkpOwotfQorICAgIFdlYktpdEZhdmljb25EYXRhYmFzZSogbV9kYXRhYmFzZTsK K307CiAKIFdlYktpdEZhdmljb25EYXRhYmFzZSogd2Via2l0RmF2aWNvbkRhdGFiYXNlQ3JlYXRl KFdlYkljb25EYXRhYmFzZSogaWNvbkRhdGFiYXNlKQogewogICAgIFdlYktpdEZhdmljb25EYXRh YmFzZSogZmF2aWNvbkRhdGFiYXNlID0gV0VCS0lUX0ZBVklDT05fREFUQUJBU0UoZ19vYmplY3Rf bmV3KFdFQktJVF9UWVBFX0ZBVklDT05fREFUQUJBU0UsIE5VTEwpKTsKICAgICBmYXZpY29uRGF0 YWJhc2UtPnByaXYtPmljb25EYXRhYmFzZSA9IGljb25EYXRhYmFzZTsKLQotICAgIFdLSWNvbkRh dGFiYXNlQ2xpZW50VjEgd2tJY29uRGF0YWJhc2VDbGllbnQgPSB7Ci0gICAgICAgIHsKLSAgICAg ICAgICAgIDEsIC8vIHZlcnNpb24KLSAgICAgICAgICAgIGZhdmljb25EYXRhYmFzZSwgLy8gY2xp ZW50SW5mbwotICAgICAgICB9LAotICAgICAgICBkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTENhbGxi YWNrLAotICAgICAgICAwLCAvLyBkaWRSZW1vdmVBbGxJY29uc0NhbGxiYWNrCi0gICAgICAgIGlj b25EYXRhUmVhZHlGb3JQYWdlVVJMQ2FsbGJhY2ssCi0gICAgfTsKLSAgICBXS0ljb25EYXRhYmFz ZVNldEljb25EYXRhYmFzZUNsaWVudCh0b0FQSShpY29uRGF0YWJhc2UpLCAmd2tJY29uRGF0YWJh c2VDbGllbnQuYmFzZSk7CisgICAgaWNvbkRhdGFiYXNlLT5zZXRDbGllbnQoc3RkOjptYWtlX3Vu aXF1ZTxXZWJLaXRJY29uRGF0YWJhc2VDbGllbnQ+KGZhdmljb25EYXRhYmFzZSkpOwogICAgIHJl dHVybiBmYXZpY29uRGF0YWJhc2U7CiB9CiAK