Merge 21466 - Allow the browser to send actions back to the render for media ...

webkit/glue/webview_delegate.h

Index: webkit/glue/webview_delegate.h
===================================================================
--- webkit/glue/webview_delegate.h	(revision 21785)
+++ webkit/glue/webview_delegate.h	(working copy)
@@ -50,6 +50,7 @@
 class WebWorkerClient;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
+class WebNode;
 class WebURLRequest;
 class WebURLResponse;
 class WebWidget;
@@ -615,7 +616,8 @@
   // @abstract Shows a context menu with commands relevant to a specific
   //           element on the current page.
   // @param webview The WebView sending the delegate method.
-  // @param node The node(s) the context menu is being invoked on
+  // @param node_type The type of the node(s) the context menu is being
+  // invoked on
   // @param x The x position of the mouse pointer (relative to the webview)
   // @param y The y position of the mouse pointer (relative to the webview)
   // @param link_url The absolute URL of the link that contains the node the
@@ -635,7 +637,7 @@
   // @param frame_charset which indicates the character encoding of
   // the currently focused frame.
   virtual void ShowContextMenu(WebView* webview,
-                               ContextNode node,
+                               ContextNodeType node_type,
                                int x,
                                int y,
                                const GURL& link_url,
Property changes on: webkit\glue\webview_delegate.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webview_delegate.h:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/webview_delegate.h:r21466