summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-15 00:54:22 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-15 00:54:22 +0000
commit2b0edd15771cc79ad0f10c3741f0c8119c195154 (patch)
tree9531113c1a5b8f9eca1cc626e48b6e882cb91ec1
parentbd00ea3ce1224d3460ea4d479b22a75b1c9b3076 (diff)
downloadchromium_src-2b0edd15771cc79ad0f10c3741f0c8119c195154.zip
chromium_src-2b0edd15771cc79ad0f10c3741f0c8119c195154.tar.gz
chromium_src-2b0edd15771cc79ad0f10c3741f0c8119c195154.tar.bz2
gpu: IPC minor cleanup
Removing a field we don't use. BUG=None Review URL: https://codereview.chromium.org/26971003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228574 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/common/gpu/gpu_messages.h1
-rw-r--r--content/common/gpu/image_transport_surface.cc6
-rw-r--r--content/common/gpu/image_transport_surface.h4
-rw-r--r--content/common/gpu/image_transport_surface_win.cc3
-rw-r--r--content/common/gpu/texture_image_transport_surface.cc3
5 files changed, 6 insertions, 11 deletions
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
index 84598e6..a64afdc 100644
--- a/content/common/gpu/gpu_messages.h
+++ b/content/common/gpu/gpu_messages.h
@@ -75,7 +75,6 @@ IPC_STRUCT_END()
IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceRelease_Params)
IPC_STRUCT_MEMBER(int32, surface_id)
- IPC_STRUCT_MEMBER(int32, route_id)
IPC_STRUCT_END()
IPC_STRUCT_BEGIN(AcceleratedSurfaceMsg_BufferPresented_Params)
diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc
index e0d23ae..502b58e 100644
--- a/content/common/gpu/image_transport_surface.cc
+++ b/content/common/gpu/image_transport_surface.cc
@@ -12,6 +12,7 @@
#include "content/common/gpu/gpu_channel_manager.h"
#include "content/common/gpu/gpu_command_buffer_stub.h"
#include "content/common/gpu/gpu_messages.h"
+#include "content/common/gpu/sync_point_manager.h"
#include "content/common/gpu/texture_image_transport_surface.h"
#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "ui/gl/gl_implementation.h"
@@ -107,10 +108,9 @@ void ImageTransportHelper::SendAcceleratedSurfacePostSubBuffer(
manager_->Send(new GpuHostMsg_AcceleratedSurfacePostSubBuffer(params));
}
-void ImageTransportHelper::SendAcceleratedSurfaceRelease(
- GpuHostMsg_AcceleratedSurfaceRelease_Params params) {
+void ImageTransportHelper::SendAcceleratedSurfaceRelease() {
+ GpuHostMsg_AcceleratedSurfaceRelease_Params params;
params.surface_id = stub_->surface_id();
- params.route_id = route_id_;
manager_->Send(new GpuHostMsg_AcceleratedSurfaceRelease(params));
}
diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h
index 9a7889f..4eba279 100644
--- a/content/common/gpu/image_transport_surface.h
+++ b/content/common/gpu/image_transport_surface.h
@@ -24,7 +24,6 @@
struct AcceleratedSurfaceMsg_BufferPresented_Params;
struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
-struct GpuHostMsg_AcceleratedSurfaceRelease_Params;
namespace gfx {
class GLSurface;
@@ -120,8 +119,7 @@ class ImageTransportHelper
GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params);
void SendAcceleratedSurfacePostSubBuffer(
GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params);
- void SendAcceleratedSurfaceRelease(
- GpuHostMsg_AcceleratedSurfaceRelease_Params params);
+ void SendAcceleratedSurfaceRelease();
void SendResizeView(const gfx::Size& size);
void SendUpdateVSyncParameters(
base::TimeTicks timebase, base::TimeDelta interval);
diff --git a/content/common/gpu/image_transport_surface_win.cc b/content/common/gpu/image_transport_surface_win.cc
index c69e3cc..9069811 100644
--- a/content/common/gpu/image_transport_surface_win.cc
+++ b/content/common/gpu/image_transport_surface_win.cc
@@ -182,8 +182,7 @@ void PbufferImageTransportSurface::SetFrontbufferAllocation(bool allocation) {
}
void PbufferImageTransportSurface::DestroySurface() {
- GpuHostMsg_AcceleratedSurfaceRelease_Params params;
- helper_->SendAcceleratedSurfaceRelease(params);
+ helper_->SendAcceleratedSurfaceRelease();
}
std::string PbufferImageTransportSurface::GetExtensions() {
diff --git a/content/common/gpu/texture_image_transport_surface.cc b/content/common/gpu/texture_image_transport_surface.cc
index f42780e..fb93cb5 100644
--- a/content/common/gpu/texture_image_transport_surface.cc
+++ b/content/common/gpu/texture_image_transport_surface.cc
@@ -369,8 +369,7 @@ void TextureImageTransportSurface::ReleaseFrontTexture() {
front_mailbox_name_ = MailboxName();
glFlush();
CHECK_GL_ERROR();
- GpuHostMsg_AcceleratedSurfaceRelease_Params params;
- helper_->SendAcceleratedSurfaceRelease(params);
+ helper_->SendAcceleratedSurfaceRelease();
}
void TextureImageTransportSurface::CreateBackTexture() {