Revert of Converted video frame and image callbacks to use new sync tokens.

content/common/gpu/client/gpu_channel_host.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 "content/common/gpu/client/gpu_channel_host.h"
 
 #include <algorithm>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
@@ skipping 380 matching lines @@
 }
 
 int32 GpuChannelHost::GenerateRouteID() {
   return next_route_id_.GetNext();
 }
 
 int32 GpuChannelHost::GenerateStreamID() {
   return next_stream_id_.GetNext();
 }
 
-uint32_t GpuChannelHost::ValidateFlushIDReachedServer(int32 stream_id,
-                                                      bool force_validate) {
+uint32_t GpuChannelHost::ValidateFlushIDReachedServer(int32 stream_id) {
   // Store what flush ids we will be validating for all streams.
   base::hash_map<int32, uint32_t> validate_flushes;
   uint32_t flushed_stream_flush_id = 0;
   uint32_t verified_stream_flush_id = 0;
   {
     AutoLock lock(context_lock_);
     for (const auto& iter : stream_flush_info_) {
       const int32 iter_stream_id = iter.first;
       const StreamFlushInfo& flush_info = iter.second;
       if (iter_stream_id == stream_id) {
         flushed_stream_flush_id = flush_info.flushed_stream_flush_id;
         verified_stream_flush_id = flush_info.verified_stream_flush_id;
       }
 
       if (flush_info.flushed_stream_flush_id >
           flush_info.verified_stream_flush_id) {
         validate_flushes.insert(
             std::make_pair(iter_stream_id, flush_info.flushed_stream_flush_id));
       }
     }
   }
 
-  if (!force_validate && flushed_stream_flush_id == verified_stream_flush_id) {
+  if (flushed_stream_flush_id == verified_stream_flush_id) {
     // Current stream has no unverified flushes.
     return verified_stream_flush_id;
   }
 
   if (Send(new GpuChannelMsg_Nop())) {
     // Update verified flush id for all streams.
     uint32_t highest_flush_id = 0;
     AutoLock lock(context_lock_);
     for (const auto& iter : validate_flushes) {
       const int32 validated_stream_id = iter.first;
@@ skipping 90 matching lines @@
 
   listeners_.clear();
 }
 
 bool GpuChannelHost::MessageFilter::IsLost() const {
   AutoLock lock(lock_);
   return lost_;
 }
 
 }  // namespace content