[WK2][GTK] REGRESSION (r143463): unit test failure in WebKit2APITests/TestContextMenu
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Feb 2013 18:29:27 +0000 (18:29 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Feb 2013 18:29:27 +0000 (18:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=110869

Patch by Manuel Rego Casasnovas <rego@igalia.com> on 2013-02-26
Reviewed by Martin Robinson.

Test was failing because of new media controls needs more space to be
painted than just 10x10 pixels.

* UIProcess/API/gtk/tests/TestContextMenu.cpp:
(testContextMenuDefaultMenu): Modified test in order to give more space
to the media controls.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp

index e96ee36..201039a 100644 (file)
@@ -1,3 +1,17 @@
+2013-02-26  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [WK2][GTK] REGRESSION (r143463): unit test failure in WebKit2APITests/TestContextMenu
+        https://bugs.webkit.org/show_bug.cgi?id=110869
+
+        Reviewed by Martin Robinson.
+
+        Test was failing because of new media controls needs more space to be
+        painted than just 10x10 pixels.
+
+        * UIProcess/API/gtk/tests/TestContextMenu.cpp:
+        (testContextMenuDefaultMenu): Modified test in order to give more space
+        to the media controls.
+
 2013-02-26  Dean Jackson  <dino@apple.com>
 
         Draw intermediate snapshots if possible
 2013-02-26  Dean Jackson  <dino@apple.com>
 
         Draw intermediate snapshots if possible
index eff5986..e926b87 100644 (file)
@@ -354,8 +354,8 @@ static void testContextMenuDefaultMenu(ContextMenuDefaultTest* test, gconstpoint
         " <a style='position:absolute; left:1; top:1' href='http://www.webkitgtk.org' title='WebKitGTK+ Title'>WebKitGTK+ Website</a>"
         " <img style='position:absolute; left:1; top:10' src='0xdeadbeef' width=5 height=5></img>"
         " <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK+ Logo'><img src='0xdeadbeef' width=5 height=5></img></a>"
         " <a style='position:absolute; left:1; top:1' href='http://www.webkitgtk.org' title='WebKitGTK+ Title'>WebKitGTK+ Website</a>"
         " <img style='position:absolute; left:1; top:10' src='0xdeadbeef' width=5 height=5></img>"
         " <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK+ Logo'><img src='0xdeadbeef' width=5 height=5></img></a>"
-        " <video style='position:absolute; left:1; top:30' width=10 height=10 controls='controls'><source src='movie.ogg' type='video/ogg' /></video>"
-        " <input style='position:absolute; left:1; top:50' size='10'></input>"
+        " <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'><source src='movie.ogg' type='video/ogg' /></video>"
         "</body></html>";
     test->loadHtml(linksHTML, "file:///");
     test->waitUntilLoadFinished();
         "</body></html>";
     test->loadHtml(linksHTML, "file:///");
     test->waitUntilLoadFinished();
@@ -382,11 +382,11 @@ static void testContextMenuDefaultMenu(ContextMenuDefaultTest* test, gconstpoint
 
     // Context menu for image video.
     test->m_expectedMenuType = ContextMenuDefaultTest::Video;
 
     // Context menu for image video.
     test->m_expectedMenuType = ContextMenuDefaultTest::Video;
-    test->showContextMenuAtPositionAndWaitUntilFinished(1, 30);
+    test->showContextMenuAtPositionAndWaitUntilFinished(1, 50);
 
     // Context menu for editable.
     test->m_expectedMenuType = ContextMenuDefaultTest::Editable;
 
     // Context menu for editable.
     test->m_expectedMenuType = ContextMenuDefaultTest::Editable;
-    test->showContextMenuAtPositionAndWaitUntilFinished(5, 55);
+    test->showContextMenuAtPositionAndWaitUntilFinished(5, 35);
 }
 
 class ContextMenuCustomTest: public ContextMenuTest {
 }
 
 class ContextMenuCustomTest: public ContextMenuTest {