Index: gpu/ipc/client/command_buffer_proxy_impl.cc |
diff --git a/gpu/ipc/client/command_buffer_proxy_impl.cc b/gpu/ipc/client/command_buffer_proxy_impl.cc |
index 61aa361233b6630d70264b7d11a82bc7f739d19b..a7c730804a594879c095c8dd9a7b0e8a51122f38 100644 |
--- a/gpu/ipc/client/command_buffer_proxy_impl.cc |
+++ b/gpu/ipc/client/command_buffer_proxy_impl.cc |
@@ -60,6 +60,7 @@ |
stream_id_(stream_id), |
weak_this_(AsWeakPtr()) { |
DCHECK(route_id); |
+ DCHECK_NE(stream_id, GPU_STREAM_INVALID); |
} |
// static |
@@ -68,7 +69,7 @@ |
gpu::SurfaceHandle surface_handle, |
CommandBufferProxyImpl* share_group, |
int32_t stream_id, |
- gpu::SchedulingPriority stream_priority, |
+ gpu::GpuStreamPriority stream_priority, |
const gpu::gles2::ContextCreationAttribHelper& attribs, |
const GURL& active_url, |
scoped_refptr<base::SingleThreadTaskRunner> task_runner) { |
@@ -671,6 +672,9 @@ |
// If waiting on a different stream, flush pending commands on that stream. |
int32_t release_stream_id = sync_token.extra_data_field(); |
+ if (release_stream_id == gpu::GPU_STREAM_INVALID) |
+ return false; |
+ |
if (release_stream_id != stream_id_) |
channel_->FlushPendingStream(release_stream_id); |