Revert of Added support for Time Elapsed queries through the command buffer.

gpu/command_buffer/client/query_tracker.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/command_buffer/client/query_tracker.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 156 matching lines @@
 }
 
 bool QueryTracker::Query::CheckResultsAvailable(
     CommandBufferHelper* helper) {
   if (Pending()) {
     if (base::subtle::Acquire_Load(&info_.sync->process_count) ==
             submit_count_ ||
         helper->IsContextLost()) {
       switch (target()) {
         case GL_COMMANDS_ISSUED_CHROMIUM:
-          result_ = info_.sync->result;
+          result_ = base::saturated_cast<uint32>(info_.sync->result);
           break;
         case GL_LATENCY_QUERY_CHROMIUM:
           // Disabled DCHECK because of http://crbug.com/419236.
           //DCHECK(info_.sync->result >= client_begin_time_us_);
-          result_ = info_.sync->result - client_begin_time_us_;
+          result_ = base::saturated_cast<uint32>(
+              info_.sync->result - client_begin_time_us_);
           break;
         case GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM:
         case GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM:
         default:
-          result_ = info_.sync->result;
+          result_ = static_cast<uint32>(info_.sync->result);
           break;
       }
       state_ = kComplete;
     } else {
       if ((helper->flush_generation() - flush_count_ - 1) >= 0x80000000) {
         helper->Flush();
       } else {
         // Insert no-ops so that eventually the GPU process will see more work.
         helper->Noop(1);
       }
     }
   }
   return state_ == kComplete;
 }
 
-uint64 QueryTracker::Query::GetResult() const {
+uint32 QueryTracker::Query::GetResult() const {
   DCHECK(state_ == kComplete || state_ == kUninitialized);
   return result_;
 }
 
 QueryTracker::QueryTracker(MappedMemoryManager* manager)
     : query_sync_manager_(manager) {
 }
 
 QueryTracker::~QueryTracker() {
   while (!queries_.empty()) {
@@ skipping 105 matching lines @@
     return false;
   }
 
   target_it->second->End(gl);
   current_queries_.erase(target_it);
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu