Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / canvas / WebGLRenderingContext.h

diff --git a/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h b/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h
index 90eb488..a147fd4 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h
+++ b/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContext.h
@@ -31,9 +31,9 @@
 
 namespace WebCore {
 
-class WebGLRenderingContext FINAL : public ScriptWrappable, public WebGLRenderingContextBase {
+class WebGLRenderingContext FINAL : public WebGLRenderingContextBase, public ScriptWrappable {
 public:
-    static PassOwnPtr<WebGLRenderingContext> create(HTMLCanvasElement*, WebGLContextAttributes*);
+    static PassOwnPtrWillBeRawPtr<WebGLRenderingContext> create(HTMLCanvasElement*, WebGLContextAttributes*);
     virtual ~WebGLRenderingContext();
 
     virtual unsigned version() const OVERRIDE { return 1; }
@@ -46,6 +46,7 @@ private:
     // Enabled extension objects.
     RefPtr<ANGLEInstancedArrays> m_angleInstancedArrays;
     RefPtr<EXTFragDepth> m_extFragDepth;
+    RefPtr<EXTShaderTextureLOD> m_extShaderTextureLOD;
     RefPtr<EXTTextureFilterAnisotropic> m_extTextureFilterAnisotropic;
     RefPtr<OESTextureFloat> m_oesTextureFloat;
     RefPtr<OESTextureFloatLinear> m_oesTextureFloatLinear;
@@ -59,6 +60,7 @@ private:
     RefPtr<WebGLDebugShaders> m_webglDebugShaders;
     RefPtr<WebGLDrawBuffers> m_webglDrawBuffers;
     RefPtr<WebGLCompressedTextureATC> m_webglCompressedTextureATC;
+    RefPtr<WebGLCompressedTextureETC1> m_webglCompressedTextureETC1;
     RefPtr<WebGLCompressedTexturePVRTC> m_webglCompressedTexturePVRTC;
     RefPtr<WebGLCompressedTextureS3TC> m_webglCompressedTextureS3TC;
     RefPtr<WebGLDepthTexture> m_webglDepthTexture;