DrawingBuffer: Clean up GL state restoration

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 115 matching lines @@
                               GLboolean* colorMask,
                               DrawingBuffer*);
   ~ScopedRGBEmulationColorMask();
 
  private:
   gpu::gles2::GLES2Interface* m_contextGL;
   GLboolean m_colorMask[4];
   const bool m_requiresEmulation;
 };
 
-class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext {
+class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
+                                                 public DrawingBuffer::Client {
   WTF_MAKE_NONCOPYABLE(WebGLRenderingContextBase);
 
  public:
   ~WebGLRenderingContextBase() override;
 
   virtual String contextName() const = 0;
   virtual void registerContextExtensions() = 0;
 
   virtual void initializeNewContext();
 
@@ skipping 392 matching lines @@
   void forceLostContext(LostContextMode, AutoRecoveryMethod);
   void forceRestoreContext();
   void loseContextImpl(LostContextMode, AutoRecoveryMethod);
 
   // 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 restoreClearDepthf();
-  void restoreClearStencil();
-  void restoreStencilMaskSeparate();
   void restoreColorMask();
-  void restoreDepthMask();
 
   gpu::gles2::GLES2Interface* contextGL() const {
     DrawingBuffer* d = drawingBuffer();
     if (!d)
       return nullptr;
     return d->contextGL();
   }
   WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); }
   Extensions3DUtil* extensionsUtil();
 
@@ skipping 50 matching lines @@
   friend class WebGLDebugShaders;
   friend class WebGLCompressedTextureASTC;
   friend class WebGLCompressedTextureATC;
   friend class WebGLCompressedTextureETC;
   friend class WebGLCompressedTextureETC1;
   friend class WebGLCompressedTexturePVRTC;
   friend class WebGLCompressedTextureS3TC;
   friend class WebGLCompressedTextureS3TCsRGB;
   friend class WebGLRenderingContextErrorMessageCallback;
   friend class WebGLVertexArrayObjectBase;
+  friend class ScopedDrawingBufferBinder;
   friend class ScopedTexture2DRestorer;
   friend class ScopedFramebufferRestorer;
   // To allow V8WebGL[2]RenderingContext to call visitChildDOMWrappers.
   friend class V8WebGLRenderingContext;
 
   WebGLRenderingContextBase(HTMLCanvasElement*,
                             std::unique_ptr<WebGraphicsContext3DProvider>,
                             const CanvasContextCreationAttributes&,
                             unsigned);
   WebGLRenderingContextBase(OffscreenCanvas*,
                             std::unique_ptr<WebGraphicsContext3DProvider>,
                             const CanvasContextCreationAttributes&,
                             unsigned);
   PassRefPtr<DrawingBuffer> createDrawingBuffer(
       std::unique_ptr<WebGraphicsContext3DProvider>,
       DrawingBuffer::ChromiumImageUsage);
   void setupFlags();
 
   // CanvasRenderingContext implementation.
   bool is3d() const override { return true; }
   bool isAccelerated() const override { return true; }
   void setIsHidden(bool) override;
   bool paintRenderingResultsToCanvas(SourceDrawingBuffer) override;
   WebLayer* platformLayer() const override;
   void stop() override;
 
+  // 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();
@@ skipping 250 matching lines @@
   class ScopedDrawingBufferBinder {
     STACK_ALLOCATED();
 
    public:
     ScopedDrawingBufferBinder(DrawingBuffer* drawingBuffer,
                               WebGLFramebuffer* framebufferBinding)
         : m_drawingBuffer(drawingBuffer),
           m_readFramebufferBinding(framebufferBinding) {
       // Commit DrawingBuffer if needed (e.g., for multisampling)
       if (!m_readFramebufferBinding && m_drawingBuffer)
-        m_drawingBuffer->commit();
+        m_drawingBuffer->resolveAndBindForReadAndDraw();
     }
 
     ~ScopedDrawingBufferBinder() {
       // Restore DrawingBuffer if needed
       if (!m_readFramebufferBinding && m_drawingBuffer)
         m_drawingBuffer->restoreFramebufferBindings();
     }
 
    private:
     DrawingBuffer* m_drawingBuffer;
@@ skipping 39 matching lines @@
     // Skip clearing the backbuffer.
     Skipped,
     // Clear the backbuffer.
     JustClear,
     // Combine webgl.clear() API with the backbuffer clear, so webgl.clear()
     // doesn't have to call glClear() again.
     CombinedClear
   };
   HowToClear clearIfComposited(GLbitfield clearMask = 0);
 
-  // Helper to restore state that clearing the framebuffer may destroy.
-  void restoreStateAfterClear();
-
   // Convert texture internal format.
   GLenum convertTexInternalFormat(GLenum internalformat, GLenum type);
 
   enum TexImageFunctionType {
     TexImage,
     TexSubImage,
     CopyTexImage,
     CompressedTexImage
   };
   enum TexImageFunctionID {
@@ skipping 559 matching lines @@
                   context,
                   context->is3d(),
                   context.is3d());
 
 }  // namespace blink
 
 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(
     blink::WebGLRenderingContextBase::TextureUnitState);
 
 #endif  // WebGLRenderingContextBase_h