Update from https://crrev.com/311145

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 <limits>
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gpu {
 namespace gles2 {
 
 BufferManager::BufferManager(
     MemoryTracker* memory_tracker,
     FeatureInfo* feature_info)
     : memory_tracker_(
           new MemoryTypeTracker(memory_tracker, MemoryTracker::kManaged)),
       feature_info_(feature_info),
       allow_buffers_on_multiple_targets_(false),
+      allow_fixed_attribs_(false),
       buffer_count_(0),
       have_context_(true),
       use_client_side_arrays_for_stream_buffers_(
           feature_info ? feature_info->workarounds(
               ).use_client_side_arrays_for_stream_buffers : 0) {
 }
 
 BufferManager::~BufferManager() {
   DCHECK(buffers_.empty());
   CHECK_EQ(buffer_count_, 0u);
@@ skipping 208 matching lines @@
 bool BufferManager::UseNonZeroSizeForClientSideArrayBuffer() {
   return feature_info_.get() &&
          feature_info_->workarounds()
              .use_non_zero_size_for_client_side_stream_buffers;
 }
 
 void BufferManager::SetInfo(
     Buffer* buffer, GLsizeiptr size, GLenum usage, const GLvoid* data) {
   DCHECK(buffer);
   memory_tracker_->TrackMemFree(buffer->size());
-  bool is_client_side_array = IsUsageClientSideArray(usage);
-  bool shadow = buffer->target() == GL_ELEMENT_ARRAY_BUFFER ||
-                allow_buffers_on_multiple_targets_ ||
-                is_client_side_array;
+  const bool is_client_side_array = IsUsageClientSideArray(usage);
+  const bool support_fixed_attribs =
+    gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
+  const bool shadow = buffer->target() == GL_ELEMENT_ARRAY_BUFFER ||
+                      allow_buffers_on_multiple_targets_ ||
+                      (allow_fixed_attribs_ && !support_fixed_attribs) ||
+                      is_client_side_array;
   buffer->SetInfo(size, usage, shadow, data, is_client_side_array);
   memory_tracker_->TrackMemAlloc(buffer->size());
 }
 
 void BufferManager::ValidateAndDoBufferData(
     ContextState* context_state, GLenum target, GLsizeiptr size,
     const GLvoid * data, GLenum usage) {
   ErrorState* error_state = context_state->GetErrorState();
   if (!feature_info_->validators()->buffer_target.IsValid(target)) {
     ERRORSTATE_SET_GL_ERROR_INVALID_ENUM(
@@ skipping 130 matching lines @@
     return state->bound_array_buffer.get();
   } else {
     return state->vertex_attrib_manager->element_array_buffer();
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu