Merge Webkit at r70949: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / html / canvas / WebGLTexture.h

diff --git a/WebCore/html/canvas/WebGLTexture.h b/WebCore/html/canvas/WebGLTexture.h
index 191957d..6ee3dcc 100644 (file)
--- a/WebCore/html/canvas/WebGLTexture.h
+++ b/WebCore/html/canvas/WebGLTexture.h
@@ -44,6 +44,8 @@ public:
     void setParameteri(unsigned long pname, int param);
     void setParameterf(unsigned long pname, float param);
 
+    int getMinFilter() const { return m_minFilter; }
+
     void setLevelInfo(unsigned long target, int level, unsigned long internalFormat, int width, int height, unsigned long type);
 
     bool canGenerateMipmaps();