Tell Graphics3D not to lock on Flush().

ppapi/shared_impl/ppb_graphics_3d_shared.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 PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_
 #define PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_completion_callback.h"
@@ skipping 81 matching lines @@
   void DestroyGLES2Impl();
 
  private:
   // On the plugin side, we need to know that we already have the lock, so that
   // we don't try to acquire it again. The default implementation does nothing;
   // the Plugin side of the proxy must implement these.
   friend class ScopedNoLocking;
   virtual void PushAlreadyLocked();
   virtual void PopAlreadyLocked();
 
+  // The VideoDecoder needs to be able to call Graphics3D Flush() after taking
+  // the proxy lock. Hence it needs access to ScopedNoLocking.
+  friend class PPB_VideoDecoder_Shared;
+
   scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
   scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
   scoped_ptr<gpu::gles2::GLES2Implementation> gles2_impl_;
 
   // Callback that needs to be executed when swap-buffers is completed.
   scoped_refptr<TrackedCallback> swap_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Shared);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_