[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:57:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4f9613cf8a154da5d85dfe4f93ee3b4d63d42622
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 12 07:18:31 2010 +0000
2010-08-12 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65221.
http://trac.webkit.org/changeset/65221
https://bugs.webkit.org/show_bug.cgi?id=43896
Broke snow leopard build. (Requested by dave_levin on
#webkit).
* platform/graphics/GraphicsContext3D.cpp:
* platform/graphics/GraphicsContext3D.h:
(WebCore::GraphicsContext3D::):
2010-08-12 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65221.
http://trac.webkit.org/changeset/65221
https://bugs.webkit.org/show_bug.cgi?id=43896
Broke snow leopard build. (Requested by dave_levin on
#webkit).
* public/WebGraphicsContext3D.h:
* src/GraphicsContext3D.cpp:
* src/WebGraphicsContext3DDefaultImpl.cpp:
* src/WebGraphicsContext3DDefaultImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65222 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e61b147..0efb01b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-12 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65221.
+ http://trac.webkit.org/changeset/65221
+ https://bugs.webkit.org/show_bug.cgi?id=43896
+
+ Broke snow leopard build. (Requested by dave_levin on
+ #webkit).
+
+ * platform/graphics/GraphicsContext3D.cpp:
+ * platform/graphics/GraphicsContext3D.h:
+ (WebCore::GraphicsContext3D::):
+
2010-08-11 Stephen White <senorblanco at chromium.org>
Reviewed by David Levin.
diff --git a/WebCore/platform/graphics/GraphicsContext3D.cpp b/WebCore/platform/graphics/GraphicsContext3D.cpp
index fd92042..79f6ecf 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.cpp
+++ b/WebCore/platform/graphics/GraphicsContext3D.cpp
@@ -816,21 +816,6 @@ bool GraphicsContext3D::packPixels(const uint8_t* sourceData,
return true;
}
-#if !PLATFORM(CHROMIUM)
-GraphicsContext3D::supportsBGRA()
-{
- // For OpenGL ES2.0, this requires checking for
- // GL_EXT_texture_format_BGRA8888 and GL_EXT_read_format_bgra.
- // For desktop GL, BGRA has been supported since OpenGL 1.2.
-
- // However, note that the GL ES2 extension requires the internalFormat to
- // glTexImage2D() be GL_BGRA, while desktop GL will not accept GL_BGRA
- // (must be GL_RGBA), so this must be checked on each platform.
- // Returning false for now to be safe.
- return false;
-}
-#endif
-
} // namespace WebCore
#endif // ENABLE(3D_CANVAS)
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index dabd0ae..d702096 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -403,9 +403,7 @@ public:
// WebGL-specific enums
UNPACK_FLIP_Y_WEBGL = 0x9240,
- UNPACK_PREMULTIPLY_ALPHA_WEBGL = 0x9241,
-
- BGRA_EXT = 0x80E1
+ UNPACK_PREMULTIPLY_ALPHA_WEBGL = 0x9241
};
// Context creation attributes.
@@ -750,8 +748,6 @@ public:
// getError in the order they were added.
void synthesizeGLError(unsigned long error);
- bool supportsBGRA();
-
private:
GraphicsContext3D(Attributes attrs, HostWindow* hostWindow);
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3ebff67..eb24668 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-12 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65221.
+ http://trac.webkit.org/changeset/65221
+ https://bugs.webkit.org/show_bug.cgi?id=43896
+
+ Broke snow leopard build. (Requested by dave_levin on
+ #webkit).
+
+ * public/WebGraphicsContext3D.h:
+ * src/GraphicsContext3D.cpp:
+ * src/WebGraphicsContext3DDefaultImpl.cpp:
+ * src/WebGraphicsContext3DDefaultImpl.h:
+
2010-08-11 Stephen White <senorblanco at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/chromium/public/WebGraphicsContext3D.h b/WebKit/chromium/public/WebGraphicsContext3D.h
index 4c18076..4378afb 100644
--- a/WebKit/chromium/public/WebGraphicsContext3D.h
+++ b/WebKit/chromium/public/WebGraphicsContext3D.h
@@ -129,8 +129,6 @@ public:
// getError in the order they were added.
virtual void synthesizeGLError(unsigned long error) = 0;
- virtual bool supportsBGRA() = 0;
-
// The entry points below map directly to the OpenGL ES 2.0 API.
// See: http://www.khronos.org/registry/gles/
// and: http://www.khronos.org/opengles/sdk/docs/man/
diff --git a/WebKit/chromium/src/GraphicsContext3D.cpp b/WebKit/chromium/src/GraphicsContext3D.cpp
index d5d2adc..af0d842 100644
--- a/WebKit/chromium/src/GraphicsContext3D.cpp
+++ b/WebKit/chromium/src/GraphicsContext3D.cpp
@@ -297,7 +297,6 @@ public:
void deleteTexture(unsigned);
void synthesizeGLError(unsigned long error);
- bool supportsBGRA();
private:
OwnPtr<WebKit::WebGraphicsContext3D> m_impl;
@@ -908,7 +907,6 @@ DELEGATE_TO_IMPL_1(deleteShader, unsigned)
DELEGATE_TO_IMPL_1(deleteTexture, unsigned)
DELEGATE_TO_IMPL_1(synthesizeGLError, unsigned long)
-DELEGATE_TO_IMPL_R(supportsBGRA, bool)
//----------------------------------------------------------------------
// GraphicsContext3D
@@ -1243,7 +1241,6 @@ DELEGATE_TO_INTERNAL_1(deleteShader, unsigned)
DELEGATE_TO_INTERNAL_1(deleteTexture, unsigned)
DELEGATE_TO_INTERNAL_1(synthesizeGLError, unsigned long)
-DELEGATE_TO_INTERNAL_R(supportsBGRA, bool)
bool GraphicsContext3D::isGLES2Compliant() const
{
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index 6cab5ec..3d86346 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -445,14 +445,6 @@ void WebGraphicsContext3DDefaultImpl::synthesizeGLError(unsigned long error)
m_syntheticErrors.add(error);
}
-bool WebGraphicsContext3DDefaultImpl::supportsBGRA()
-{
- // Supported since OpenGL 1.2. However, glTexImage2D() must be modified
- // to translate the internalFormat from GL_BGRA to GL_RGBA, since the
- // former is not accepted by desktop GL. Return false until this is done.
- return false;
-}
-
// Helper macros to reduce the amount of code.
#define DELEGATE_TO_GL(name, glname) \
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
index cf5f5b4..d32fe7b 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
@@ -77,7 +77,6 @@ public:
virtual void prepareTexture();
virtual void synthesizeGLError(unsigned long error);
- virtual bool supportsBGRA();
virtual void activeTexture(unsigned long texture);
virtual void attachShader(WebGLId program, WebGLId shader);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list