Update from https://crrev.com/316786

cc/output/context_provider.h

 // Copyright (c) 2013 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 CC_OUTPUT_CONTEXT_PROVIDER_H_
 #define CC_OUTPUT_CONTEXT_PROVIDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
 #include "gpu/command_buffer/common/capabilities.h"
 
 class GrContext;
 
+namespace base {
+class Lock;
+}
+
 namespace gpu {
 class ContextSupport;
 namespace gles2 { class GLES2Interface; }
 }
 
 namespace cc {
 struct ManagedMemoryPolicy;
 
 class ContextProvider : public base::RefCountedThreadSafe<ContextProvider> {
  public:
   // Bind the 3d context to the current thread. This should be called before
   // accessing the contexts. Calling it more than once should have no effect.
   // Once this function has been called, the class should only be accessed
   // from the same thread.
   virtual bool BindToCurrentThread() = 0;
+  virtual void DetachFromThread() {}
 
   virtual gpu::gles2::GLES2Interface* ContextGL() = 0;
   virtual gpu::ContextSupport* ContextSupport() = 0;
   virtual class GrContext* GrContext() = 0;
 
   struct Capabilities {
     gpu::Capabilities gpu;
     size_t max_transfer_buffer_usage_bytes;
 
     CC_EXPORT Capabilities();
   };
 
+  // Sets up a lock so this context can be used from multiple threads.
+  virtual void SetupLock() = 0;
+
+  // Returns the lock that should be held if using this context from multiple
+  // threads.
+  virtual base::Lock* GetLock() = 0;
+
   // Returns the capabilities of the currently bound 3d context.
   virtual Capabilities ContextCapabilities() = 0;
 
   // Checks if the context is currently known to be lost.
   virtual bool IsContextLost() = 0;
 
   // Ask the provider to check if the contexts are valid or lost. If they are,
   // this should invalidate the provider so that it can be replaced with a new
   // one.
   virtual void VerifyContexts() = 0;
@@ skipping 21 matching lines @@
       const MemoryPolicyChangedCallback& memory_policy_changed_callback) = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<ContextProvider>;
   virtual ~ContextProvider() {}
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_CONTEXT_PROVIDER_H_