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

webkit/glue/glue_util.h

Index: webkit/glue/glue_util.h
===================================================================
--- webkit/glue/glue_util.h	(revision 21785)
+++ webkit/glue/glue_util.h	(working copy)
@@ -20,6 +20,7 @@
 class IntRect;
 class IntSize;
 class KURL;
+class Node;
 class ResourceError;
 class ResourceResponse;
 class SharedBuffer;
@@ -33,6 +34,7 @@
 class WebDragData;
 class WebForm;
 class WebHistoryItem;
+class WebNode;
 class WebString;
 class WebURL;
 class WebURLRequest;
@@ -120,6 +122,10 @@
 // WebCursorInfo <- Cursor
 WebKit::WebCursorInfo CursorToWebCursorInfo(const WebCore::Cursor&);
 
+// WebNode <-> Node
+WebKit::WebNode NodeToWebNode(const WTF::PassRefPtr<WebCore::Node>&);
+WTF::PassRefPtr<WebCore::Node> WebNodeToNode(const WebKit::WebNode&);
+
 // WebDragData <-> ChromiumDataObject
 WebKit::WebDragData ChromiumDataObjectToWebDragData(
     const WTF::PassRefPtr<WebCore::ChromiumDataObject>&);
Property changes on: webkit\glue\glue_util.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/glue_util.h:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/glue_util.h:r21466