Update from https://crrev.com/311145

gpu/command_buffer/service/buffer_manager.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_BUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
 
 #include <map>
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
@@ skipping 199 matching lines @@
   void ValidateAndDoGetBufferParameteriv(
     ContextState* context_state, GLenum target, GLenum pname, GLint* params);
 
   // Sets the target of a buffer. Returns false if the target can not be set.
   bool SetTarget(Buffer* buffer, GLenum target);
 
   void set_allow_buffers_on_multiple_targets(bool allow) {
     allow_buffers_on_multiple_targets_ = allow;
   }
 
+  void set_allow_fixed_attribs(bool allow) {
+    allow_fixed_attribs_ = allow;
+  }
+
   size_t mem_represented() const {
     return memory_tracker_->GetMemRepresented();
   }
 
   // Tells for a given usage if this would be a client side array.
   bool IsUsageClientSideArray(GLenum usage);
 
   // Tells whether a buffer that is emulated using client-side arrays should be
   // set to a non-zero size.
   bool UseNonZeroSizeForClientSideArrayBuffer();
@@ skipping 33 matching lines @@
   scoped_ptr<MemoryTypeTracker> memory_tracker_;
   scoped_refptr<FeatureInfo> feature_info_;
 
   // Info for each buffer in the system.
   typedef base::hash_map<GLuint, scoped_refptr<Buffer> > BufferMap;
   BufferMap buffers_;
 
   // Whether or not buffers can be bound to multiple targets.
   bool allow_buffers_on_multiple_targets_;
 
+  // Whether or not allow using GL_FIXED type for vertex attribs.
+  bool allow_fixed_attribs_;
+
   // Counts the number of Buffer allocated with 'this' as its manager.
   // Allows to check no Buffer will outlive this.
   unsigned int buffer_count_;
 
   bool have_context_;
   bool use_client_side_arrays_for_stream_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_