Attachment 396638 Details for Bug 210600 – Patch

[patch] Patch

bug-210600-20200416161245.patch (text/plain), 2.57 KB, created by Claudio Saavedra on 2020-04-16 06:12:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Claudio Saavedra

Created: 2020-04-16 06:12:46 PDT

Size: 2.57 KB

patch

obsolete

>Subversion Revision: 260180
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cffdca00377f24e188ae57fb5e4f54706f97dc8b..e59070c0260a108f6d70640126d591df6301d36f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2020-04-16  Claudio Saavedra  <csaavedra@igalia.com>
>+
>+        [GTK] Deprecation-guards fixes
>+        https://bugs.webkit.org/show_bug.cgi?id=210600
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Philippe Normand  <pnormand@igalia.com>
> 
>         Unreviewed, fix GStreamer build warnings.
>diff --git a/Source/WebCore/platform/gtk/RenderThemeGadget.cpp b/Source/WebCore/platform/gtk/RenderThemeGadget.cpp
>index 9c660443dda450f687ebf686ffd9fb7f7704c581..8377ca5ce7a7609e302babdb138e83477c981005 100644
>--- a/Source/WebCore/platform/gtk/RenderThemeGadget.cpp
>+++ b/Source/WebCore/platform/gtk/RenderThemeGadget.cpp
>@@ -121,7 +121,11 @@ Color RenderThemeGadget::color() const
> 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;
> }
> 
>diff --git a/Source/WebCore/platform/gtk/ThemeGtk.cpp b/Source/WebCore/platform/gtk/ThemeGtk.cpp
>index f2f4a5f0f6760cb7bf2e982442be0e4b5c5c128d..7f70d3888f4d11e5e3b5d4f6d14e41864544da1a 100644
>--- a/Source/WebCore/platform/gtk/ThemeGtk.cpp
>+++ b/Source/WebCore/platform/gtk/ThemeGtk.cpp
>@@ -47,7 +47,7 @@ void ThemeGtk::ensurePlatformColors() const
>     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 @@ void ThemeGtk::ensurePlatformColors() const
>     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()

Actions: View | Formatted Diff | Diff

Attachments on bug 210600: 396638