Title: [144606] releases/WebKitGTK/webkit-2.0/Source/WebKit2
- Revision
- 144606
- Author
- [email protected]
- Date
- 2013-03-04 01:19:46 -0800 (Mon, 04 Mar 2013)
Log Message
Merge r144070 - [WK2][GTK] REGRESSION (r143463): unit test failure in WebKit2APITests/TestContextMenu
https://bugs.webkit.org/show_bug.cgi?id=110869
Patch by Manuel Rego Casasnovas <[email protected]> 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (144605 => 144606)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-04 08:37:42 UTC (rev 144605)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-04 09:19:46 UTC (rev 144606)
@@ -1,3 +1,17 @@
+2013-02-26 Manuel Rego Casasnovas <[email protected]>
+
+ [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-21 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix make distcheck.
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp (144605 => 144606)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-03-04 08:37:42 UTC (rev 144605)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-03-04 09:19:46 UTC (rev 144606)
@@ -354,8 +354,8 @@
" <a style='position:absolute; left:1; top:1' href='' title='WebKitGTK+ Title'>WebKitGTK+ Website</a>"
" <img style='position:absolute; left:1; top:10' src='' width=5 height=5></img>"
" <a style='position:absolute; left:1; top:20' href='' title='WebKitGTK+ Logo'><img src='' width=5 height=5></img></a>"
- " <video style='position:absolute; left:1; top:30' width=10 height=10 controls='controls'><source src='' 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='' type='video/ogg' /></video>"
"</body></html>";
test->loadHtml(linksHTML, "file:///");
test->waitUntilLoadFinished();
@@ -382,11 +382,11 @@
// 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;
- test->showContextMenuAtPositionAndWaitUntilFinished(5, 55);
+ test->showContextMenuAtPositionAndWaitUntilFinished(5, 35);
}
class ContextMenuCustomTest: public ContextMenuTest {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
