Skip to content

Commit

Permalink
Merge r220902 - [GTK] Make TestContextMenu work on Fedora
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mcatanzaro authored and carlosgcampos committed Aug 18, 2017
1 parent 09e314d commit cd4ac81
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,21 @@
2017-08-17 Michael Catanzaro <mcatanzaro@igalia.com>

[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 <commit-queue@webkit.org>

Unreviewed, rolling out r220854.
Expand Down
2 changes: 1 addition & 1 deletion Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp
Expand Up @@ -440,7 +440,7 @@ static void prepareContextMenuTestView(ContextMenuDefaultTest* test)
" <img style='position:absolute; left:1; top:10' src='blank.ico' width=5 height=5></img>"
" <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK+ Logo'><img src='blank.ico' width=5 height=5></img></a>"
" <input style='position:absolute; left:1; top:30' size='10'></input>"
" <video style='position:absolute; left:1; top:50' width='300' height='300' controls='controls' preload='none'><source src='silence.mpg' type='video/mpeg' /></video>"
" <video style='position:absolute; left:1; top:50' width='300' height='300' controls='controls' preload='none'><source src='silence.webm' type='video/webm' /></video>"
" <audio style='position:absolute; left:1; top:60' width='50' height='20' controls='controls' preload='none'><source src='track.ogg' type='audio/ogg' /></audio>"
" <p style='position:absolute; left:1; top:90' id='text_to_select'>Lorem ipsum.</p>"
" <script>"
Expand Down
Binary file not shown.
Binary file not shown.

0 comments on commit cd4ac81

Please sign in to comment.