[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e462d1fbd4a09c86664c014dd0db84d81a6bd0ff
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 13 22:48:23 2009 +0000

            Reviewed by Xan Lopez.
    
            Also give the right click event to the frame's event handler, if
            there WebCore decides to not generate the default context
            menu. This fixes some pages that handle right-button clicks for
            things other than context menu creation.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_forward_context_menu_event):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index b4c4d65..f4a81e9 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-13  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        Also give the right click event to the frame's event handler, if
+        there WebCore decides to not generate the default context
+        menu. This fixes some pages that handle right-button clicks for
+        things other than context menu creation.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_forward_context_menu_event):
+
 2009-12-13  Christian Dywan  <christian at twotoasts.de>
 
         Reviewed by Holger Freyther.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index bebd01a..58fffc5 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -208,8 +208,13 @@ static gboolean webkit_web_view_forward_context_menu_event(WebKitWebView* webVie
         return FALSE;
 
     ContextMenu* coreMenu = page->contextMenuController()->contextMenu();
-    if (!coreMenu)
+    if (!coreMenu) {
+        Frame* frame = core(webView)->mainFrame();
+        if (frame->view() && frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(event)))
+            return TRUE;
+
         return FALSE;
+    }
 
     GtkMenu* menu = GTK_MENU(coreMenu->platformDescription());
     if (!menu)

-- 
WebKit Debian packaging