[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jamesr at google.com
jamesr at google.com
Wed Dec 22 12:40:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit af721869ee6561bded0af5892928f0c0b3608572
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 27 02:18:09 2010 +0000
2010-08-26 James Robinson <jamesr at chromium.org>
Another chromium mac build fix. What a dumb version of GCC.
* platform/graphics/chromium/GLES2Texture.cpp:
(WebCore::GLES2Texture::create):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66168 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5d4386d..76cb08b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-26 James Robinson <jamesr at chromium.org>
+
+ Another chromium mac build fix. What a dumb version of GCC.
+
+ * platform/graphics/chromium/GLES2Texture.cpp:
+ (WebCore::GLES2Texture::create):
+
2010-08-26 Kent Tamura <tkent at chromium.org>
Unreviewed, build fix for Chromium-mac.
diff --git a/WebCore/platform/graphics/chromium/GLES2Texture.cpp b/WebCore/platform/graphics/chromium/GLES2Texture.cpp
index c02e940..6106522 100644
--- a/WebCore/platform/graphics/chromium/GLES2Texture.cpp
+++ b/WebCore/platform/graphics/chromium/GLES2Texture.cpp
@@ -99,7 +99,8 @@ PassRefPtr<GLES2Texture> GLES2Texture::create(GraphicsContext3D* context, Format
IntRect tileBoundsWithBorder = tiling.tileBoundsWithBorder(i);
- unsigned int glFormat, glType;
+ unsigned int glFormat = 0;
+ unsigned int glType = 0;
bool swizzle;
convertFormat(context, format, &glFormat, &glType, &swizzle);
context->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list