Bug 174792 - [GTK][WPE] Remove useless conditional in IconDatabase::setIconDataForIconURL
Summary: [GTK][WPE] Remove useless conditional in IconDatabase::setIconDataForIconURL
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: Other
Hardware: PC Linux
: P2 Normal
Assignee: Michael Catanzaro
Depends on:
Reported: 2017-07-24 09:35 PDT by Michael Catanzaro
Modified: 2017-07-24 23:46 PDT (History)
7 users (show)

See Also:

Patch (2.62 KB, patch)
2017-07-24 09:43 PDT, Michael Catanzaro
cgarcia: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Catanzaro 2017-07-24 09:35:05 PDT
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.
Comment 1 Michael Catanzaro 2017-07-24 09:43:46 PDT
Created attachment 316298 [details]
Comment 2 Build Bot 2017-07-24 09:46:24 PDT
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
Comment 3 Carlos Garcia Campos 2017-07-24 23:05:15 PDT
Comment on attachment 316298 [details]

I noticed this yesterday too :-)
Comment 4 WebKit Commit Bot 2017-07-24 23:06:09 PDT
Comment on attachment 316298 [details]

Rejecting attachment 316298 [details] 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
Comment 5 Carlos Garcia Campos 2017-07-24 23:46:03 PDT
Committed r219862: <http://trac.webkit.org/changeset/219862>