From cd4ac814c28d42ef0301a568780fe19aefc68957 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 18 Aug 2017 07:53:06 +0000 Subject: [PATCH] Merge r220902 - [GTK] Make TestContextMenu work on Fedora https://bugs.webkit.org/show_bug.cgi?id=175708 Reviewed by Carlos Garcia Campos. TestContextMenu has been broken for as long as I remember, but not on the bots, only for me and my student last summer who was trying to work on a context menu API. It's trying to load an MPEG-2 video file and confirm that right-clicking on it shows media element context menu entries. Doesn't work on Fedora. Dunno why, since Fedora actually can play MPEG-2, but I don't care to investigate. Let's switch it to WebM so I can move on. * TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: (prepareContextMenuTestView): * TestWebKitAPI/Tests/WebKitGLib/resources/silence.mpg: Removed. * TestWebKitAPI/Tests/WebKitGLib/resources/silence.webm: Added. --- Tools/ChangeLog | 18 ++++++++++++++++++ .../Tests/WebKit2Gtk/TestContextMenu.cpp | 2 +- .../Tests/WebKitGLib/resources/silence.mpg | Bin 33227 -> 0 bytes .../Tests/WebKitGLib/resources/silence.webm | Bin 0 -> 26805 bytes 4 files changed, 19 insertions(+), 1 deletion(-) delete mode 100644 Tools/TestWebKitAPI/Tests/WebKitGLib/resources/silence.mpg create mode 100644 Tools/TestWebKitAPI/Tests/WebKitGLib/resources/silence.webm diff --git a/Tools/ChangeLog b/Tools/ChangeLog index b6e4e7abd6cd..1cb421e4075a 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,21 @@ +2017-08-17 Michael Catanzaro + + [GTK] Make TestContextMenu work on Fedora + https://bugs.webkit.org/show_bug.cgi?id=175708 + + Reviewed by Carlos Garcia Campos. + + TestContextMenu has been broken for as long as I remember, but not on the bots, only for me + and my student last summer who was trying to work on a context menu API. It's trying to load + an MPEG-2 video file and confirm that right-clicking on it shows media element context menu + entries. Doesn't work on Fedora. Dunno why, since Fedora actually can play MPEG-2, but I + don't care to investigate. Let's switch it to WebM so I can move on. + + * TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: + (prepareContextMenuTestView): + * TestWebKitAPI/Tests/WebKitGLib/resources/silence.mpg: Removed. + * TestWebKitAPI/Tests/WebKitGLib/resources/silence.webm: Added. + 2017-08-18 Commit Queue Unreviewed, rolling out r220854. diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp index 3f5fbf01cd94..7bd709719a70 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp @@ -440,7 +440,7 @@ static void prepareContextMenuTestView(ContextMenuDefaultTest* test) " " " " " " - " " + " " " " "

Lorem ipsum.

" "