[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
oliver at apple.com
oliver at apple.com
Thu Dec 3 13:24:06 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit c02dfb7bee24fdc87ae72c09d2e27fdf33740cdf
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
More information about the Pkg-webkit-commits
mailing list