| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/proxy/ppapi_command_buffer_proxy.h" | 5 #include "ppapi/proxy/ppapi_command_buffer_proxy.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/numerics/safe_conversions.h" | 9 #include "base/numerics/safe_conversions.h" |
| 10 #include "ppapi/proxy/ppapi_messages.h" | 10 #include "ppapi/proxy/ppapi_messages.h" |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 size_t height, | 242 size_t height, |
| 243 unsigned internalformat) { | 243 unsigned internalformat) { |
| 244 NOTREACHED(); | 244 NOTREACHED(); |
| 245 return -1; | 245 return -1; |
| 246 } | 246 } |
| 247 | 247 |
| 248 void PpapiCommandBufferProxy::DestroyImage(int32_t id) { | 248 void PpapiCommandBufferProxy::DestroyImage(int32_t id) { |
| 249 NOTREACHED(); | 249 NOTREACHED(); |
| 250 } | 250 } |
| 251 | 251 |
| 252 int32_t PpapiCommandBufferProxy::CreateGpuMemoryBufferImage( | |
| 253 size_t width, | |
| 254 size_t height, | |
| 255 unsigned internalformat, | |
| 256 unsigned usage) { | |
| 257 NOTREACHED(); | |
| 258 return -1; | |
| 259 } | |
| 260 | |
| 261 bool PpapiCommandBufferProxy::Send(IPC::Message* msg) { | 252 bool PpapiCommandBufferProxy::Send(IPC::Message* msg) { |
| 262 DCHECK(last_state_.error == gpu::error::kNoError); | 253 DCHECK(last_state_.error == gpu::error::kNoError); |
| 263 | 254 |
| 264 // We need to hold the Pepper proxy lock for sync IPC, because the GPU command | 255 // We need to hold the Pepper proxy lock for sync IPC, because the GPU command |
| 265 // buffer may use a sync IPC with another lock held which could lead to lock | 256 // buffer may use a sync IPC with another lock held which could lead to lock |
| 266 // and deadlock if we dropped the proxy lock here. | 257 // and deadlock if we dropped the proxy lock here. |
| 267 // http://crbug.com/418651 | 258 // http://crbug.com/418651 |
| 268 if (dispatcher_->SendAndStayLocked(msg)) | 259 if (dispatcher_->SendAndStayLocked(msg)) |
| 269 return true; | 260 return true; |
| 270 | 261 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 message->set_unblock(true); | 304 message->set_unblock(true); |
| 314 Send(message); | 305 Send(message); |
| 315 | 306 |
| 316 flush_info_->flush_pending = false; | 307 flush_info_->flush_pending = false; |
| 317 flush_info_->resource.SetHostResource(0, 0); | 308 flush_info_->resource.SetHostResource(0, 0); |
| 318 flushed_fence_sync_release_ = pending_fence_sync_release_; | 309 flushed_fence_sync_release_ = pending_fence_sync_release_; |
| 319 } | 310 } |
| 320 | 311 |
| 321 } // namespace proxy | 312 } // namespace proxy |
| 322 } // namespace ppapi | 313 } // namespace ppapi |
| OLD | NEW |