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

gpu/command_buffer/service/common_decoder.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/service/common_decoder.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 
 namespace gpu {
 
 CommonDecoder::Bucket::Bucket() : size_(0) {}
@@ skipping 45 matching lines @@
   return true;
 }
 
 CommonDecoder::CommonDecoder() : engine_(NULL) {}
 
 CommonDecoder::~CommonDecoder() {}
 
 void* CommonDecoder::GetAddressAndCheckSize(unsigned int shm_id,
                                             unsigned int offset,
                                             unsigned int size) {
+  CHECK(engine_);
   Buffer buffer = engine_->GetSharedMemoryBuffer(shm_id);
   if (!buffer.ptr)
     return NULL;
   unsigned int end = offset + size;
   if (end > buffer.size || end < offset) {
     return NULL;
   }
   return static_cast<int8*>(buffer.ptr) + offset;
 }
 
@@ skipping 217 matching lines @@
   }
   const void* src = bucket->GetData(offset, size);
   if (!src) {
       return error::kInvalidArguments;
   }
   memcpy(data, src, size);
   return error::kNoError;
 }
 
 }  // namespace gpu