State management cleanup

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
index 9c976e9cd5d6ef6bf64d3e53cde1613394f8050b..6136338f73b4b1e576af34980622afcff4322089 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
@@ -3535,7 +3535,6 @@ void WebGL2RenderingContextBase::deleteFramebuffer(
     m_readFramebufferBinding = nullptr;
   }
   if (target) {
-    drawingBuffer()->setFramebufferBinding(target, 0);
     // Have to call drawingBuffer()->bind() here to bind back to internal fbo.
     drawingBuffer()->bind(target);
   }
@@ -4481,4 +4480,13 @@ WebGL2RenderingContextBase::getUnpackPixelStoreParams(
   return params;
 }
 
+void WebGL2RenderingContextBase::GetDrawingBufferRestoreState(
+    DrawingBufferRestoreState* restoreState) {
+  WebGLRenderingContextBase::GetDrawingBufferRestoreState(restoreState);
+  restoreState->readFramebufferBinding =
+      objectOrZero(m_readFramebufferBinding.get());
+  restoreState->pixelUnpackBufferBinding =
+      objectOrZero(m_boundPixelUnpackBuffer.get());
+}
+
 }  // namespace blink