webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 15 insertions, 15 deletions

diff --git a/Source/WebCore/html/canvas/WebGLTexture.h b/Source/WebCore/html/canvas/WebGLTexture.h
index dcc3d0b45..b266953a5 100644
--- a/Source/WebCore/html/canvas/WebGLTexture.h
+++ b/Source/WebCore/html/canvas/WebGLTexture.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,17 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef WebGLTexture_h
-#define WebGLTexture_h
+#pragma once
 
 #include "WebGLSharedObject.h"
-
-#include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
-class WebGLTexture : public WebGLSharedObject {
+class WebGLTexture final : public WebGLSharedObject {
 public:
 
     enum TextureExtensionFlag {
@@ -44,7 +41,7 @@ public:
 
     virtual ~WebGLTexture();
 
-    static PassRefPtr<WebGLTexture> create(WebGLRenderingContext*);
+    static Ref<WebGLTexture> create(WebGLRenderingContextBase&);
 
     void setTarget(GC3Denum target, GC3Dint maxLevel);
     void setParameteri(GC3Denum pname, GC3Dint param);
@@ -65,6 +62,7 @@ public:
     GC3Dsizei getWidth(GC3Denum target, GC3Dint level) const;
     GC3Dsizei getHeight(GC3Denum target, GC3Dint level) const;
     bool isValid(GC3Denum target, GC3Dint level) const;
+    void markInvalid(GC3Denum target, GC3Dint level);
 
     // Whether width/height is NotPowerOfTwo.
     static bool isNPOT(GC3Dsizei, GC3Dsizei);
@@ -80,12 +78,14 @@ public:
 
     static GC3Dint computeLevelCount(GC3Dsizei width, GC3Dsizei height);
 
-protected:
-    WebGLTexture(WebGLRenderingContext*);
-
-    virtual void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
+    bool immutable() const { return m_immutable; }
+    void setImmutable() { m_immutable = true; }
 
 private:
+    WebGLTexture(WebGLRenderingContextBase&);
+
+    void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
+
     class LevelInfo {
     public:
         LevelInfo()
@@ -113,7 +113,7 @@ private:
         GC3Denum type;
     };
 
-    virtual bool isTexture() const override { return true; }
+    bool isTexture() const override { return true; }
 
     void update();
 
@@ -136,8 +136,8 @@ private:
     bool m_isCompressed;
     bool m_isFloatType;
     bool m_isHalfFloatType;
+    bool m_isForWebGL1;
+    bool m_immutable { false };
 };
 
 } // namespace WebCore
-
-#endif // WebGLTexture_h