Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / client / webgraphicscontext3d_command_buffer_impl.h

diff --git a/src/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/src/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
index 9aebaf0..2fe59c5 100644 (file)
--- a/src/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
+++ b/src/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h
@@ -142,14 +142,11 @@ class WebGraphicsContext3DCommandBufferImpl
     return mem_limits_.mapped_memory_reclaim_limit;
   }
 
+  // WebGraphicsContext3DImpl methods
+  virtual bool InitializeOnCurrentThread() OVERRIDE;
+
   //----------------------------------------------------------------------
   // WebGraphicsContext3D methods
-
-  // Must be called after initialize() and before any of the following methods.
-  // Permanently binds to the first calling thread. Returns false if the
-  // graphics context fails to create. Do not call from more than one thread.
-  virtual bool makeContextCurrent();
-
   virtual bool isContextLost();
 
   virtual WGC3Denum getGraphicsResetStatusARB();
@@ -202,8 +199,6 @@ class WebGraphicsContext3DCommandBufferImpl
 
   gfx::GpuPreference gpu_preference_;
 
-  base::WeakPtrFactory<WebGraphicsContext3DCommandBufferImpl> weak_ptr_factory_;
-
   scoped_ptr<CommandBufferProxyImpl> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
   scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
@@ -212,6 +207,11 @@ class WebGraphicsContext3DCommandBufferImpl
   Error last_error_;
   SharedMemoryLimits mem_limits_;
   scoped_refptr<ShareGroup> share_group_;
+
+  // Member variables should appear before the WeakPtrFactory, to ensure
+  // that any WeakPtrs to Controller are invalidated before its members
+  // variable's destructors are executed, rendering them invalid.
+  base::WeakPtrFactory<WebGraphicsContext3DCommandBufferImpl> weak_ptr_factory_;
 };
 
 }  // namespace content