Chromium Code Reviews| Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
| index a477c75a46dc1cb42f20534e4f2fbb786f326b60..38510b7a85a56450e8d162009956e30569aee2f7 100644 |
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h |
| @@ -35,7 +35,6 @@ |
| #include "core/dom/TypedFlexibleArrayBufferView.h" |
| #include "core/html/canvas/CanvasRenderingContext.h" |
| #include "core/layout/LayoutBoxModelObject.h" |
| -#include "core/page/Page.h" |
| #include "modules/webgl/WebGLContextAttributes.h" |
| #include "modules/webgl/WebGLExtensionName.h" |
| #include "modules/webgl/WebGLTexture.h" |
| @@ -142,8 +141,7 @@ private: |
| Member<WebGLFramebuffer> m_readFramebufferBinding; |
| }; |
| -class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, public Page::MultisamplingChangedObserver { |
|
danakj
2016/04/04 22:30:28
The WebGLRCBase used to subclass Page::Multisampli
|
| - USING_GARBAGE_COLLECTED_MIXIN(WebGLRenderingContextBase); |
| +class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext { |
| public: |
| ~WebGLRenderingContextBase() override; |
| @@ -610,9 +608,6 @@ protected: |
| bool m_synthesizedErrorsToConsole; |
| int m_numGLErrorsToConsoleAllowed; |
| - bool m_multisamplingAllowed; |
| - bool m_multisamplingObserverRegistered; |
| - |
| unsigned long m_onePlusMaxNonDefaultTextureUnit; |
| OwnPtr<Extensions3DUtil> m_extensionsUtil; |
| @@ -1061,8 +1056,6 @@ protected: |
| virtual void restoreCurrentFramebuffer(); |
| void restoreCurrentTexture2D(); |
| - void multisamplingChanged(bool) override; |
| - |
| void findNewMaxNonDefaultTextureUnit(); |
| virtual void renderbufferStorageImpl(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, const char* functionName); |