Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / common / child_process_host_impl.cc

diff --git a/src/content/common/child_process_host_impl.cc b/src/content/common/child_process_host_impl.cc
index efdd925..488cdb0 100644 (file)
--- a/src/content/common/child_process_host_impl.cc
+++ b/src/content/common/child_process_host_impl.cc
@@ -23,6 +23,7 @@
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_logging.h"
+#include "ipc/message_filter.h"
 
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
@@ -150,7 +151,7 @@ ChildProcessHostImpl::~ChildProcessHostImpl() {
   base::CloseProcessHandle(peer_handle_);
 }
 
-void ChildProcessHostImpl::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
+void ChildProcessHostImpl::AddFilter(IPC::MessageFilter* filter) {
   filters_.push_back(filter);
 
   if (channel_)
@@ -307,6 +308,7 @@ void ChildProcessHostImpl::OnAllocateGpuMemoryBuffer(
     uint32 width,
     uint32 height,
     uint32 internalformat,
+    uint32 usage,
     gfx::GpuMemoryBufferHandle* handle) {
   handle->type = gfx::SHARED_MEMORY_BUFFER;
   AllocateSharedMemory(