[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit bfc07c481e9f74b4b9b75adbb17ec922973285dd
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 13:13:19 2010 +0000

    2010-02-19  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Send the context menu event from contextClick() of EventSender
            and do not show context menu in DRT.
    
            LayoutTests:
                fast/events/contextmenu-scrolled-page-with-frame.html
    
            [Qt] DRT: Send context menu event from EventSender
            https://bugs.webkit.org/show_bug.cgi?id=35131
    
            * platform/qt/Skipped:
    2010-02-19  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Send the context menu event from contextClick() of EventSender
            and do not show context menu in DRT.
    
            LayoutTests:
                fast/events/contextmenu-scrolled-page-with-frame.html
    
            [Qt] DRT: Send context menu event from EventSender
            https://bugs.webkit.org/show_bug.cgi?id=35131
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::DumpRenderTree::DumpRenderTree):
            * DumpRenderTree/qt/EventSenderQt.cpp:
            (EventSender::contextClick):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d40a4ac..7405818 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-19  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Send the context menu event from contextClick() of EventSender
+        and do not show context menu in DRT.
+
+        LayoutTests:
+            fast/events/contextmenu-scrolled-page-with-frame.html
+
+        [Qt] DRT: Send context menu event from EventSender
+        https://bugs.webkit.org/show_bug.cgi?id=35131
+
+        * platform/qt/Skipped:
+
 2010-02-19  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 535fc9f..25630a3 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -1159,7 +1159,6 @@ fast/encoding/frame-default-enc.html
 fast/encoding/invalid-xml.html
 fast/events/access-key-self-destruct.html
 fast/events/attempt-scroll-with-no-scrollbars.html
-fast/events/contextmenu-scrolled-page-with-frame.html
 fast/events/key-events-in-input-button.html
 fast/events/key-events-in-input-text.html
 fast/forms/input-align-image.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4dcaf4c..f95dda7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-19  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Send the context menu event from contextClick() of EventSender
+        and do not show context menu in DRT.
+
+        LayoutTests:
+            fast/events/contextmenu-scrolled-page-with-frame.html
+
+        [Qt] DRT: Send context menu event from EventSender
+        https://bugs.webkit.org/show_bug.cgi?id=35131
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::contextClick):
+
 2010-02-18  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 5bc7303..1cb08e4 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -324,6 +324,7 @@ DumpRenderTree::DumpRenderTree()
     m_mainView->resize(QSize(maxViewWidth, maxViewHeight));
     m_page = new WebPage(m_mainView, this);
     m_mainView->setPage(m_page);
+    m_mainView->setContextMenuPolicy(Qt::NoContextMenu);
 
     // create our controllers. This has to be done before connectFrame,
     // as it exports there to the JavaScript DOM window.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index 73a9934..5603da6 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -274,6 +274,8 @@ void EventSender::contextClick()
     QApplication::sendEvent(m_page, &event);
     QMouseEvent event2(QEvent::MouseButtonRelease, m_mousePos, Qt::RightButton, Qt::RightButton, Qt::NoModifier);
     QApplication::sendEvent(m_page, &event2);
+    QContextMenuEvent event3(QContextMenuEvent::Mouse, m_mousePos);
+    QApplication::sendEvent(m_page->view(), &event3);
 }
 
 void EventSender::scheduleAsynchronousClick()

-- 
WebKit Debian packaging