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 d4a32f0..6ee3dcc 100644 (file)
--- a/WebCore/html/canvas/WebGLTexture.h
+++ b/WebCore/html/canvas/WebGLTexture.h
@@ -26,104 +26,96 @@
 #ifndef WebGLTexture_h
 #define WebGLTexture_h
 
-#include "CanvasObject.h"
+#include "WebGLObject.h"
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
-    
-    class WebGLTexture : public CanvasObject {
-    public:
-        virtual ~WebGLTexture() { deleteObject(); }
-        
-        static PassRefPtr<WebGLTexture> create(WebGLRenderingContext*);
 
-        bool isCubeMapRWrapModeInitialized() {
-            return cubeMapRWrapModeInitialized;
-        }
+class WebGLTexture : public WebGLObject {
+public:
+    virtual ~WebGLTexture() { deleteObject(); }
 
-        void setCubeMapRWrapModeInitialized(bool initialized) {
-            cubeMapRWrapModeInitialized = initialized;
-        }
+    static PassRefPtr<WebGLTexture> create(WebGLRenderingContext*);
 
-        void setTarget(unsigned long target, int maxLevel);
-        void setParameteri(unsigned long pname, int param);
-        void setParameterf(unsigned long pname, float param);
+    void setTarget(unsigned long target, int maxLevel);
+    void setParameteri(unsigned long pname, int param);
+    void setParameterf(unsigned long pname, float param);
 
-        void setLevelInfo(unsigned long target, int level, unsigned long internalFormat, int width, int height, unsigned long type);
+    int getMinFilter() const { return m_minFilter; }
 
-        bool canGenerateMipmaps();
-        // Generate all level information.
-        void generateMipmapLevelInfo();
+    void setLevelInfo(unsigned long target, int level, unsigned long internalFormat, int width, int height, unsigned long type);
 
-        unsigned long getInternalFormat() const;
+    bool canGenerateMipmaps();
+    // Generate all level information.
+    void generateMipmapLevelInfo();
 
-        // Whether width/height is NotPowerOfTwo.
-        static bool isNPOT(unsigned, unsigned);
+    unsigned long getInternalFormat(int level) const;
 
-        bool isNPOT() const;
-        // Determine if texture sampling should always return [0, 0, 0, 1] (OpenGL ES 2.0 Sec 3.8.2).
-        bool needToUseBlackTexture() const;
+    // Whether width/height is NotPowerOfTwo.
+    static bool isNPOT(unsigned, unsigned);
 
-        static int computeLevelCount(int width, int height);
+    bool isNPOT() const;
+    // Determine if texture sampling should always return [0, 0, 0, 1] (OpenGL ES 2.0 Sec 3.8.2).
+    bool needToUseBlackTexture() const;
 
-    protected:
-        WebGLTexture(WebGLRenderingContext*);
+    static int computeLevelCount(int width, int height);
 
-        virtual void _deleteObject(Platform3DObject);
+protected:
+    WebGLTexture(WebGLRenderingContext*);
 
-    private:
-        virtual bool isTexture() const { return true; }
+    virtual void deleteObjectImpl(Platform3DObject);
 
-        void update();
+private:
+    virtual bool isTexture() const { return true; }
 
-        int mapTargetToIndex(unsigned long);
+    void update();
 
-        bool cubeMapRWrapModeInitialized;
+    int mapTargetToIndex(unsigned long);
 
-        unsigned long m_target;
+    unsigned long m_target;
 
-        int m_minFilter;
-        int m_magFilter;
-        int m_wrapS;
-        int m_wrapT;
+    int m_minFilter;
+    int m_magFilter;
+    int m_wrapS;
+    int m_wrapT;
 
-        class LevelInfo {
-        public:
-            LevelInfo()
-                : valid(false)
-                , internalFormat(0)
-                , width(0)
-                , height(0)
-                , type(0)
-            {
-            }
+    class LevelInfo {
+    public:
+        LevelInfo()
+            : valid(false)
+            , internalFormat(0)
+            , width(0)
+            , height(0)
+            , type(0)
+        {
+        }
 
-            void setInfo(unsigned long internalFmt, int w, int h, unsigned long tp)
-            {
-                valid = true;
-                internalFormat = internalFmt;
-                width = w;
-                height = h;
-                type = tp;
-            }
+        void setInfo(unsigned long internalFmt, int w, int h, unsigned long tp)
+        {
+            valid = true;
+            internalFormat = internalFmt;
+            width = w;
+            height = h;
+            type = tp;
+        }
+
+        bool valid;
+        unsigned long internalFormat;
+        int width;
+        int height;
+        unsigned long type;
+    };
 
-            bool valid;
-            unsigned long internalFormat;
-            int width;
-            int height;
-            unsigned long type;
-        };
+    Vector<Vector<LevelInfo> > m_info;
 
-        Vector<Vector<LevelInfo> > m_info;
+    bool m_isNPOT;
+    bool m_isComplete;
+    bool m_needToUseBlackTexture;
+};
 
-        bool m_isNPOT;
-        bool m_isComplete;
-        bool m_needToUseBlackTexture;
-    };
-    
 } // namespace WebCore
 
 #endif // WebGLTexture_h