Title: [219862] trunk/Source/WebKit
- Revision
- 219862
- Author
- [email protected]
- Date
- 2017-07-24 23:45:53 -0700 (Mon, 24 Jul 2017)
Log Message
[GTK][WPE] Remove useless conditional in IconDatabase::setIconDataForIconURL
https://bugs.webkit.org/show_bug.cgi?id=174792
Patch by Michael Catanzaro <[email protected]> on 2017-07-24
Reviewed by Carlos Garcia Campos.
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.
* UIProcess/API/glib/IconDatabase.cpp:
(WebKit::IconDatabase::setIconDataForIconURL):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (219861 => 219862)
--- trunk/Source/WebKit/ChangeLog 2017-07-25 06:39:30 UTC (rev 219861)
+++ trunk/Source/WebKit/ChangeLog 2017-07-25 06:45:53 UTC (rev 219862)
@@ -1,3 +1,18 @@
+2017-07-24 Michael Catanzaro <[email protected]>
+
+ [GTK][WPE] Remove useless conditional in IconDatabase::setIconDataForIconURL
+ https://bugs.webkit.org/show_bug.cgi?id=174792
+
+ Reviewed by Carlos Garcia Campos.
+
+ 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.
+
+ * UIProcess/API/glib/IconDatabase.cpp:
+ (WebKit::IconDatabase::setIconDataForIconURL):
+
2017-07-24 Carlos Garcia Campos <[email protected]>
[GTK] Icon database error and crash
Modified: trunk/Source/WebKit/UIProcess/API/glib/IconDatabase.cpp (219861 => 219862)
--- trunk/Source/WebKit/UIProcess/API/glib/IconDatabase.cpp 2017-07-25 06:39:30 UTC (rev 219861)
+++ trunk/Source/WebKit/UIProcess/API/glib/IconDatabase.cpp 2017-07-25 06:45:53 UTC (rev 219862)
@@ -581,16 +581,12 @@
}
// Send notification out regarding all PageURLs that retain this icon
- // But not if we're on the sync thread because that implies this mapping
- // comes from the initial import which we don't want notifications for
- if (!IS_ICON_SYNC_THREAD()) {
- // Start the timer to commit this change - or further delay the timer if it was already started
- scheduleOrDeferSyncTimer();
+ // Start the timer to commit this change - or further delay the timer if it was already started
+ scheduleOrDeferSyncTimer();
- for (auto& pageURL : pageURLs) {
- LOG(IconDatabase, "Dispatching notification that retaining pageURL %s has a new icon", urlForLogging(pageURL).ascii().data());
- m_client->didChangeIconForPageURL(pageURL);
- }
+ for (auto& pageURL : pageURLs) {
+ LOG(IconDatabase, "Dispatching notification that retaining pageURL %s has a new icon", urlForLogging(pageURL).ascii().data());
+ m_client->didChangeIconForPageURL(pageURL);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
