[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[darin at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 81597b915940e8001ce17db344a5a93edb803799
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 16:42:43 2010 +0000

    2010-07-22  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Kent Tamura.
    
            https://bugs.webkit.org/show_bug.cgi?id=42808
            Pass context menu events through WebInputEvent to WebPlugin::handleInputEvent.
    
            The DOM treats a context menu event as a type of mouse event.  We therefore
            do the same here, and reuse the WebMouseEvent subclass.  This makes sense
            since a context menu event has (x,y)-coordinates.
    
            * public/WebInputEvent.h:
            (WebKit::WebInputEvent::):
            (WebKit::WebInputEvent::isMouseEventType):
            * src/WebInputEventConversion.cpp:
            (WebKit::WebMouseEventBuilder::WebMouseEventBuilder):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 73bb238..41a6452 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-22  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42808
+        Pass context menu events through WebInputEvent to WebPlugin::handleInputEvent.
+
+        The DOM treats a context menu event as a type of mouse event.  We therefore
+        do the same here, and reuse the WebMouseEvent subclass.  This makes sense
+        since a context menu event has (x,y)-coordinates.
+
+        * public/WebInputEvent.h:
+        (WebKit::WebInputEvent::):
+        (WebKit::WebInputEvent::isMouseEventType):
+        * src/WebInputEventConversion.cpp:
+        (WebKit::WebMouseEventBuilder::WebMouseEventBuilder):
+
 2010-07-22  Andrey Kosyakov  <caseq at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/public/WebInputEvent.h b/WebKit/chromium/public/WebInputEvent.h
index 2ac7475..f8b057b 100644
--- a/WebKit/chromium/public/WebInputEvent.h
+++ b/WebKit/chromium/public/WebInputEvent.h
@@ -89,6 +89,7 @@ public:
         MouseMove,
         MouseEnter,
         MouseLeave,
+        ContextMenu,
 
         // WebMouseWheelEvent
         MouseWheel,
@@ -135,7 +136,8 @@ public:
             || type == MouseUp
             || type == MouseMove
             || type == MouseEnter
-            || type == MouseLeave;
+            || type == MouseLeave
+            || type == ContextMenu;
     }
 
     // Returns true if the WebInputEvent |type| is a keyboard event.
diff --git a/WebKit/chromium/src/WebInputEventConversion.cpp b/WebKit/chromium/src/WebInputEventConversion.cpp
index f68e3ab..fb144e0 100644
--- a/WebKit/chromium/src/WebInputEventConversion.cpp
+++ b/WebKit/chromium/src/WebInputEventConversion.cpp
@@ -253,6 +253,8 @@ WebMouseEventBuilder::WebMouseEventBuilder(const ScrollView* view, const MouseEv
         type = WebInputEvent::MouseDown;
     else if (event.type() == eventNames().mouseupEvent)
         type = WebInputEvent::MouseUp;
+    else if (event.type() == eventNames().contextmenuEvent)
+        type = WebInputEvent::ContextMenu;
     else
         return; // Skip all other mouse events.
     timeStampSeconds = event.timeStamp() * 1.0e-3;

-- 
WebKit Debian packaging