Move GPU messages to content. I've also switched the IPC structs to use the new IPC macros that generate serialization code.

Review URL: http://codereview.chromium.org/6673003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77721 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 18 insertions, 15 deletions

diff --git a/chrome/renderer/command_buffer_proxy.cc b/chrome/renderer/command_buffer_proxy.cc
index 8414b4e..3de46bf 100644
--- a/chrome/renderer/command_buffer_proxy.cc
+++ b/chrome/renderer/command_buffer_proxy.cc
@@ -6,12 +6,12 @@
 #include "base/process_util.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
-#include "chrome/common/gpu_messages.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/gpu_messages.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "ui/gfx/size.h"
 
diff --git a/chrome/renderer/gpu_channel_host.cc b/chrome/renderer/gpu_channel_host.cc
index 705193d..14b91b4 100644
--- a/chrome/renderer/gpu_channel_host.cc
+++ b/chrome/renderer/gpu_channel_host.cc
@@ -4,12 +4,11 @@
 
 #include "chrome/renderer/gpu_channel_host.h"
 
-#include "chrome/common/gpu_create_command_buffer_config.h"
-#include "chrome/common/gpu_messages.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/gpu_video_service_host.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/gpu_messages.h"
 
 GpuChannelHost::GpuChannelHost() : state_(kUnconnected) {
 }
@@ -105,7 +104,9 @@ CommandBufferProxy* GpuChannelHost::CreateViewCommandBuffer(
   if (!channel_.get())
     return NULL;
 
-  GPUCreateCommandBufferConfig init_params(allowed_extensions, attribs);
+  GPUCreateCommandBufferConfig init_params;
+  init_params.allowed_extensions = allowed_extensions;
+  init_params.attribs = attribs;
   int32 route_id;
   if (!RenderThread::current()->Send(
       new GpuHostMsg_CreateViewCommandBuffer(
@@ -136,7 +137,9 @@ CommandBufferProxy* GpuChannelHost::CreateOffscreenCommandBuffer(
   if (!channel_.get())
     return NULL;
 
-  GPUCreateCommandBufferConfig init_params(allowed_extensions, attribs);
+  GPUCreateCommandBufferConfig init_params;
+  init_params.allowed_extensions = allowed_extensions;
+  init_params.attribs = attribs;
   int32 parent_route_id = parent ? parent->route_id() : 0;
   int32 route_id;
   if (!Send(new GpuChannelMsg_CreateOffscreenCommandBuffer(parent_route_id,
diff --git a/chrome/renderer/gpu_channel_host.h b/chrome/renderer/gpu_channel_host.h
index 88979a9..fb099a6 100644
--- a/chrome/renderer/gpu_channel_host.h
+++ b/chrome/renderer/gpu_channel_host.h
@@ -12,7 +12,7 @@
 #include "base/hash_tables.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/gpu_info.h"
+#include "content/common/gpu_info.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
diff --git a/chrome/renderer/gpu_video_decoder_host.cc b/chrome/renderer/gpu_video_decoder_host.cc
index fb96eb9..5afa69c 100644
--- a/chrome/renderer/gpu_video_decoder_host.cc
+++ b/chrome/renderer/gpu_video_decoder_host.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/renderer/gpu_video_decoder_host.h"
 
-#include "chrome/common/gpu_messages.h"
-#include "media/base/pipeline.h"
+#include "content/common/gpu_messages.h"
 #include "content/common/message_router.h"
+#include "media/base/pipeline.h"
 #include "media/video/video_decode_context.h"
 
 GpuVideoDecoderHost::GpuVideoDecoderHost(MessageRouter* router,
diff --git a/chrome/renderer/gpu_video_decoder_host.h b/chrome/renderer/gpu_video_decoder_host.h
index cd78643..34b5903 100644
--- a/chrome/renderer/gpu_video_decoder_host.h
+++ b/chrome/renderer/gpu_video_decoder_host.h
@@ -8,8 +8,8 @@
 #include <deque>
 #include <map>
 
+#include "base/shared_memory.h"
 #include "base/singleton.h"
-#include "chrome/common/gpu_video_common.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "ipc/ipc_message.h"
 #include "media/base/buffers.h"
@@ -20,6 +20,7 @@ using media::VideoFrame;
 using media::Buffer;
 
 class MessageRouter;
+struct GpuVideoDecoderInitDoneParam;
 
 // This class is used to talk to GpuVideoDecoder in the GPU process through
 // IPC messages. It implements the interface of VideoDecodeEngine so users
diff --git a/chrome/renderer/gpu_video_decoder_host_unittest.cc b/chrome/renderer/gpu_video_decoder_host_unittest.cc
index 89d765e..6186e48 100644
--- a/chrome/renderer/gpu_video_decoder_host_unittest.cc
+++ b/chrome/renderer/gpu_video_decoder_host_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "chrome/common/gpu_messages.h"
 #include "chrome/renderer/gpu_video_decoder_host.h"
 #include "content/common/message_router.h"
+#include "content/common/gpu_messages.h"
 #include "media/base/pipeline.h"
 #include "media/video/video_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/renderer/gpu_video_service_host.cc b/chrome/renderer/gpu_video_service_host.cc
index 2971ff2..221990f 100644
--- a/chrome/renderer/gpu_video_service_host.cc
+++ b/chrome/renderer/gpu_video_service_host.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/renderer/gpu_video_service_host.h"
 
-#include "chrome/common/gpu_messages.h"
 #include "chrome/renderer/gpu_video_decoder_host.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/gpu_messages.h"
 
 GpuVideoServiceHost::GpuVideoServiceHost()
     : channel_(NULL),
diff --git a/chrome/renderer/gpu_video_service_host.h b/chrome/renderer/gpu_video_service_host.h
index e4f3be0..c3c999e 100644
--- a/chrome/renderer/gpu_video_service_host.h
+++ b/chrome/renderer/gpu_video_service_host.h
@@ -6,7 +6,6 @@
 #define CHROME_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
 
 #include "base/singleton.h"
-#include "chrome/common/gpu_video_common.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/gpu_video_decoder_host.h"
 #include "ipc/ipc_channel.h"
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index cad2d5e..27d0a12 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -31,7 +31,6 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_localization_peer.h"
 #include "chrome/common/extensions/extension_set.h"
-#include "chrome/common/gpu_messages.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
@@ -67,6 +66,7 @@
 #include "chrome/renderer/security_filter_peer.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/user_script_slave.h"
+#include "content/common/gpu_messages.h"
 #include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "ipc/ipc_channel_handle.h"
@@ -679,7 +679,7 @@ bool RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
                         OnSpellCheckWordAdded)
     IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_EnableAutoSpellCorrect,
                         OnSpellCheckEnableAutoSpellCorrect)
-    IPC_MESSAGE_HANDLER(ViewMsg_GpuChannelEstablished, OnGpuChannelEstablished)
+    IPC_MESSAGE_HANDLER(GpuMsg_GpuChannelEstablished, OnGpuChannelEstablished)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPhishingModel, OnSetPhishingModel)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index db1deab..eed5c65 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -16,7 +16,6 @@
 #include "build/build_config.h"
 #include "chrome/common/css_colors.h"
 #include "chrome/common/extensions/extension_set.h"
-#include "chrome/common/gpu_info.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "content/common/child_thread.h"
 #include "ipc/ipc_channel_proxy.h"
@@ -45,6 +44,7 @@ class WebDatabaseObserverImpl;
 struct ContentSettings;
 struct RendererPreferences;
 struct DOMStorageMsg_Event_Params;
+struct GPUInfo;
 struct ViewMsg_ExtensionLoaded_Params;
 struct ViewMsg_New_Params;
 struct WebPreferences;