[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
kbr at google.com
kbr at google.com
Wed Dec 22 18:27:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e4d7cc42f67bdfb1ddb4b8e7bcfeef090c4852de
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 11 01:25:37 2010 +0000
2010-12-10 Kenneth Russell <kbr at google.com>
Reviewed by Darin Adler.
Clean up assertion in Extensions3DOpenGL.cpp
https://bugs.webkit.org/show_bug.cgi?id=50852
Built Release mode to test. No functionality change.
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::ensureEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73821 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 06309c6..59bc6ce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-10 Kenneth Russell <kbr at google.com>
+
+ Reviewed by Darin Adler.
+
+ Clean up assertion in Extensions3DOpenGL.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=50852
+
+ Built Release mode to test. No functionality change.
+
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::ensureEnabled):
+
2010-12-10 Cosmin Truta <ctruta at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp b/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
index 95fe90a..4215d12 100644
--- a/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
+++ b/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
@@ -30,7 +30,6 @@
#include "Extensions3DOpenGL.h"
#include "GraphicsContext3D.h"
-#include <wtf/UnusedParam.h>
#include <wtf/Vector.h>
#if PLATFORM(MAC)
@@ -88,10 +87,7 @@ bool Extensions3DOpenGL::supports(const String& name)
void Extensions3DOpenGL::ensureEnabled(const String& name)
{
-#ifdef NDEBUG
- UNUSED_PARAM(name);
-#endif
- ASSERT(supports(name));
+ ASSERT_UNUSED(name, supports(name));
}
int Extensions3DOpenGL::getGraphicsResetStatusARB()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list