[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zmo at google.com
zmo at google.com
Wed Dec 22 15:48:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a572a74054b671c15dd2f5096dc9cda18491216b
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 21:34:59 2010 +0000
2010-11-12 Zhenyao Mo <zmo at google.com>
Reviewed by James Robinson.
WebGraphicsContext3DDefaultImpl does not run on top of OpenGL ES 2.0 implementations
https://bugs.webkit.org/show_bug.cgi?id=48282
Simple fix for a regression introduced in r71793.
* src/WebGraphicsContext3DDefaultImpl.cpp:
(WebKit::WebGraphicsContext3DDefaultImpl::initialize):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71942 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8a3f63d..3d4beec 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-12 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by James Robinson.
+
+ WebGraphicsContext3DDefaultImpl does not run on top of OpenGL ES 2.0 implementations
+ https://bugs.webkit.org/show_bug.cgi?id=48282
+
+ Simple fix for a regression introduced in r71793.
+
+ * src/WebGraphicsContext3DDefaultImpl.cpp:
+ (WebKit::WebGraphicsContext3DDefaultImpl::initialize):
+
2010-11-12 Ilya Sherman <isherman at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index c164104..3a7eff0 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -172,7 +172,7 @@ bool WebGraphicsContext3DDefaultImpl::initialize(WebGraphicsContext3D::Attribute
m_isGLES2 = gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
- if (m_isGLES2) {
+ if (!m_isGLES2) {
glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
glEnable(GL_POINT_SPRITE);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list