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

[oliver at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 02a6d9fd779da0589e36fa4e974d17abae6ab425
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 31 23:22:33 2009 +0000

    Build fix
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50383 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 43714c9..23f24fe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-10-31  Oliver Hunt  <oliver at apple.com>
 
+        Build fix
+
+        * platform/graphics/mac/GraphicsContext3DMac.cpp:
+        (WebCore::GraphicsContext3D::attachShader):
+
+2009-10-31  Oliver Hunt  <oliver at apple.com>
+
         Reviewed by Darin Adler.
 
         Remove obsolete null checks from CanvasRenderingContext3DMac
diff --git a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
index 477f8ac..11c6fb9 100644
--- a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
+++ b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
@@ -248,7 +248,7 @@ void GraphicsContext3D::activeTexture(unsigned long texture)
 
 void GraphicsContext3D::attachShader(CanvasProgram* program, CanvasShader* shader)
 {
-    ASSERT(program)
+    ASSERT(program);
     ASSERT(shader);
     ensureContext(m_contextObj);
     ::glAttachShader((GLuint) program->object(), (GLuint) shader->object());

-- 
WebKit Debian packaging