"/b/slave/chromium-rel-linux/build/src/gpu/command_buffer/client/gles2_demo_c...

gpu/command_buffer/service/common_decoder.cc

 // Copyright (c) 2009 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/precompile.h"
 #include "gpu/command_buffer/service/common_decoder.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 
 namespace gpu {
 
-void* CommonDecoder::Bucket::GetData(size_t offset, size_t size) const {
+const void* CommonDecoder::Bucket::GetData(size_t offset, size_t size) const {
   if (OffsetSizeValid(offset, size)) {
     return data_.get() + offset;
   }
   return NULL;
 }
 
 void CommonDecoder::Bucket::SetSize(size_t size) {
   if (size != size_) {
     data_.reset(size ? new int8[size] : NULL);
     size_ = size;
     memset(data_.get(), 0, size);
   }
 }
 
 bool CommonDecoder::Bucket::SetData(
     const void* src, size_t offset, size_t size) {
   if (OffsetSizeValid(offset, size)) {
     memcpy(data_.get() + offset, src, size);
     return true;
   }
   return false;
 }
 
 void CommonDecoder::Bucket::SetFromString(const std::string& str) {
-  // Strings are passed NULL terminated to distinguish between empty string
-  // and no string.
-  SetSize(str.size() + 1);
-  SetData(str.c_str(), 0, str.size() + 1);
+  SetSize(str.size());
+  SetData(str.c_str(), 0, str.size());
 }
 
 void* CommonDecoder::GetAddressAndCheckSize(unsigned int shm_id,
                                             unsigned int offset,
                                             unsigned int size) {
   Buffer buffer = engine_->GetSharedMemoryBuffer(shm_id);
   if (!buffer.ptr)
     return NULL;
   unsigned int end = offset + size;
   if (end > buffer.size || end < offset) {
@@ skipping 253 matching lines @@
   }
   const void* src = bucket->GetData(offset, size);
   if (!src) {
       return error::kInvalidArguments;
   }
   memcpy(data, src, size);
   return error::kNoError;
 }
 
 }  // namespace gpu