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

webkit/glue/glue_util.cc

Index: webkit/glue/glue_util.cc
===================================================================
--- webkit/glue/glue_util.cc	(revision 21785)
+++ webkit/glue/glue_util.cc	(working copy)
@@ -22,6 +22,7 @@
 #include "IntPoint.h"
 #include "IntRect.h"
 #include "KURL.h"
+#include "Node.h"
 #include "PlatformString.h"
 #include "ResourceError.h"
 
@@ -36,6 +37,7 @@
 #include "webkit/api/public/WebDragData.h"
 #include "webkit/api/public/WebForm.h"
 #include "webkit/api/public/WebHistoryItem.h"
+#include "webkit/api/public/WebNode.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebSize.h"
@@ -261,6 +263,14 @@
   return form;
 }
 
+// WebNode conversions ---------------------------------------------------------
+WebKit::WebNode NodeToWebNode(const WTF::PassRefPtr<WebCore::Node>& node) {
+  return node;
+}
+WTF::PassRefPtr<WebCore::Node> WebNodeToNode(const WebKit::WebNode& node) {
+  return node;
+}
+
 // WebHistoryItem conversions --------------------------------------------------
 
 WebKit::WebHistoryItem HistoryItemToWebHistoryItem(
Property changes on: webkit\glue\glue_util.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/glue_util.cc:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/glue_util.cc:r21466