174792 2017-07-24 09:35:05 -0700 [GTK][WPE] Remove useless conditional in IconDatabase::setIconDataForIconURL 2017-07-24 23:46:03 -0700 1 1 1 Unclassified WebKit WebKitGTK Other PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro berto bugs-noreply buildbot cgarcia commit-queue gustavo mcatanzaro oldest_to_newest 1331641 0 mcatanzaro 2017-07-24 09:35:05 -0700 We have in IconDatabase::setIconDataForIconURL some code in a conditional to check if it's not being executed on the icon sync thread. But at the top of the function is an assertion to ensure the code is never executed on the icon sync thread. The condition is therefore useless and the code should be executed unconditionally. 1331647 1 316298 mcatanzaro 2017-07-24 09:43:46 -0700 Created attachment 316298 Patch 1331653 2 buildbot 2017-07-24 09:46:24 -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 1331891 3 316298 cgarcia 2017-07-24 23:05:15 -0700 Comment on attachment 316298 Patch I noticed this yesterday too :-) 1331893 4 316298 commit-queue 2017-07-24 23:06:09 -0700 Comment on attachment 316298 Patch Rejecting attachment 316298 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 316298, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: de: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 2 diffs from patch file(s). patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/UIProcess/API/glib/IconDatabase.cpp Hunk #1 FAILED at 579. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/UIProcess/API/glib/IconDatabase.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Carlos Garcia Campos']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/4182740 1331897 5 cgarcia 2017-07-24 23:46:03 -0700 Committed r219862: <http://trac.webkit.org/changeset/219862> 316298 2017-07-24 09:43:46 -0700 2017-07-24 23:06:09 -0700 Patch bug-174792-20170724114345.patch text/plain 2684 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk3YmMxMzdlNzlhM2Y3Yzcw MjRiNGM4ZjRjOWJlMDNiYTFlNTE2ZWMuLjliYjVkYTI5NzZhMzQ5ZTg5MjQzM2VmMGM4YmZjZTg5 Yjk3OGY3MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTctMDctMjQgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0g UmVtb3ZlIHVzZWxlc3MgY29uZGl0aW9uYWwgaW4gSWNvbkRhdGFiYXNlOjpzZXRJY29uRGF0YUZv ckljb25VUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3NDc5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlIGhhdmUgaW4gSWNvbkRhdGFiYXNlOjpzZXRJY29uRGF0YUZvckljb25VUkwgc29tZSBjb2Rl IGluIGEgY29uZGl0aW9uYWwgdG8gY2hlY2sgaWYgaXQncworICAgICAgICBub3QgYmVpbmcgZXhl Y3V0ZWQgb24gdGhlIGljb24gc3luYyB0aHJlYWQuIEJ1dCBhdCB0aGUgdG9wIG9mIHRoZSBmdW5j dGlvbiBpcyBhbiBhc3NlcnRpb24KKyAgICAgICAgdG8gZW5zdXJlIHRoZSBjb2RlIGlzIG5ldmVy IGV4ZWN1dGVkIG9uIHRoZSBpY29uIHN5bmMgdGhyZWFkLiBUaGUgY29uZGl0aW9uIGlzIHRoZXJl Zm9yZQorICAgICAgICB1c2VsZXNzIGFuZCB0aGUgY29kZSBzaG91bGQgYmUgZXhlY3V0ZWQgdW5j b25kaXRpb25hbGx5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9nbGliL0ljb25EYXRhYmFz ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Okljb25EYXRhYmFzZTo6c2V0SWNvbkRhdGFGb3JJY29u VVJMKToKKwogMjAxNy0wNy0yMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TIFdLMl0gUmVtb3ZlIF9XS0RyYWdnYWJsZUVsZW1lbnRJbmZvIGFu ZCBmb2xkIFBvc2l0aW9uSW5mb3JtYXRpb25UZXN0cyBpbnRvIFdLUmVxdWVzdEFjdGl2YXRlZEVs ZW1lbnRJbmZvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9J Y29uRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvSWNvbkRh dGFiYXNlLmNwcAppbmRleCA2NjAxOWY0ZWY1MDFiNGFmNjRkMzE4ZjNmMTEwNWI3Yzg1ZTViZTg0 Li5mMGNkMDQ0YWI3NTc4MWNmNjgyZWE3ODhlYzlhNzUyYTM5ZDljYTU1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9JY29uRGF0YWJhc2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL0ljb25EYXRhYmFzZS5jcHAKQEAgLTU3OSwx OCArNTc5LDE0IEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpzZXRJY29uRGF0YUZvckljb25VUkwoUmVm UHRyPFNoYXJlZEJ1ZmZlcj4mJiBkYXRhLCBjb25zdCBTdHJpCiAgICAgfQogCiAgICAgLy8gU2Vu ZCBub3RpZmljYXRpb24gb3V0IHJlZ2FyZGluZyBhbGwgUGFnZVVSTHMgdGhhdCByZXRhaW4gdGhp cyBpY29uCi0gICAgLy8gQnV0IG5vdCBpZiB3ZSdyZSBvbiB0aGUgc3luYyB0aHJlYWQgYmVjYXVz ZSB0aGF0IGltcGxpZXMgdGhpcyBtYXBwaW5nCi0gICAgLy8gY29tZXMgZnJvbSB0aGUgaW5pdGlh bCBpbXBvcnQgd2hpY2ggd2UgZG9uJ3Qgd2FudCBub3RpZmljYXRpb25zIGZvcgotICAgIGlmICgh SVNfSUNPTl9TWU5DX1RIUkVBRCgpKSB7Ci0gICAgICAgIC8vIFN0YXJ0IHRoZSB0aW1lciB0byBj b21taXQgdGhpcyBjaGFuZ2UgLSBvciBmdXJ0aGVyIGRlbGF5IHRoZSB0aW1lciBpZiBpdCB3YXMg YWxyZWFkeSBzdGFydGVkCi0gICAgICAgIHNjaGVkdWxlT3JEZWZlclN5bmNUaW1lcigpOworICAg IC8vIFN0YXJ0IHRoZSB0aW1lciB0byBjb21taXQgdGhpcyBjaGFuZ2UgLSBvciBmdXJ0aGVyIGRl bGF5IHRoZSB0aW1lciBpZiBpdCB3YXMgYWxyZWFkeSBzdGFydGVkCisgICAgc2NoZWR1bGVPckRl ZmVyU3luY1RpbWVyKCk7CiAKLSAgICAgICAgZm9yIChhdXRvJiBwYWdlVVJMIDogcGFnZVVSTHMp IHsKLSAgICAgICAgICAgIEF1dG9kcmFpbmVkUG9vbCBwb29sOworICAgIGZvciAoYXV0byYgcGFn ZVVSTCA6IHBhZ2VVUkxzKSB7CisgICAgICAgIEF1dG9kcmFpbmVkUG9vbCBwb29sOwogCi0gICAg ICAgICAgICBMT0coSWNvbkRhdGFiYXNlLCAiRGlzcGF0Y2hpbmcgbm90aWZpY2F0aW9uIHRoYXQg cmV0YWluaW5nIHBhZ2VVUkwgJXMgaGFzIGEgbmV3IGljb24iLCB1cmxGb3JMb2dnaW5nKHBhZ2VV UkwpLmFzY2lpKCkuZGF0YSgpKTsKLSAgICAgICAgICAgIG1fY2xpZW50LT5kaWRDaGFuZ2VJY29u Rm9yUGFnZVVSTChwYWdlVVJMKTsKLSAgICAgICAgfQorICAgICAgICBMT0coSWNvbkRhdGFiYXNl LCAiRGlzcGF0Y2hpbmcgbm90aWZpY2F0aW9uIHRoYXQgcmV0YWluaW5nIHBhZ2VVUkwgJXMgaGFz IGEgbmV3IGljb24iLCB1cmxGb3JMb2dnaW5nKHBhZ2VVUkwpLmFzY2lpKCkuZGF0YSgpKTsKKyAg ICAgICAgbV9jbGllbnQtPmRpZENoYW5nZUljb25Gb3JQYWdlVVJMKHBhZ2VVUkwpOwogICAgIH0K IH0KIAo=