Chromium Code Reviews| Index: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc |
| =================================================================== |
| --- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (revision 92051) |
| +++ webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (working copy) |
| @@ -40,6 +40,10 @@ |
| using gpu::gles2::GLES2Implementation; |
| using gpu::GpuScheduler; |
| +namespace gpu { |
| +class SurfaceManager; |
| +} |
|
Ken Russell (switch to Gerrit)
2011/07/12 00:22:07
This doesn't look like it's part of this CL.
apatrick_chromium
2011/07/12 01:00:42
Done.
|
| + |
| namespace webkit { |
| namespace gpu { |
| @@ -78,7 +82,7 @@ |
| ~GLInProcessContext(); |
| - void PumpCommands(bool sync); |
| + void PumpCommands(); |
| // Create a GLInProcessContext that renders directly to a view. The view and |
| // the associated window must not be destroyed until the returned |
| @@ -384,10 +388,10 @@ |
| } |
| } |
| -void GLInProcessContext::PumpCommands(bool /* sync */) { |
| +void GLInProcessContext::PumpCommands() { |
| ::gpu::CommandBuffer::State state; |
| do { |
| - gpu_scheduler_->PutChanged(true); |
| + gpu_scheduler_->PutChanged(); |
| MessageLoop::current()->RunAllPending(); |
| state = command_buffer_->GetState(); |
| } while (state.get_offset != state.put_offset); |
| @@ -577,7 +581,9 @@ |
| if (!command_buffer_->Initialize(kCommandBufferSize)) |
| return false; |
| - gpu_scheduler_ = new GpuScheduler(command_buffer_.get(), NULL, NULL); |
| + gpu_scheduler_ = GpuScheduler::Create(command_buffer_.get(), |
| + NULL, |
| + NULL); |
| if (onscreen) { |
| if (render_surface == gfx::kNullPluginWindow) { |
| @@ -1070,19 +1076,11 @@ |
| void WebGraphicsContext3DInProcessCommandBufferImpl::waitLatchCHROMIUM( |
| WGC3Duint latch_id) |
| { |
| - // TODO(gmam): See if we can comment this in. |
| - // ClearContext(); |
| - gl_->WaitLatchCHROMIUM(latch_id); |
| } |
| void WebGraphicsContext3DInProcessCommandBufferImpl::setLatchCHROMIUM( |
| WGC3Duint latch_id) |
| { |
| - // TODO(gmam): See if we can comment this in. |
| - // ClearContext(); |
| - gl_->SetLatchCHROMIUM(latch_id); |
| - // required to ensure set command is sent to GPU process |
| - gl_->Flush(); |
| } |
| void WebGraphicsContext3DInProcessCommandBufferImpl:: |