| Index: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| ===================================================================
|
| --- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (revision 91774)
|
| +++ 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;
|
| +}
|
| +
|
| 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,10 @@
|
| if (!command_buffer_->Initialize(kCommandBufferSize))
|
| return false;
|
|
|
| - gpu_scheduler_ = new GpuScheduler(command_buffer_.get(), NULL, NULL);
|
| + gpu_scheduler_ = new GpuScheduler(
|
| + command_buffer_.get(),
|
| + static_cast< ::gpu::SurfaceManager*>(NULL),
|
| + NULL);
|
|
|
| if (onscreen) {
|
| if (render_surface == gfx::kNullPluginWindow) {
|
| @@ -1070,19 +1077,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::
|
|
|