Revert of gpu: GPU service scheduler.

gpu/ipc/client/command_buffer_proxy_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 42 matching lines @@
 CommandBufferProxyImpl::CommandBufferProxyImpl(int channel_id,
                                                int32_t route_id,
                                                int32_t stream_id)
     : lock_(nullptr),
       gpu_control_client_(nullptr),
       command_buffer_id_(CommandBufferProxyID(channel_id, route_id)),
       route_id_(route_id),
       stream_id_(stream_id),
       weak_this_(AsWeakPtr()) {
   DCHECK(route_id);
+  DCHECK_NE(stream_id, GPU_STREAM_INVALID);
 }
 
 // static
 std::unique_ptr<CommandBufferProxyImpl> CommandBufferProxyImpl::Create(
     scoped_refptr<GpuChannelHost> host,
     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) {
   DCHECK(!share_group || (stream_id == share_group->stream_id_));
   TRACE_EVENT1("gpu", "GpuChannelHost::CreateViewCommandBuffer",
                "surface_handle", surface_handle);
 
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = surface_handle;
   init_params.share_group_id =
@@ skipping 582 matching lines @@
   // Can only wait on an unverified sync token if it is from the same channel.
   int sync_token_channel_id = GetChannelID(sync_token.command_buffer_id());
   int channel_id = GetChannelID(command_buffer_id_);
   if (sync_token.namespace_id() != gpu::CommandBufferNamespace::GPU_IO ||
       sync_token_channel_id != channel_id) {
     return false;
   }
 
   // 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);
 
   return true;
 }
 
 void CommandBufferProxyImpl::AddLatencyInfo(
     const std::vector<ui::LatencyInfo>& latency_info) {
   CheckLock();
   for (size_t i = 0; i < latency_info.size(); i++)
@@ skipping 260 matching lines @@
     return;
   channel_->FlushPendingStream(stream_id_);
   channel_->Send(new GpuChannelMsg_DestroyCommandBuffer(route_id_));
   channel_->RemoveRoute(route_id_);
   channel_ = nullptr;
   if (gpu_control_client_)
     gpu_control_client_->OnGpuControlLostContext();
 }
 
 }  // namespace gpu