Remove WebGLObject maps from WebGLRenderingContextBase and WebGLContextGroup.

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 83 matching lines @@
 class WebGLDebugShaders;
 class WebGLDepthTexture;
 class WebGLDrawBuffers;
 class WebGLExtension;
 class WebGLFramebuffer;
 class WebGLObject;
 class WebGLProgram;
 class WebGLRenderbuffer;
 class WebGLShader;
 class WebGLShaderPrecisionFormat;
-class WebGLSharedObject;
 class WebGLUniformLocation;
 class WebGLVertexArrayObjectBase;
 
 class WebGLRenderingContextErrorMessageCallback;
 
 // This class uses the color mask to prevent drawing to the alpha channel, if
 // the DrawingBuffer requires RGB emulation.
 class ScopedRGBEmulationColorMask {
  public:
   ScopedRGBEmulationColorMask(gpu::gles2::GLES2Interface*,
@@ skipping 407 matching lines @@
     WhenAvailable,
 
     // Restore as soon as possible, but only when
     // the canvas is visible.
     Auto
   };
   void loseContext(LostContextMode) override;
   void forceLostContext(LostContextMode, AutoRecoveryMethod);
   void forceRestoreContext();
   void loseContextImpl(LostContextMode, AutoRecoveryMethod);
+  uint32_t numberOfContextLosses() const;
 
   // Utilities to restore GL state to match the rendering context's
   // saved state. Use these after contextGL()-based state changes that
   // bypass the rendering context.
   void restoreScissorEnabled();
   void restoreScissorBox();
   void restoreClearColor();
   void restoreColorMask();
 
   gpu::gles2::GLES2Interface* contextGL() const {
     DrawingBuffer* d = drawingBuffer();
     if (!d)
       return nullptr;
     return d->contextGL();
   }
   WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); }
   Extensions3DUtil* extensionsUtil();
 
   void reshape(int width, int height) override;
 
   void markLayerComposited() override;
   ImageData* paintRenderingResultsToImageData(SourceDrawingBuffer) override;
 
-  void removeSharedObject(WebGLSharedObject*);
-  void removeContextObject(WebGLContextObject*);
-
   unsigned maxVertexAttribs() const { return m_maxVertexAttribs; }
 
-  // Eagerly finalize WebGLRenderingContextBase in order for it
-  // to (first) be able to detach its WebGLContextObjects, before
-  // they're later swept and finalized.
-  EAGERLY_FINALIZE();
-  DECLARE_EAGER_FINALIZATION_OPERATOR_NEW();
   DECLARE_VIRTUAL_TRACE();
 
   DECLARE_VIRTUAL_TRACE_WRAPPERS();
 
   // Returns approximate gpu memory allocated per pixel.
   int externallyAllocatedBytesPerPixel() override;
 
   class TextureUnitState {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 
@@ skipping 65 matching lines @@
   // DrawingBuffer::Client implementation.
   bool DrawingBufferClientIsBoundForDraw() override;
   void DrawingBufferClientRestoreScissorTest() override;
   void DrawingBufferClientRestoreMaskAndClearValues() override;
   void DrawingBufferClientRestorePixelPackAlignment() override;
   void DrawingBufferClientRestoreTexture2DBinding() override;
   void DrawingBufferClientRestoreRenderbufferBinding() override;
   void DrawingBufferClientRestoreFramebufferBinding() override;
   void DrawingBufferClientRestorePixelUnpackBufferBinding() override;
 
-  void addSharedObject(WebGLSharedObject*);
-  void addContextObject(WebGLContextObject*);
-  void detachAndRemoveAllObjects();
-
   virtual void destroyContext();
   void markContextChanged(ContentChangeType);
 
   void onErrorMessage(const char*, int32_t id);
 
   void notifyCanvasContextChanged();
 
   // Query if depth_stencil buffer is supported.
   bool isDepthStencilSupported() { return m_isDepthStencilSupported; }
 
@@ skipping 23 matching lines @@
                                         int height,
                                         const char* functionName);
 
   PassRefPtr<Image> videoFrameToImage(HTMLVideoElement*);
 
   // Structure for rendering to a DrawingBuffer, instead of directly
   // to the back-buffer of m_context.
   RefPtr<DrawingBuffer> m_drawingBuffer;
   DrawingBuffer* drawingBuffer() const;
 
-  RefPtr<WebGLContextGroup> m_contextGroup;
+  TraceWrapperMember<WebGLContextGroup> m_contextGroup;
 
   bool m_isHidden;
   LostContextMode m_contextLostMode;
   AutoRecoveryMethod m_autoRecoveryMethod;
   // Dispatches a context lost event once it is determined that one is needed.
   // This is used for synthetic, WEBGL_lose_context and real context losses. For
   // real ones, it's likely that there's no JavaScript on the stack, but that
   // might be dependent on how exactly the platform discovers that the context
   // was lost. For better portability we always defer the dispatch of the event.
   Timer<WebGLRenderingContextBase> m_dispatchContextLostEventTimer;
   bool m_restoreAllowed;
   Timer<WebGLRenderingContextBase> m_restoreTimer;
 
   bool m_markedCanvasDirty;
-  HeapHashSet<WeakMember<WebGLContextObject>> m_contextObjects;
 
   // List of bound VBO's. Used to maintain info about sizes for ARRAY_BUFFER and
   // stored values for ELEMENT_ARRAY_BUFFER
   TraceWrapperMember<WebGLBuffer> m_boundArrayBuffer;
 
   Member<WebGLVertexArrayObjectBase> m_defaultVertexArrayObject;
   TraceWrapperMember<WebGLVertexArrayObjectBase> m_boundVertexArrayObject;
   void setBoundVertexArrayObject(WebGLVertexArrayObjectBase*);
 
   enum VertexAttribValueType {
@@ skipping 795 matching lines @@
                                        GLsizei height,
                                        const char* functionName);
 
   friend class WebGLStateRestorer;
   friend class WebGLRenderingContextEvictionManager;
 
   static void activateContext(WebGLRenderingContextBase*);
   static void deactivateContext(WebGLRenderingContextBase*);
   static void addToEvictedList(WebGLRenderingContextBase*);
   static void removeFromEvictedList(WebGLRenderingContextBase*);
-  static void willDestroyContext(WebGLRenderingContextBase*);
+  static void restoreEvictedContext(WebGLRenderingContextBase*);
   static void forciblyLoseOldestContext(const String& reason);
   // Return the least recently used context's position in the active context
   // vector.  If the vector is empty, return the maximum allowed active context
   // number.
   static WebGLRenderingContextBase* oldestContext();
   static WebGLRenderingContextBase* oldestEvictedContext();
 
   ImageBitmap* transferToImageBitmapBase(ScriptState*);
 
   // Helper functions for tex(Sub)Image2D && texSubImage3D
@@ skipping 129 matching lines @@
                   context,
                   context->is3d(),
                   context.is3d());
 
 }  // namespace blink
 
 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(
     blink::WebGLRenderingContextBase::TextureUnitState);
 
 #endif  // WebGLRenderingContextBase_h