[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tkent at chromium.org
tkent at chromium.org
Wed Dec 22 12:40:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 37e97a030a69db63fec8e98eb878c677ed412a16
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 27 02:13:59 2010 +0000
2010-08-26 Kent Tamura <tkent at chromium.org>
Unreviewed, build fix for Chromium-mac.
* platform/graphics/chromium/Shader.cpp:
(WebCore::loadShader):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66167 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e5b7db6..5d4386d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-26 Kent Tamura <tkent at chromium.org>
+
+ Unreviewed, build fix for Chromium-mac.
+
+ * platform/graphics/chromium/Shader.cpp:
+ (WebCore::loadShader):
+
2010-08-26 James Robinson <jamesr at chromium.org>
Fix chromium mac build. Unreviewed.
diff --git a/WebCore/platform/graphics/chromium/Shader.cpp b/WebCore/platform/graphics/chromium/Shader.cpp
index ab0bf0c..8b5f289 100644
--- a/WebCore/platform/graphics/chromium/Shader.cpp
+++ b/WebCore/platform/graphics/chromium/Shader.cpp
@@ -76,7 +76,7 @@ static unsigned loadShader(GraphicsContext3D* context, unsigned type, const char
context->getShaderiv(shader, GraphicsContext3D::COMPILE_STATUS, &compileStatus);
if (!compileStatus) {
String infoLog = context->getShaderInfoLog(shader);
- LOG_ERROR(infoLog.utf8().data());
+ LOG_ERROR("%s", infoLog.utf8().data());
context->deleteShader(shader);
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list