| Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
 | 
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
 | 
| index 7b9630ffc7434ba620b2a75c73242b387b906464..3cafe969356105481f8508c8093348122f28aae7 100644
 | 
| --- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
 | 
| +++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
 | 
| @@ -23,7 +23,7 @@ class WebGLUniformLocation;
 | 
|  class WebGLVertexArrayObject;
 | 
|  
 | 
|  class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
 | 
| -    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WebGL2RenderingContextBase);
 | 
| +    USING_GARBAGE_COLLECTED_MIXIN(WebGL2RenderingContextBase);
 | 
|  public:
 | 
|      ~WebGL2RenderingContextBase() override;
 | 
|  
 | 
| @@ -60,7 +60,7 @@ public:
 | 
|      void texImage2D(GLenum target, GLint level, GLint internalformat,
 | 
|          GLenum format, GLenum type, HTMLVideoElement*, ExceptionState&);
 | 
|      void texImage2D(GLenum target, GLint level, GLint internalformat,
 | 
| -        GLenum format, GLenum type, PassRefPtrWillBeRawPtr<ImageBitmap>, ExceptionState&);
 | 
| +        GLenum format, GLenum type, RawPtr<ImageBitmap>, ExceptionState&);
 | 
|      void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
 | 
|          GLsizei width, GLsizei height,
 | 
|          GLenum format, GLenum type, DOMArrayBufferView*);
 | 
| @@ -73,7 +73,7 @@ public:
 | 
|      void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
 | 
|          GLenum format, GLenum type, HTMLVideoElement*, ExceptionState&);
 | 
|      void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
 | 
| -        GLenum format, GLenum type, PassRefPtrWillBeRawPtr<ImageBitmap>, ExceptionState&);
 | 
| +        GLenum format, GLenum type, RawPtr<ImageBitmap>, ExceptionState&);
 | 
|  
 | 
|      void texStorage2D(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
 | 
|      void texStorage3D(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
 | 
| @@ -85,7 +85,7 @@ public:
 | 
|      void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, HTMLImageElement*, ExceptionState&);
 | 
|      void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, HTMLCanvasElement*, ExceptionState&);
 | 
|      void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, HTMLVideoElement*, ExceptionState&);
 | 
| -    void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, PassRefPtrWillBeRawPtr<ImageBitmap>, ExceptionState&);
 | 
| +    void texSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, RawPtr<ImageBitmap>, ExceptionState&);
 | 
|      void copyTexSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
 | 
|      void compressedTexImage3D(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, DOMArrayBufferView*);
 | 
|      void compressedTexSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, DOMArrayBufferView*);
 | 
| @@ -282,27 +282,27 @@ protected:
 | 
|      void setTransformFeedbackActive(bool);
 | 
|      void setTransformFeedbackPaused(bool);
 | 
|  
 | 
| -    PersistentWillBeMember<WebGLFramebuffer> m_readFramebufferBinding;
 | 
| -    PersistentWillBeMember<WebGLTransformFeedback> m_transformFeedbackBinding;
 | 
| +    Member<WebGLFramebuffer> m_readFramebufferBinding;
 | 
| +    Member<WebGLTransformFeedback> m_transformFeedbackBinding;
 | 
|  
 | 
|      std::set<GLenum> m_supportedInternalFormatsStorage;
 | 
|      std::set<GLenum> m_compressedTextureFormatsETC2EAC;
 | 
|  
 | 
| -    PersistentWillBeMember<WebGLBuffer> m_boundCopyReadBuffer;
 | 
| -    PersistentWillBeMember<WebGLBuffer> m_boundCopyWriteBuffer;
 | 
| -    PersistentWillBeMember<WebGLBuffer> m_boundPixelPackBuffer;
 | 
| -    PersistentWillBeMember<WebGLBuffer> m_boundPixelUnpackBuffer;
 | 
| -    PersistentWillBeMember<WebGLBuffer> m_boundTransformFeedbackBuffer;
 | 
| -    PersistentWillBeMember<WebGLBuffer> m_boundUniformBuffer;
 | 
| +    Member<WebGLBuffer> m_boundCopyReadBuffer;
 | 
| +    Member<WebGLBuffer> m_boundCopyWriteBuffer;
 | 
| +    Member<WebGLBuffer> m_boundPixelPackBuffer;
 | 
| +    Member<WebGLBuffer> m_boundPixelUnpackBuffer;
 | 
| +    Member<WebGLBuffer> m_boundTransformFeedbackBuffer;
 | 
| +    Member<WebGLBuffer> m_boundUniformBuffer;
 | 
|  
 | 
| -    PersistentHeapVectorWillBeHeapVector<Member<WebGLBuffer>> m_boundIndexedTransformFeedbackBuffers;
 | 
| -    PersistentHeapVectorWillBeHeapVector<Member<WebGLBuffer>> m_boundIndexedUniformBuffers;
 | 
| +    HeapVector<Member<WebGLBuffer>> m_boundIndexedTransformFeedbackBuffers;
 | 
| +    HeapVector<Member<WebGLBuffer>> m_boundIndexedUniformBuffers;
 | 
|      GLint m_maxTransformFeedbackSeparateAttribs;
 | 
|      size_t m_maxBoundUniformBufferIndex;
 | 
|  
 | 
| -    PersistentWillBeMember<WebGLQuery> m_currentBooleanOcclusionQuery;
 | 
| -    PersistentWillBeMember<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
 | 
| -    PersistentHeapVectorWillBeHeapVector<Member<WebGLSampler>> m_samplerUnits;
 | 
| +    Member<WebGLQuery> m_currentBooleanOcclusionQuery;
 | 
| +    Member<WebGLQuery> m_currentTransformFeedbackPrimitivesWrittenQuery;
 | 
| +    HeapVector<Member<WebGLSampler>> m_samplerUnits;
 | 
|  
 | 
|      GLint m_packRowLength;
 | 
|      GLint m_packSkipPixels;
 | 
| 
 |