Re-land "WebGL: Transfer ownership of WebGraphicsContext3D to DrawingBuffer"

Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp

Index: Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
diff --git a/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp b/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
index 9492147ba38bcf0d64c13b82b5ab0943792baf09..6c12bccb7048db6bf46c1ecee414aec519394be5 100644
--- a/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
+++ b/Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp
@@ -49,7 +49,7 @@ WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES(WebGLRenderingContextBase*
     case VaoTypeDefault:
         break;
     default:
-        setObject(context()->webGraphicsContext3D()->createVertexArrayOES());
+        setObject(context()->webContext()->createVertexArrayOES());
         break;
     }
 }
@@ -65,7 +65,7 @@ void WebGLVertexArrayObjectOES::deleteObjectImpl(blink::WebGraphicsContext3D* co
     case VaoTypeDefault:
         break;
     default:
-        context()->webGraphicsContext3D()->deleteVertexArrayOES(object);
+        context()->webContext()->deleteVertexArrayOES(object);
         break;
     }
 
@@ -84,7 +84,7 @@ void WebGLVertexArrayObjectOES::setElementArrayBuffer(PassRefPtr<WebGLBuffer> bu
     if (buffer)
         buffer->onAttached();
     if (m_boundElementArrayBuffer)
-        m_boundElementArrayBuffer->onDetached(context()->webGraphicsContext3D());
+        m_boundElementArrayBuffer->onDetached(context()->webContext());
     m_boundElementArrayBuffer = buffer;
 
 }
@@ -99,7 +99,7 @@ void WebGLVertexArrayObjectOES::setVertexAttribState(
     if (buffer)
         buffer->onAttached();
     if (state.bufferBinding)
-        state.bufferBinding->onDetached(context()->webGraphicsContext3D());
+        state.bufferBinding->onDetached(context()->webContext());
 
     state.bufferBinding = buffer;
     state.bytesPerElement = bytesPerElement;
@@ -114,14 +114,14 @@ void WebGLVertexArrayObjectOES::setVertexAttribState(
 void WebGLVertexArrayObjectOES::unbindBuffer(PassRefPtr<WebGLBuffer> buffer)
 {
     if (m_boundElementArrayBuffer == buffer) {
-        m_boundElementArrayBuffer->onDetached(context()->webGraphicsContext3D());
+        m_boundElementArrayBuffer->onDetached(context()->webContext());
         m_boundElementArrayBuffer = nullptr;
     }
 
     for (size_t i = 0; i < m_vertexAttribState.size(); ++i) {
         VertexAttribState& state = m_vertexAttribState[i];
         if (state.bufferBinding == buffer) {
-            buffer->onDetached(context()->webGraphicsContext3D());
+            buffer->onDetached(context()->webContext());
             state.bufferBinding = nullptr;
         }
     }