Re-land: Mark async texture uploads as completed from the upload thread.

gpu/command_buffer/service/common_decoder.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_COMMON_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_COMMON_DECODER_H_
 
 #include <map>
 #include <stack>
 #include <string>
@@ skipping 84 matching lines @@
   };
 
   CommonDecoder();
   virtual ~CommonDecoder();
 
   // Sets the engine, to get shared memory buffers from, and to set the token
   // to.
   void set_engine(CommandBufferEngine* engine) {
     engine_ = engine;
   }
+  CommandBufferEngine* engine() const { return engine_; }
 
   // Creates a bucket. If the bucket already exists returns that bucket.
   Bucket* CreateBucket(uint32 bucket_id);
 
   // Gets a bucket. Returns NULL if the bucket does not exist.
   Bucket* GetBucket(uint32 bucket_id) const;
 
   // Gets the address of shared memory data, given a shared memory ID and an
   // offset. Also checks that the size is consistent with the shared memory
   // size.
@@ skipping 63 matching lines @@
 
     uint32 offset;
   };
   std::stack<CommandAddress> call_stack_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_COMMON_DECODER_H_