[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 4b299d273bf9eee1a88c28235f3dd2d4635311ba
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 27 02:25:50 2010 +0000

    2010-02-26  Noam Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Compile error with 3d-canvas
            Replaced a direct gl call with a getProcAddress call
            https://bugs.webkit.org/show_bug.cgi?id=35448
    
            No new tests.
    
            * platform/graphics/qt/GraphicsContext3DQt.cpp:
            (WebCore::GraphicsContext3D::blendColor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 75092ea..9e31679 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-26  Noam Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Compile error with 3d-canvas
+        Replaced a direct gl call with a getProcAddress call
+        https://bugs.webkit.org/show_bug.cgi?id=35448
+
+        No new tests.
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::blendColor):
+
 2010-02-26  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
index 9810fbb..242c29c 100644
--- a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
@@ -583,7 +583,7 @@ void GraphicsContext3D::bindTexture(unsigned long target, WebGLTexture* texture)
 void GraphicsContext3D::blendColor(double red, double green, double blue, double alpha)
 {
     m_internal->m_glWidget->makeCurrent();
-    glBlendColor(static_cast<float>(red), static_cast<float>(green), static_cast<float>(blue), static_cast<float>(alpha));
+    m_internal->blendColor(static_cast<float>(red), static_cast<float>(green), static_cast<float>(blue), static_cast<float>(alpha));
 }
 
 void GraphicsContext3D::blendEquation(unsigned long mode)

-- 
WebKit Debian packaging