Attachment 371953 Details for Bug 198787 – Patch

[patch] Patch

bug-198787-20190612162847.patch (text/plain), 7.27 KB, created by Ludovico de Nittis on 2019-06-12 07:28:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ludovico de Nittis

Created: 2019-06-12 07:28:48 PDT

Size: 7.27 KB

patch

obsolete

>Subversion Revision: 246349
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4a275d05a3013ee7d97a8957a7b907ca116c7d3f..3e0635a8fd605350b21da735d7cf25c2f35864fc 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-12  Ludovico de Nittis  <ludovico.denittis@collabora.com>
>+
>+        [GTK] GTK_STOCK_* types have been deprecated since GTK 3.10
>+        https://bugs.webkit.org/show_bug.cgi?id=198787
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No behaviour changes.
>+
>+        * platform/graphics/gtk/IconGtk.cpp:
>+        (WebCore::lookupIconName):
>+        * platform/graphics/gtk/ImageGtk.cpp:
>+        (WebCore::loadMissingImageIconFromTheme):
>+
> 2019-06-11  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Idempotent text autosizing needs to react properly to viewport changes
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 898da324a131510884bc00b5abc847d17e4d7838..2d5582ab535362cae969f65719ef006f219295f8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-12  Ludovico de Nittis  <ludovico.denittis@collabora.com>
>+
>+        [GTK] GTK_STOCK_* types have been deprecated since GTK 3.10
>+        https://bugs.webkit.org/show_bug.cgi?id=198787
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/glib/WebContextMenuItemGlib.cpp:
>+        (WebKit::gtkStockIDFromContextMenuAction):
>+
> 2019-06-11  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Idempotent text autosizing needs to react properly to viewport changes
>diff --git a/Source/WebCore/platform/graphics/gtk/IconGtk.cpp b/Source/WebCore/platform/graphics/gtk/IconGtk.cpp
>index af185a54cdd49d2046865e693c5a73c94c58b04b..f039ba663eb2ae51018c35617c1ea654df0e3c8e 100644
>--- a/Source/WebCore/platform/graphics/gtk/IconGtk.cpp
>+++ b/Source/WebCore/platform/graphics/gtk/IconGtk.cpp
>@@ -86,7 +86,7 @@ static String lookupIconName(String MIMEType)
>         if(gtk_icon_theme_has_icon(iconTheme, iconName.utf8().data()))
>             return iconName;
>     }
>-    return GTK_STOCK_FILE;
>+    return "text-x-generic";
> }
> 
> // FIXME: Move the code to ChromeClient::iconForFiles().
>diff --git a/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp b/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp
>index 575b3a5ef545e4b6aabc01db2fc8b042344a4481..830185810e1e844e5483f5c2e6df4fb616d82547 100644
>--- a/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp
>+++ b/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp
>@@ -64,7 +64,7 @@ static Ref<Image> loadMissingImageIconFromTheme(const char* name)
> {
>     int iconSize = g_str_has_suffix(name, "@2x") ? 32 : 16;
>     auto icon = BitmapImage::create();
>-    GUniquePtr<GtkIconInfo> iconInfo(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), GTK_STOCK_MISSING_IMAGE, iconSize, GTK_ICON_LOOKUP_NO_SVG));
>+    GUniquePtr<GtkIconInfo> iconInfo(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), "image-missing", iconSize, GTK_ICON_LOOKUP_NO_SVG));
>     if (iconInfo) {
>         auto buffer = loadResourceSharedBuffer(gtk_icon_info_get_filename(iconInfo.get()));
>         icon->setData(WTFMove(buffer), true);
>diff --git a/Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp b/Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp
>index d00120cf022f1dec841862bac725333fc972b954..556271d934c3eadb218044477008696605c19ca9 100644
>--- a/Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp
>+++ b/Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp
>@@ -44,79 +44,75 @@ static const char* gtkStockIDFromContextMenuAction(ContextMenuAction action)
>     case ContextMenuItemTagCopyImageToClipboard:
>     case ContextMenuItemTagCopyMediaLinkToClipboard:
>     case ContextMenuItemTagCopy:
>-        return GTK_STOCK_COPY;
>+        return "edit-copy";
>     case ContextMenuItemTagOpenLinkInNewWindow:
>     case ContextMenuItemTagOpenImageInNewWindow:
>     case ContextMenuItemTagOpenFrameInNewWindow:
>     case ContextMenuItemTagOpenMediaInNewWindow:
>-        return GTK_STOCK_OPEN;
>+        return "document-open";
>     case ContextMenuItemTagDownloadLinkToDisk:
>     case ContextMenuItemTagDownloadImageToDisk:
>-        return GTK_STOCK_SAVE;
>+        return "document-save";
>     case ContextMenuItemTagGoBack:
>-        return GTK_STOCK_GO_BACK;
>+        return "go-previous";
>     case ContextMenuItemTagGoForward:
>-        return GTK_STOCK_GO_FORWARD;
>+        return "go-next";
>     case ContextMenuItemTagStop:
>-        return GTK_STOCK_STOP;
>+        return "process-stop";
>     case ContextMenuItemTagReload:
>-        return GTK_STOCK_REFRESH;
>+        return "view-refresh";
>     case ContextMenuItemTagCut:
>-        return GTK_STOCK_CUT;
>+        return "edit-cut";
>     case ContextMenuItemTagPaste:
>-        return GTK_STOCK_PASTE;
>+        return "edit-paste";
>     case ContextMenuItemTagDelete:
>-        return GTK_STOCK_DELETE;
>+        return "edit-delete";
>     case ContextMenuItemTagSelectAll:
>-        return GTK_STOCK_SELECT_ALL;
>+        return "edit-select-all";
>     case ContextMenuItemTagSpellingGuess:
>-        return nullptr;
>     case ContextMenuItemTagIgnoreSpelling:
>-        return GTK_STOCK_NO;
>     case ContextMenuItemTagLearnSpelling:
>-        return GTK_STOCK_OK;
>+        return nullptr;
>     case ContextMenuItemTagOther:
>-        return GTK_STOCK_MISSING_IMAGE;
>+        return "image-missing";
>     case ContextMenuItemTagSearchInSpotlight:
>-        return GTK_STOCK_FIND;
>+        return "edit-find";
>     case ContextMenuItemTagSearchWeb:
>-        return GTK_STOCK_FIND;
>+        return "edit-find";
>     case ContextMenuItemTagOpenWithDefaultApplication:
>-        return GTK_STOCK_OPEN;
>+        return "document-open";
>     case ContextMenuItemPDFZoomIn:
>-        return GTK_STOCK_ZOOM_IN;
>+        return "zoom-in";
>     case ContextMenuItemPDFZoomOut:
>-        return GTK_STOCK_ZOOM_OUT;
>+        return "zoom-out";
>     case ContextMenuItemPDFAutoSize:
>-        return GTK_STOCK_ZOOM_FIT;
>+        return "zoom-fit-best";
>     case ContextMenuItemPDFNextPage:
>-        return GTK_STOCK_GO_FORWARD;
>+        return "go-next";
>     case ContextMenuItemPDFPreviousPage:
>-        return GTK_STOCK_GO_BACK;
>+        return "go-previous";
>     // New tags, not part of API
>     case ContextMenuItemTagOpenLink:
>-        return GTK_STOCK_OPEN;
>+        return "document-open";
>     case ContextMenuItemTagCheckSpelling:
>-        return GTK_STOCK_SPELL_CHECK;
>+        return "tools-check-spelling";
>     case ContextMenuItemTagFontMenu:
>-        return GTK_STOCK_SELECT_FONT;
>     case ContextMenuItemTagShowFonts:
>-        return GTK_STOCK_SELECT_FONT;
>+        return nullptr;
>     case ContextMenuItemTagBold:
>-        return GTK_STOCK_BOLD;
>+        return "format-text-bold";
>     case ContextMenuItemTagItalic:
>-        return GTK_STOCK_ITALIC;
>+        return "format-text-italic";
>     case ContextMenuItemTagUnderline:
>-        return GTK_STOCK_UNDERLINE;
>+        return "format-text-underline";
>     case ContextMenuItemTagShowColors:
>-        return GTK_STOCK_SELECT_COLOR;
>     case ContextMenuItemTagToggleMediaControls:
>     case ContextMenuItemTagToggleMediaLoop:
>     case ContextMenuItemTagCopyImageUrlToClipboard:
>         // No icon for this.
>         return nullptr;
>     case ContextMenuItemTagEnterVideoFullscreen:
>-        return GTK_STOCK_FULLSCREEN;
>+        return "view-fullscreen";
>     default:
>         return nullptr;
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 198787: 371950 | 371953 | 371962