2010-04-23 Zhenyao Mo <zmo@google.com>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Apr 2010 05:17:18 +0000 (05:17 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Apr 2010 05:17:18 +0000 (05:17 +0000)
        Reviewed by Darin Fisher.

        Add isGLES2Compliant to GraphicsContext3D: make the method const.
        https://bugs.webkit.org/show_bug.cgi?id=37872

        * platform/graphics/GraphicsContext3D.h: Make isGLES2Compliant() const.
        * platform/graphics/mac/GraphicsContext3DMac.cpp: Ditto.
        (WebCore::GraphicsContext3D::isGLES2Compliant):
2010-04-23  Zhenyao Mo  <zmo@google.com>

        Reviewed by Darin Fisher.

        Add isGLES2Compliant to GraphicsContext3D: make the method const.
        https://bugs.webkit.org/show_bug.cgi?id=37872

        * src/GraphicsContext3D.cpp: Make isGLES2Compliant() const.
        (WebCore::GraphicsContext3DInternal::isGLES2Compliant):
        (WebCore::GraphicsContext3D::isGLES2Compliant):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/GraphicsContext3D.h
WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
WebKit/chromium/ChangeLog
WebKit/chromium/src/GraphicsContext3D.cpp

index 74f0a37..9e24036 100644 (file)
@@ -1,3 +1,14 @@
+2010-04-23  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Darin Fisher.
+
+        Add isGLES2Compliant to GraphicsContext3D: make the method const.
+        https://bugs.webkit.org/show_bug.cgi?id=37872
+
+        * platform/graphics/GraphicsContext3D.h: Make isGLES2Compliant() const.
+        * platform/graphics/mac/GraphicsContext3DMac.cpp: Ditto.
+        (WebCore::GraphicsContext3D::isGLES2Compliant):
+
 2010-04-23  Qi Zhang  <qi.2.zhang@nokia.com>
 
         Reviewed by Laszlo Gombos.
 2010-04-23  Qi Zhang  <qi.2.zhang@nokia.com>
 
         Reviewed by Laszlo Gombos.
index 6c9eb99..56cae84 100644 (file)
@@ -479,6 +479,8 @@ namespace WebCore {
                               bool flipVertically,
                               AlphaOp alphaOp);
 
                               bool flipVertically,
                               AlphaOp alphaOp);
 
+        bool isGLES2Compliant() const;
+
         //----------------------------------------------------------------------
         // Entry points for WebGL.
         //
         //----------------------------------------------------------------------
         // Entry points for WebGL.
         //
@@ -685,8 +687,6 @@ namespace WebCore {
         // getError in the order they were added.
         void synthesizeGLError(unsigned long error);
 
         // getError in the order they were added.
         void synthesizeGLError(unsigned long error);
 
-        bool isGLES2Compliant();
-
     private:        
         GraphicsContext3D(Attributes attrs, HostWindow* hostWindow);
 
     private:        
         GraphicsContext3D(Attributes attrs, HostWindow* hostWindow);
 
index d6716cd..68f177d 100644 (file)
@@ -235,7 +235,7 @@ void GraphicsContext3D::endPaint()
 {
 }
 
 {
 }
 
-bool GraphicsContext3D::isGLES2Compliant()
+bool GraphicsContext3D::isGLES2Compliant() const
 {
     return false;
 }
 {
     return false;
 }
index 44aa872..a30a161 100644 (file)
@@ -1,3 +1,14 @@
+2010-04-23  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Darin Fisher.
+
+        Add isGLES2Compliant to GraphicsContext3D: make the method const.
+        https://bugs.webkit.org/show_bug.cgi?id=37872
+
+        * src/GraphicsContext3D.cpp: Make isGLES2Compliant() const.
+        (WebCore::GraphicsContext3DInternal::isGLES2Compliant):
+        (WebCore::GraphicsContext3D::isGLES2Compliant):
+
 2010-04-23  Rafael Weinstein  <rafaelw@grafaelw.sfo.corp.google.com>
 
         Reviewed by Darin Fisher.
 2010-04-23  Rafael Weinstein  <rafaelw@grafaelw.sfo.corp.google.com>
 
         Reviewed by Darin Fisher.
index ecd6621..dd7e5e6 100644 (file)
@@ -111,7 +111,7 @@ public:
     void beginPaint(WebGLRenderingContext* context);
     void endPaint();
 
     void beginPaint(WebGLRenderingContext* context);
     void endPaint();
 
-    bool isGLES2Compliant();
+    bool isGLES2Compliant() const;
 
     //----------------------------------------------------------------------
     // Entry points for WebGL.
 
     //----------------------------------------------------------------------
     // Entry points for WebGL.
@@ -619,7 +619,10 @@ rt GraphicsContext3DInternal::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7
 DELEGATE_TO_IMPL_R(makeContextCurrent, bool)
 DELEGATE_TO_IMPL_1R(sizeInBytes, int, int)
 
 DELEGATE_TO_IMPL_R(makeContextCurrent, bool)
 DELEGATE_TO_IMPL_1R(sizeInBytes, int, int)
 
-DELEGATE_TO_IMPL_R(isGLES2Compliant, bool)
+bool GraphicsContext3DInternal::isGLES2Compliant() const
+{
+    return m_impl->isGLES2Compliant();
+}
 
 DELEGATE_TO_IMPL_1(activeTexture, unsigned long)
 DELEGATE_TO_IMPL_2_X12(attachShader, WebGLProgram*, WebGLShader*)
 
 DELEGATE_TO_IMPL_1(activeTexture, unsigned long)
 DELEGATE_TO_IMPL_2_X12(attachShader, WebGLProgram*, WebGLShader*)
@@ -1294,7 +1297,11 @@ DELEGATE_TO_INTERNAL_1(deleteShader, unsigned)
 DELEGATE_TO_INTERNAL_1(deleteTexture, unsigned)
 
 DELEGATE_TO_INTERNAL_1(synthesizeGLError, unsigned long)
 DELEGATE_TO_INTERNAL_1(deleteTexture, unsigned)
 
 DELEGATE_TO_INTERNAL_1(synthesizeGLError, unsigned long)
-DELEGATE_TO_INTERNAL_R(isGLES2Compliant, bool)
+
+bool GraphicsContext3D::isGLES2Compliant() const
+{
+    return m_internal->isGLES2Compliant();
+}
 
 } // namespace WebCore
 
 
 } // namespace WebCore