Update shadowed data in MapBufferRange path.

gpu/command_buffer/service/buffer_manager.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/buffer_manager.h"
 
 #include <stdint.h>
 
 #include <limits>
 
@@ skipping 88 matching lines @@
   ++buffer_count_;
 }
 
 void BufferManager::StopTracking(Buffer* buffer) {
   memory_type_tracker_->TrackMemFree(buffer->size());
   --buffer_count_;
 }
 
 Buffer::MappedRange::MappedRange(
     GLintptr offset, GLsizeiptr size, GLenum access, void* pointer,
-    scoped_refptr<gpu::Buffer> shm)
+    scoped_refptr<gpu::Buffer> shm, unsigned int shm_offset)
     : offset(offset),
       size(size),
       access(access),
       pointer(pointer),
-      shm(shm) {
+      shm(shm),
+      shm_offset(shm_offset) {
   DCHECK(pointer);
   DCHECK(shm.get() && GetShmPointer());
 }
 
 Buffer::MappedRange::~MappedRange() {
 }
 
 void* Buffer::MappedRange::GetShmPointer() const {
   DCHECK(shm.get());
-  return shm->GetDataAddress(static_cast<unsigned int>(offset),
-                             static_cast<unsigned int>(size));
+  return shm->GetDataAddress(shm_offset, static_cast<unsigned int>(size));
 }
 
 Buffer::Buffer(BufferManager* manager, GLuint service_id)
     : manager_(manager),
       size_(0),
       deleted_(false),
       is_client_side_array_(false),
       service_id_(service_id),
       initial_target_(0),
       usage_(GL_STATIC_DRAW) {
@@ skipping 426 matching lines @@
 void BufferManager::DoCopyBufferSubData(
     Buffer* readbuffer,
     GLenum readtarget,
     GLintptr readoffset,
     Buffer* writebuffer,
     GLenum writetarget,
     GLintptr writeoffset,
     GLsizeiptr size) {
   DCHECK(readbuffer);
   DCHECK(writebuffer);
-  const bool use_shadow = UseShadowBuffer(writetarget, writebuffer->usage());
-  if (use_shadow) {
+  if (writebuffer->shadowed()) {
     const void* data = readbuffer->GetRange(readoffset, size);
     DCHECK(data);
-    writebuffer->SetRange(writeoffset, size, data);
+    bool success = writebuffer->SetRange(writeoffset, size, data);
+    DCHECK(success);
   }
 
   glCopyBufferSubData(readtarget, writetarget, readoffset, writeoffset, size);
 }
 
 void BufferManager::ValidateAndDoGetBufferParameteri64v(
     ContextState* context_state, GLenum target, GLenum pname, GLint64* params) {
   Buffer* buffer = GetBufferInfoForTarget(context_state, target);
   if (!buffer) {
     ERRORSTATE_SET_GL_ERROR(
@@ skipping 165 matching lines @@
     auto guid = gl::GetGLBufferGUIDForTracing(share_group_tracing_guid,
                                               client_buffer_id);
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid);
   }
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu