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 64bd6e0..6ee3dcc 100644 (file)
--- a/WebCore/html/canvas/WebGLTexture.h
+++ b/WebCore/html/canvas/WebGLTexture.h
@@ -40,27 +40,19 @@ public:
 
     static PassRefPtr<WebGLTexture> create(WebGLRenderingContext*);
 
-    bool isCubeMapRWrapModeInitialized()
-    {
-        return cubeMapRWrapModeInitialized;
-    }
-
-    void setCubeMapRWrapModeInitialized(bool initialized)
-    {
-        cubeMapRWrapModeInitialized = initialized;
-    }
-
     void setTarget(unsigned long target, int maxLevel);
     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();
     // Generate all level information.
     void generateMipmapLevelInfo();
 
-    unsigned long getInternalFormat() const;
+    unsigned long getInternalFormat(int level) const;
 
     // Whether width/height is NotPowerOfTwo.
     static bool isNPOT(unsigned, unsigned);
@@ -83,8 +75,6 @@ private:
 
     int mapTargetToIndex(unsigned long);
 
-    bool cubeMapRWrapModeInitialized;
-
     unsigned long m_target;
 
     int m_minFilter;