[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5d567c25df2e09ac98f77a9a35b46961d237aeff
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 21:16:01 2010 +0000

    2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen at tieto.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Compilation failed because functions glSampleCoverage, glBlendEquation
            and glActiveTexture were not available.
            https://bugs.webkit.org/show_bug.cgi?id=35423
    
            * platform/graphics/qt/GraphicsContext3DQt.cpp:
            (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal):
            (WebCore::GraphicsContext3D::activeTexture):
            (WebCore::GraphicsContext3D::blendEquation):
            (WebCore::GraphicsContext3D::sampleCoverage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55304 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7d91c2b..34fd8d0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,4 +1,18 @@
 2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen at tieto.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Compilation failed because functions glSampleCoverage, glBlendEquation
+        and glActiveTexture were not available.
+        https://bugs.webkit.org/show_bug.cgi?id=35423
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal):
+        (WebCore::GraphicsContext3D::activeTexture):
+        (WebCore::GraphicsContext3D::blendEquation):
+        (WebCore::GraphicsContext3D::sampleCoverage):
+
+2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen at tieto.com>
  
          Reviewed by Kenneth Rohde Christiansen.
 
diff --git a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
index 5a57958..9810fbb 100644
--- a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
@@ -59,6 +59,7 @@ typedef void (APIENTRY* glBindBufferType) (GLenum, GLuint);
 typedef void (APIENTRY* glBindFramebufferType) (GLenum, GLuint);
 typedef void (APIENTRY* glBindRenderbufferType) (GLenum, GLuint);
 typedef void (APIENTRY* glBlendColorType) (GLclampf, GLclampf, GLclampf, GLclampf);
+typedef void (APIENTRY* glBlendEquationType) (GLenum);
 typedef void (APIENTRY* glBlendEquationSeparateType)(GLenum, GLenum);
 typedef void (APIENTRY* glBlendFuncSeparateType)(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
 typedef void (APIENTRY* glBufferDataType) (GLenum, GLsizeiptr, const GLvoid*, GLenum);
@@ -105,6 +106,7 @@ typedef GLboolean (APIENTRY* glIsRenderbufferType) (GLuint);
 typedef GLboolean (APIENTRY* glIsShaderType) (GLuint);
 typedef void (APIENTRY* glLinkProgramType) (GLuint);
 typedef void (APIENTRY* glRenderbufferStorageType) (GLenum, GLenum, GLsizei, GLsizei);
+typedef void (APIENTRY* glSampleCoverageType) (GLclampf, GLboolean);
 typedef void (APIENTRY* glShaderSourceType) (GLuint, GLsizei, const char**, const GLint*);
 typedef void (APIENTRY* glStencilFuncSeparateType) (GLenum, GLenum, GLint, GLuint);
 typedef void (APIENTRY* glStencilMaskSeparateType) (GLenum, GLuint);
@@ -154,6 +156,7 @@ public:
     glBindFramebufferType bindFramebuffer;
     glBindRenderbufferType bindRenderbuffer;
     glBlendColorType blendColor;
+    glBlendEquationType blendEquation;
     glBlendEquationSeparateType blendEquationSeparate;
     glBlendFuncSeparateType blendFuncSeparate;
     glBufferDataType bufferData;
@@ -200,6 +203,7 @@ public:
     glIsShaderType isShader;
     glLinkProgramType linkProgram;
     glRenderbufferStorageType renderbufferStorage;
+    glSampleCoverageType sampleCoverage;
     glShaderSourceType shaderSource;
     glStencilFuncSeparateType stencilFuncSeparate;
     glStencilMaskSeparateType stencilMaskSeparate;
@@ -293,6 +297,7 @@ GraphicsContext3DInternal::GraphicsContext3DInternal(GraphicsContext3D::Attribut
     bindFramebuffer = GET_PROC_ADDRESS(glBindFramebuffer);
     bindRenderbuffer = GET_PROC_ADDRESS(glBindRenderbuffer);
     blendColor = GET_PROC_ADDRESS(glBlendColor);
+    blendEquation = GET_PROC_ADDRESS(glBlendEquation);
     blendEquationSeparate = GET_PROC_ADDRESS(glBlendEquationSeparate);
     blendFuncSeparate = GET_PROC_ADDRESS(glBlendFuncSeparate);
     bufferData = GET_PROC_ADDRESS(glBufferData);
@@ -339,6 +344,7 @@ GraphicsContext3DInternal::GraphicsContext3DInternal(GraphicsContext3D::Attribut
     isShader = GET_PROC_ADDRESS(glIsShader);
     linkProgram = GET_PROC_ADDRESS(glLinkProgram);
     renderbufferStorage = GET_PROC_ADDRESS(glRenderbufferStorage);
+    sampleCoverage = GET_PROC_ADDRESS(glSampleCoverage);
     shaderSource = GET_PROC_ADDRESS(glShaderSource);
     stencilFuncSeparate = GET_PROC_ADDRESS(glStencilFuncSeparate);
     stencilMaskSeparate = GET_PROC_ADDRESS(glStencilMaskSeparate);
@@ -531,7 +537,7 @@ void GraphicsContext3D::reshape(int width, int height)
 void GraphicsContext3D::activeTexture(unsigned long texture)
 {
     m_internal->m_glWidget->makeCurrent();
-    glActiveTexture(texture);
+    m_internal->activeTexture(texture);
 }
 
 void GraphicsContext3D::attachShader(WebGLProgram* program, WebGLShader* shader)
@@ -583,7 +589,7 @@ void GraphicsContext3D::blendColor(double red, double green, double blue, double
 void GraphicsContext3D::blendEquation(unsigned long mode)
 {
     m_internal->m_glWidget->makeCurrent();
-    glBlendEquation(mode);
+    m_internal->blendEquation(mode);
 }
 
 void GraphicsContext3D::blendEquationSeparate(unsigned long modeRGB, unsigned long modeAlpha)
@@ -1004,7 +1010,7 @@ void GraphicsContext3D::renderbufferStorage(unsigned long target, unsigned long
 void GraphicsContext3D::sampleCoverage(double value, bool invert)
 {
     m_internal->m_glWidget->makeCurrent();
-    glSampleCoverage(static_cast<float>(value), invert);
+    m_internal->sampleCoverage(static_cast<float>(value), invert);
 }
 
 void GraphicsContext3D::scissor(long x, long y, unsigned long width, unsigned long height)

-- 
WebKit Debian packaging