| Index: content/common/gpu/gpu_command_buffer_stub.cc
|
| ===================================================================
|
| --- content/common/gpu/gpu_command_buffer_stub.cc (revision 0)
|
| +++ content/common/gpu/gpu_command_buffer_stub.cc (working copy)
|
| @@ -7,11 +7,11 @@
|
| #include "base/process_util.h"
|
| #include "base/shared_memory.h"
|
| #include "build/build_config.h"
|
| +#include "content/common/child_thread.h"
|
| #include "content/common/gpu_messages.h"
|
| -#include "content/common/child_thread.h"
|
| -#include "content/gpu/gpu_channel.h"
|
| -#include "content/gpu/gpu_command_buffer_stub.h"
|
| -#include "content/gpu/gpu_render_thread.h"
|
| +#include "content/common/gpu/gpu_channel.h"
|
| +#include "content/common/gpu/gpu_channel_manager.h"
|
| +#include "content/common/gpu/gpu_command_buffer_stub.h"
|
| #include "content/gpu/gpu_watchdog_thread.h"
|
| #include "gpu/common/gpu_trace_event.h"
|
|
|
| @@ -147,8 +147,8 @@
|
| }
|
|
|
| void GpuCommandBufferStub::OnCompositorWindowPainted() {
|
| - GpuRenderThread* render_thread = channel_->gpu_render_thread();
|
| - render_thread->Send(new GpuHostMsg_ScheduleComposite(
|
| + GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
|
| + gpu_channel_manager->Send(new GpuHostMsg_ScheduleComposite(
|
| renderer_id_, render_view_id_));
|
| }
|
| #endif // defined(OS_WIN)
|
| @@ -165,8 +165,8 @@
|
| }
|
| #endif // defined(OS_WIN)
|
|
|
| - GpuRenderThread* render_thread = channel_->gpu_render_thread();
|
| - render_thread->Send(new GpuHostMsg_DestroyCommandBuffer(
|
| + GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
|
| + gpu_channel_manager->Send(new GpuHostMsg_DestroyCommandBuffer(
|
| handle_, renderer_id_, render_view_id_));
|
| }
|
|
|
| @@ -368,7 +368,7 @@
|
|
|
| #if defined(OS_MACOSX)
|
| void GpuCommandBufferStub::OnSetWindowSize(const gfx::Size& size) {
|
| - GpuRenderThread* gpu_render_thread = channel_->gpu_render_thread();
|
| + GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
|
| // Try using the IOSurface version first.
|
| uint64 new_backing_store = processor_->SetWindowSizeForIOSurface(size);
|
| if (new_backing_store) {
|
| @@ -379,7 +379,7 @@
|
| params.width = size.width();
|
| params.height = size.height();
|
| params.identifier = new_backing_store;
|
| - gpu_render_thread->Send(
|
| + gpu_channel_manager->Send(
|
| new GpuHostMsg_AcceleratedSurfaceSetIOSurface(params));
|
| } else {
|
| // TODO(kbr): figure out what to do here. It wouldn't be difficult
|
| @@ -391,7 +391,7 @@
|
|
|
| void GpuCommandBufferStub::SwapBuffersCallback() {
|
| OnSwapBuffers();
|
| - GpuRenderThread* gpu_render_thread = channel_->gpu_render_thread();
|
| + GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
|
| GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
|
| params.renderer_id = renderer_id_;
|
| params.render_view_id = render_view_id_;
|
| @@ -399,7 +399,7 @@
|
| params.surface_id = processor_->GetSurfaceId();
|
| params.route_id = route_id();
|
| params.swap_buffers_count = processor_->swap_buffers_count();
|
| - gpu_render_thread->Send(
|
| + gpu_channel_manager->Send(
|
| new GpuHostMsg_AcceleratedSurfaceBuffersSwapped(params));
|
| }
|
|
|
| @@ -417,9 +417,9 @@
|
| processor_->decoder()->UpdateOffscreenFrameBufferSize();
|
| } else {
|
| #if defined(OS_LINUX) && !defined(TOUCH_UI)
|
| - GpuRenderThread* gpu_render_thread = channel_->gpu_render_thread();
|
| + GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
|
| bool result = false;
|
| - gpu_render_thread->Send(
|
| + gpu_channel_manager->Send(
|
| new GpuHostMsg_ResizeXID(handle_, size, &result));
|
| #elif defined(OS_WIN)
|
| HWND hwnd = static_cast<HWND>(compositor_window_);
|
|
|