[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
zmo at google.com
zmo at google.com
Fri Jan 21 15:07:48 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 0bd99e3ed10c2a79a6f9d0dd9d715739d241be05
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 7 17:32:02 2011 +0000
2011-01-07 Zhenyao Mo <zmo at google.com>
Unreviewed, Mac 32-bit build fix.
Use float instead of double in GL function arguments to avoid implicit type down casting.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::blendColor):
(WebCore::WebGLRenderingContext::clearColor):
(WebCore::WebGLRenderingContext::clearDepth):
(WebCore::WebGLRenderingContext::depthRange):
(WebCore::WebGLRenderingContext::lineWidth):
(WebCore::WebGLRenderingContext::polygonOffset):
(WebCore::WebGLRenderingContext::sampleCoverage):
* html/canvas/WebGLRenderingContext.h:
* html/canvas/WebGLRenderingContext.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75249 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd9fc7b..6cbcee8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-07 Zhenyao Mo <zmo at google.com>
+
+ Unreviewed, Mac 32-bit build fix.
+ Use float instead of double in GL function arguments to avoid implicit type down casting.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::blendColor):
+ (WebCore::WebGLRenderingContext::clearColor):
+ (WebCore::WebGLRenderingContext::clearDepth):
+ (WebCore::WebGLRenderingContext::depthRange):
+ (WebCore::WebGLRenderingContext::lineWidth):
+ (WebCore::WebGLRenderingContext::polygonOffset):
+ (WebCore::WebGLRenderingContext::sampleCoverage):
+ * html/canvas/WebGLRenderingContext.h:
+ * html/canvas/WebGLRenderingContext.idl:
+
2011-01-07 Carlos Garcia Campos <cgarcia at igalia.com> and Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 783d205..94f326d 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -438,7 +438,7 @@ void WebGLRenderingContext::bindTexture(unsigned long target, WebGLTexture* text
cleanupAfterGraphicsCall(false);
}
-void WebGLRenderingContext::blendColor(double red, double green, double blue, double alpha)
+void WebGLRenderingContext::blendColor(float red, float green, float blue, float alpha)
{
if (isContextLost())
return;
@@ -618,7 +618,7 @@ void WebGLRenderingContext::clear(unsigned long mask)
cleanupAfterGraphicsCall(true);
}
-void WebGLRenderingContext::clearColor(double r, double g, double b, double a)
+void WebGLRenderingContext::clearColor(float r, float g, float b, float a)
{
if (isContextLost())
return;
@@ -634,7 +634,7 @@ void WebGLRenderingContext::clearColor(double r, double g, double b, double a)
cleanupAfterGraphicsCall(false);
}
-void WebGLRenderingContext::clearDepth(double depth)
+void WebGLRenderingContext::clearDepth(float depth)
{
if (isContextLost())
return;
@@ -890,7 +890,7 @@ void WebGLRenderingContext::depthMask(bool flag)
cleanupAfterGraphicsCall(false);
}
-void WebGLRenderingContext::depthRange(double zNear, double zFar)
+void WebGLRenderingContext::depthRange(float zNear, float zFar)
{
if (isContextLost())
return;
@@ -2264,7 +2264,7 @@ bool WebGLRenderingContext::isTexture(WebGLTexture* texture)
return m_context->isTexture(texture->object());
}
-void WebGLRenderingContext::lineWidth(double width)
+void WebGLRenderingContext::lineWidth(float width)
{
if (isContextLost())
return;
@@ -2334,7 +2334,7 @@ void WebGLRenderingContext::pixelStorei(unsigned long pname, long param)
}
}
-void WebGLRenderingContext::polygonOffset(double factor, double units)
+void WebGLRenderingContext::polygonOffset(float factor, float units)
{
if (isContextLost())
return;
@@ -2467,7 +2467,7 @@ void WebGLRenderingContext::renderbufferStorage(unsigned long target, unsigned l
}
}
-void WebGLRenderingContext::sampleCoverage(double value, bool invert)
+void WebGLRenderingContext::sampleCoverage(float value, bool invert)
{
if (isContextLost())
return;
diff --git a/WebCore/html/canvas/WebGLRenderingContext.h b/WebCore/html/canvas/WebGLRenderingContext.h
index 554f346..d0c55e7 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.h
+++ b/WebCore/html/canvas/WebGLRenderingContext.h
@@ -74,7 +74,7 @@ public:
void bindFramebuffer(unsigned long target, WebGLFramebuffer*, ExceptionCode& ec);
void bindRenderbuffer(unsigned long target, WebGLRenderbuffer*, ExceptionCode& ec);
void bindTexture(unsigned long target, WebGLTexture*, ExceptionCode& ec);
- void blendColor(double red, double green, double blue, double alpha);
+ void blendColor(float red, float green, float blue, float alpha);
void blendEquation(unsigned long mode);
void blendEquationSeparate(unsigned long modeRGB, unsigned long modeAlpha);
void blendFunc(unsigned long sfactor, unsigned long dfactor);
@@ -88,8 +88,8 @@ public:
unsigned long checkFramebufferStatus(unsigned long target);
void clear(unsigned long mask);
- void clearColor(double red, double green, double blue, double alpha);
- void clearDepth(double);
+ void clearColor(float red, float green, float blue, float alpha);
+ void clearDepth(float);
void clearStencil(long);
void colorMask(bool red, bool green, bool blue, bool alpha);
void compileShader(WebGLShader*, ExceptionCode& ec);
@@ -118,7 +118,7 @@ public:
void depthFunc(unsigned long);
void depthMask(bool);
- void depthRange(double zNear, double zFar);
+ void depthRange(float zNear, float zFar);
void detachShader(WebGLProgram*, WebGLShader*, ExceptionCode&);
void disable(unsigned long cap);
void disableVertexAttribArray(unsigned long index, ExceptionCode&);
@@ -189,14 +189,14 @@ public:
bool isRenderbuffer(WebGLRenderbuffer*);
bool isShader(WebGLShader*);
bool isTexture(WebGLTexture*);
- void lineWidth(double);
+ void lineWidth(float);
void linkProgram(WebGLProgram*, ExceptionCode&);
void pixelStorei(unsigned long pname, long param);
- void polygonOffset(double factor, double units);
+ void polygonOffset(float factor, float units);
void readPixels(long x, long y, long width, long height, unsigned long format, unsigned long type, ArrayBufferView* pixels, ExceptionCode&);
void releaseShaderCompiler();
void renderbufferStorage(unsigned long target, unsigned long internalformat, long width, long height);
- void sampleCoverage(double value, bool invert);
+ void sampleCoverage(float value, bool invert);
void scissor(long x, long y, long width, long height);
void shaderSource(WebGLShader*, const String&, ExceptionCode&);
void stencilFunc(unsigned long func, long ref, unsigned long mask);
diff --git a/WebCore/html/canvas/WebGLRenderingContext.idl b/WebCore/html/canvas/WebGLRenderingContext.idl
index 97f9980..40b9bb0 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.idl
+++ b/WebCore/html/canvas/WebGLRenderingContext.idl
@@ -461,7 +461,7 @@ module html {
[StrictTypeChecking] void bindFramebuffer(in unsigned long target, in WebGLFramebuffer framebuffer) raises(DOMException);
[StrictTypeChecking] void bindRenderbuffer(in unsigned long target, in WebGLRenderbuffer renderbuffer) raises(DOMException);
[StrictTypeChecking] void bindTexture(in unsigned long target, in WebGLTexture texture) raises(DOMException);
- [StrictTypeChecking] void blendColor(in double red, in double green, in double blue, in double alpha);
+ [StrictTypeChecking] void blendColor(in float red, in float green, in float blue, in float alpha);
[StrictTypeChecking] void blendEquation( in unsigned long mode );
[StrictTypeChecking] void blendEquationSeparate(in unsigned long modeRGB, in unsigned long modeAlpha);
[StrictTypeChecking] void blendFunc(in unsigned long sfactor, in unsigned long dfactor);
@@ -474,8 +474,8 @@ module html {
[StrictTypeChecking] unsigned long checkFramebufferStatus(in unsigned long target);
[StrictTypeChecking] void clear(in unsigned long mask);
- [StrictTypeChecking] void clearColor(in double red, in double green, in double blue, in double alpha);
- [StrictTypeChecking] void clearDepth(in double depth);
+ [StrictTypeChecking] void clearColor(in float red, in float green, in float blue, in float alpha);
+ [StrictTypeChecking] void clearDepth(in float depth);
[StrictTypeChecking] void clearStencil(in long s);
[StrictTypeChecking] void colorMask(in boolean red, in boolean green, in boolean blue, in boolean alpha);
[StrictTypeChecking] void compileShader(in WebGLShader shader) raises(DOMException);
@@ -505,7 +505,7 @@ module html {
[StrictTypeChecking] void depthFunc(in unsigned long func);
[StrictTypeChecking] void depthMask(in boolean flag);
// FIXME: this differs from the current WebGL spec (depthRangef)
- [StrictTypeChecking] void depthRange(in double zNear, in double zFar);
+ [StrictTypeChecking] void depthRange(in float zNear, in float zFar);
[StrictTypeChecking] void detachShader(in WebGLProgram program, in WebGLShader shader) raises(DOMException);
[StrictTypeChecking] void disable(in unsigned long cap);
[StrictTypeChecking] void disableVertexAttribArray(in unsigned long index) raises(DOMException);
@@ -582,16 +582,16 @@ module html {
[StrictTypeChecking] boolean isRenderbuffer(in WebGLRenderbuffer renderbuffer);
[StrictTypeChecking] boolean isShader(in WebGLShader shader);
[StrictTypeChecking] boolean isTexture(in WebGLTexture texture);
- [StrictTypeChecking] void lineWidth(in double width);
+ [StrictTypeChecking] void lineWidth(in float width);
[StrictTypeChecking] void linkProgram(in WebGLProgram program) raises(DOMException);
[StrictTypeChecking] void pixelStorei(in unsigned long pname, in long param);
- [StrictTypeChecking] void polygonOffset(in double factor, in double units);
+ [StrictTypeChecking] void polygonOffset(in float factor, in float units);
[StrictTypeChecking] void readPixels(in long x, in long y, in long width, in long height, in unsigned long format, in unsigned long type, in ArrayBufferView pixels) raises(DOMException);
[StrictTypeChecking] void releaseShaderCompiler();
[StrictTypeChecking] void renderbufferStorage(in unsigned long target, in unsigned long internalformat, in long width, in long height);
- [StrictTypeChecking] void sampleCoverage(in double value, in boolean invert);
+ [StrictTypeChecking] void sampleCoverage(in float value, in boolean invert);
[StrictTypeChecking] void scissor(in long x, in long y, in long width, in long height);
[StrictTypeChecking] void shaderSource(in WebGLShader shader, in DOMString string) raises(DOMException);
[StrictTypeChecking] void stencilFunc(in unsigned long func, in long ref, in unsigned long mask);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list