Title: [260209] trunk/Source/WebCore
- Revision
- 260209
- Author
- csaave...@igalia.com
- Date
- 2020-04-16 12:27:47 -0700 (Thu, 16 Apr 2020)
Log Message
[GTK] Deprecation-guards fixes
https://bugs.webkit.org/show_bug.cgi?id=210600
Reviewed by Adrian Perez de Castro.
No new tests needed.
* platform/gtk/RenderThemeGadget.cpp:
(WebCore::RenderThemeGadget::backgroundColor const): Add missing
deprecation guards for deprecated GtkStyleContext API.
* platform/gtk/ThemeGtk.cpp:
(WebCore::ThemeGtk::ensurePlatformColors const): Switch to WK
deprecation guards from glib ones.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (260208 => 260209)
--- trunk/Source/WebCore/ChangeLog 2020-04-16 18:59:51 UTC (rev 260208)
+++ trunk/Source/WebCore/ChangeLog 2020-04-16 19:27:47 UTC (rev 260209)
@@ -1,3 +1,19 @@
+2020-04-16 Claudio Saavedra <csaave...@igalia.com>
+
+ [GTK] Deprecation-guards fixes
+ https://bugs.webkit.org/show_bug.cgi?id=210600
+
+ Reviewed by Adrian Perez de Castro.
+
+ No new tests needed.
+
+ * platform/gtk/RenderThemeGadget.cpp:
+ (WebCore::RenderThemeGadget::backgroundColor const): Add missing
+ deprecation guards for deprecated GtkStyleContext API.
+ * platform/gtk/ThemeGtk.cpp:
+ (WebCore::ThemeGtk::ensurePlatformColors const): Switch to WK
+ deprecation guards from glib ones.
+
2020-04-16 Jack Lee <shihchieh_...@apple.com>
ASSERTION FAILED: candidate.isCandidate() in WebCore::canonicalizeCandidate
Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGadget.cpp (260208 => 260209)
--- trunk/Source/WebCore/platform/gtk/RenderThemeGadget.cpp 2020-04-16 18:59:51 UTC (rev 260208)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGadget.cpp 2020-04-16 19:27:47 UTC (rev 260209)
@@ -121,7 +121,11 @@
Color RenderThemeGadget::backgroundColor() const
{
GdkRGBA returnValue;
+
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
gtk_style_context_get_background_color(m_context.get(), gtk_style_context_get_state(m_context.get()), &returnValue);
+ ALLOW_DEPRECATED_DECLARATIONS_END
+
return returnValue;
}
Modified: trunk/Source/WebCore/platform/gtk/ThemeGtk.cpp (260208 => 260209)
--- trunk/Source/WebCore/platform/gtk/ThemeGtk.cpp 2020-04-16 18:59:51 UTC (rev 260208)
+++ trunk/Source/WebCore/platform/gtk/ThemeGtk.cpp 2020-04-16 19:27:47 UTC (rev 260209)
@@ -47,7 +47,7 @@
if (m_activeSelectionBackgroundColor.isValid())
return;
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
GRefPtr<GtkWidgetPath> entryPath = adoptGRef(gtk_widget_path_new());
gtk_widget_path_append_type(entryPath.get(), G_TYPE_NONE);
@@ -79,7 +79,7 @@
gtk_style_context_get_color(selectionContext.get(), gtk_style_context_get_state(selectionContext.get()), &color);
m_inactiveSelectionForegroundColor = color;
- G_GNUC_END_IGNORE_DEPRECATIONS;
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
void ThemeGtk::platformColorsDidChange()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
