[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
zmo at google.com
zmo at google.com
Sun Feb 20 23:49:16 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 906abb4a310e882c384f35390b605d323a6e8d8d
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 25 17:34:34 2011 +0000
2011-01-24 Chris Marrin <cmarrin at apple.com>
Reviewed by Eric Seidel.
Change ENABLE_3D_CANVAS to ENABLE_WEBGL
https://bugs.webkit.org/show_bug.cgi?id=53041
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.cpp:
* GNUmakefile.am:
* WebCore.pro:
* bindings/generic/RuntimeEnabledFeatures.h:
* bindings/js/JSArrayBufferCustom.cpp:
* bindings/js/JSCanvasRenderingContextCustom.cpp:
(WebCore::toJS):
* bindings/js/JSDOMWindowCustom.cpp:
* bindings/js/JSDataViewCustom.cpp:
* bindings/js/JSDocumentCustom.cpp:
* bindings/js/JSFloat32ArrayCustom.cpp:
* bindings/js/JSHTMLCanvasElementCustom.cpp:
(WebCore::JSHTMLCanvasElement::getContext):
* bindings/js/JSInt16ArrayCustom.cpp:
* bindings/js/JSInt32ArrayCustom.cpp:
* bindings/js/JSInt8ArrayCustom.cpp:
* bindings/js/JSUint16ArrayCustom.cpp:
* bindings/js/JSUint32ArrayCustom.cpp:
* bindings/js/JSUint8ArrayCustom.cpp:
* bindings/js/JSWebGLRenderingContextCustom.cpp:
* bindings/js/JSXMLHttpRequestCustom.cpp:
(WebCore::JSXMLHttpRequest::markChildren):
(WebCore::JSXMLHttpRequest::send):
(WebCore::JSXMLHttpRequest::response):
* bindings/v8/custom/V8ArrayBufferCustom.cpp:
* bindings/v8/custom/V8ArrayBufferViewCustom.h:
* bindings/v8/custom/V8DataViewCustom.cpp:
* bindings/v8/custom/V8DocumentCustom.cpp:
(WebCore::V8Document::getCSSCanvasContextCallback):
* bindings/v8/custom/V8Float32ArrayCustom.cpp:
* bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
(WebCore::V8HTMLCanvasElement::getContextCallback):
* bindings/v8/custom/V8Int16ArrayCustom.cpp:
* bindings/v8/custom/V8Int32ArrayCustom.cpp:
* bindings/v8/custom/V8Int8ArrayCustom.cpp:
* bindings/v8/custom/V8Uint16ArrayCustom.cpp:
* bindings/v8/custom/V8Uint32ArrayCustom.cpp:
* bindings/v8/custom/V8Uint8ArrayCustom.cpp:
* bindings/v8/custom/V8WebGLRenderingContextCustom.cpp:
* bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
(WebCore::V8XMLHttpRequest::responseAccessorGetter):
(WebCore::V8XMLHttpRequest::sendCallback):
* features.pri:
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
(WebCore::HTMLCanvasElement::reset):
* html/HTMLCanvasElement.h:
* html/canvas/ArrayBuffer.cpp:
* html/canvas/ArrayBuffer.idl:
* html/canvas/ArrayBufferView.cpp:
* html/canvas/ArrayBufferView.idl:
* html/canvas/DataView.cpp:
* html/canvas/DataView.idl:
* html/canvas/Float32Array.cpp:
* html/canvas/Float32Array.idl:
* html/canvas/Int16Array.cpp:
* html/canvas/Int16Array.idl:
* html/canvas/Int32Array.cpp:
* html/canvas/Int32Array.idl:
* html/canvas/Int8Array.cpp:
* html/canvas/Int8Array.idl:
* html/canvas/OESStandardDerivatives.cpp:
* html/canvas/OESStandardDerivatives.idl:
* html/canvas/OESTextureFloat.cpp:
* html/canvas/OESTextureFloat.idl:
* html/canvas/Uint16Array.cpp:
* html/canvas/Uint16Array.idl:
* html/canvas/Uint32Array.cpp:
* html/canvas/Uint32Array.idl:
* html/canvas/Uint8Array.cpp:
* html/canvas/Uint8Array.idl:
* html/canvas/WebGLActiveInfo.idl:
* html/canvas/WebGLBuffer.cpp:
* html/canvas/WebGLBuffer.idl:
* html/canvas/WebGLContextAttributes.cpp:
* html/canvas/WebGLContextAttributes.idl:
* html/canvas/WebGLContextEvent.idl:
* html/canvas/WebGLExtension.cpp:
* html/canvas/WebGLFramebuffer.cpp:
* html/canvas/WebGLFramebuffer.idl:
* html/canvas/WebGLGetInfo.cpp:
* html/canvas/WebGLObject.cpp:
* html/canvas/WebGLProgram.cpp:
* html/canvas/WebGLProgram.idl:
* html/canvas/WebGLRenderbuffer.cpp:
* html/canvas/WebGLRenderbuffer.idl:
* html/canvas/WebGLRenderingContext.cpp:
* html/canvas/WebGLRenderingContext.idl:
* html/canvas/WebGLShader.cpp:
* html/canvas/WebGLShader.idl:
* html/canvas/WebGLTexture.cpp:
* html/canvas/WebGLTexture.idl:
* html/canvas/WebGLUniformLocation.cpp:
* html/canvas/WebGLUniformLocation.idl:
* html/canvas/WebKitLoseContext.cpp:
* html/canvas/WebKitLoseContext.idl:
* page/DOMWindow.idl:
* platform/graphics/ANGLEWebKitBridge.cpp:
* platform/graphics/GraphicsContext3D.cpp:
* platform/graphics/cg/GraphicsContext3DCG.cpp:
* platform/graphics/gpu/DrawingBuffer.cpp:
* platform/graphics/gpu/mac/DrawingBufferMac.mm:
* platform/graphics/mac/GraphicsContext3DMac.mm:
* platform/graphics/mac/WebGLLayer.mm:
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
* platform/graphics/qt/Extensions3DQt.cpp:
* platform/graphics/qt/GraphicsContext3DQt.cpp:
* platform/graphics/qt/GraphicsLayerQt.cpp:
(WebCore::GraphicsLayerQtImpl::GraphicsLayerQtImpl):
(WebCore::GraphicsLayerQtImpl::paint):
(WebCore::GraphicsLayerQtImpl::flushChanges):
* platform/graphics/qt/GraphicsLayerQt.h:
* platform/graphics/skia/GraphicsContext3DSkia.cpp:
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::isAcceleratedCanvas):
(WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration):
(WebCore::RenderLayerBacking::containsPaintedContent):
(WebCore::RenderLayerBacking::contentChanged):
* webaudio/AudioBuffer.cpp:
* webaudio/AudioBuffer.idl:
* webaudio/RealtimeAnalyser.cpp:
* webaudio/RealtimeAnalyser.h:
* webaudio/RealtimeAnalyserNode.h:
* webaudio/RealtimeAnalyserNode.idl:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::setResponseType):
(WebCore::XMLHttpRequest::clearResponse):
(WebCore::XMLHttpRequest::didReceiveData):
* xml/XMLHttpRequest.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76601 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c2e15ca..e4f50fd 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -780,6 +780,39 @@
2011-01-24 Zhenyao Mo <zmo at google.com>
+ Reviewed by Eric Seidel.
+
+ Cleanup WebGLGetInfo and related get*Parameter helpers in WebGLRenderingContext
+ https://bugs.webkit.org/show_bug.cgi?id=52338
+
+ Removed the long/unsigned long types and corresponding get functions
+ and use int/unsigned int instead.
+
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ (WebCore::toJS):
+ * bindings/v8/custom/V8WebGLRenderingContextCustom.cpp:
+ (WebCore::toV8Object):
+ * html/canvas/WebGLGetInfo.cpp:
+ (WebCore::WebGLGetInfo::WebGLGetInfo):
+ (WebCore::WebGLGetInfo::getInt):
+ (WebCore::WebGLGetInfo::getUnsignedInt):
+ * html/canvas/WebGLGetInfo.h:
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getBufferParameter):
+ (WebCore::WebGLRenderingContext::getFramebufferAttachmentParameter):
+ (WebCore::WebGLRenderingContext::getParameter):
+ (WebCore::WebGLRenderingContext::getProgramParameter):
+ (WebCore::WebGLRenderingContext::getRenderbufferParameter):
+ (WebCore::WebGLRenderingContext::getShaderParameter):
+ (WebCore::WebGLRenderingContext::getTexParameter):
+ (WebCore::WebGLRenderingContext::getUniform):
+ (WebCore::WebGLRenderingContext::getVertexAttrib):
+ (WebCore::WebGLRenderingContext::getIntParameter):
+ (WebCore::WebGLRenderingContext::getUnsignedIntParameter):
+ * html/canvas/WebGLRenderingContext.h:
+
+2011-01-24 Zhenyao Mo <zmo at google.com>
+
Reviewed by Darin Adler.
Remove sizeInBytes from GraphicsContext3D's various implementations
diff --git a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
index 828176d..eb4f6e2 100644
--- a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
@@ -89,14 +89,14 @@ static JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, const WebG
}
case WebGLGetInfo::kTypeFloat:
return jsNumber(info.getFloat());
- case WebGLGetInfo::kTypeLong:
- return jsNumber(info.getLong());
+ case WebGLGetInfo::kTypeInt:
+ return jsNumber(info.getInt());
case WebGLGetInfo::kTypeNull:
return jsNull();
case WebGLGetInfo::kTypeString:
return jsString(exec, info.getString());
- case WebGLGetInfo::kTypeUnsignedLong:
- return jsNumber(info.getUnsignedLong());
+ case WebGLGetInfo::kTypeUnsignedInt:
+ return jsNumber(info.getUnsignedInt());
case WebGLGetInfo::kTypeWebGLBuffer:
return toJS(exec, globalObject, info.getWebGLBuffer());
case WebGLGetInfo::kTypeWebGLFloatArray:
diff --git a/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp b/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
index 16abc33..5a3f873 100644
--- a/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
@@ -120,14 +120,14 @@ static v8::Handle<v8::Value> toV8Object(const WebGLGetInfo& info)
}
case WebGLGetInfo::kTypeFloat:
return v8::Number::New(info.getFloat());
- case WebGLGetInfo::kTypeLong:
- return v8::Integer::New(info.getLong());
+ case WebGLGetInfo::kTypeInt:
+ return v8::Integer::New(info.getInt());
case WebGLGetInfo::kTypeNull:
return v8::Null();
case WebGLGetInfo::kTypeString:
return v8::String::New(fromWebCoreString(info.getString()), info.getString().length());
- case WebGLGetInfo::kTypeUnsignedLong:
- return v8::Integer::NewFromUnsigned(info.getUnsignedLong());
+ case WebGLGetInfo::kTypeUnsignedInt:
+ return v8::Integer::NewFromUnsigned(info.getUnsignedInt());
case WebGLGetInfo::kTypeWebGLBuffer:
return toV8(info.getWebGLBuffer());
case WebGLGetInfo::kTypeWebGLFloatArray:
diff --git a/Source/WebCore/html/canvas/WebGLGetInfo.cpp b/Source/WebCore/html/canvas/WebGLGetInfo.cpp
index 45676d2..d0c8c65 100644
--- a/Source/WebCore/html/canvas/WebGLGetInfo.cpp
+++ b/Source/WebCore/html/canvas/WebGLGetInfo.cpp
@@ -63,9 +63,9 @@ WebGLGetInfo::WebGLGetInfo(float value)
{
}
-WebGLGetInfo::WebGLGetInfo(long value)
- : m_type(kTypeLong)
- , m_long(value)
+WebGLGetInfo::WebGLGetInfo(int value)
+ : m_type(kTypeInt)
+ , m_int(value)
{
}
@@ -80,9 +80,9 @@ WebGLGetInfo::WebGLGetInfo(const String& value)
{
}
-WebGLGetInfo::WebGLGetInfo(unsigned long value)
- : m_type(kTypeUnsignedLong)
- , m_unsignedLong(value)
+WebGLGetInfo::WebGLGetInfo(unsigned int value)
+ : m_type(kTypeUnsignedInt)
+ , m_unsignedInt(value)
{
}
@@ -161,10 +161,10 @@ float WebGLGetInfo::getFloat() const
return m_float;
}
-long WebGLGetInfo::getLong() const
+int WebGLGetInfo::getInt() const
{
- ASSERT(getType() == kTypeLong);
- return m_long;
+ ASSERT(getType() == kTypeInt);
+ return m_int;
}
const String& WebGLGetInfo::getString() const
@@ -173,10 +173,10 @@ const String& WebGLGetInfo::getString() const
return m_string;
}
-unsigned long WebGLGetInfo::getUnsignedLong() const
+unsigned int WebGLGetInfo::getUnsignedInt() const
{
- ASSERT(getType() == kTypeUnsignedLong);
- return m_unsignedLong;
+ ASSERT(getType() == kTypeUnsignedInt);
+ return m_unsignedInt;
}
PassRefPtr<WebGLBuffer> WebGLGetInfo::getWebGLBuffer() const
diff --git a/Source/WebCore/html/canvas/WebGLGetInfo.h b/Source/WebCore/html/canvas/WebGLGetInfo.h
index caee520..91f9233 100644
--- a/Source/WebCore/html/canvas/WebGLGetInfo.h
+++ b/Source/WebCore/html/canvas/WebGLGetInfo.h
@@ -53,10 +53,10 @@ public:
kTypeBool,
kTypeBoolArray,
kTypeFloat,
- kTypeLong,
+ kTypeInt,
kTypeNull,
kTypeString,
- kTypeUnsignedLong,
+ kTypeUnsignedInt,
kTypeWebGLBuffer,
kTypeWebGLFloatArray,
kTypeWebGLFramebuffer,
@@ -71,11 +71,11 @@ public:
WebGLGetInfo(bool value);
WebGLGetInfo(const bool* value, int size);
WebGLGetInfo(float value);
- WebGLGetInfo(long value);
+ WebGLGetInfo(int value);
// Represents the null value and type.
WebGLGetInfo();
WebGLGetInfo(const String& value);
- WebGLGetInfo(unsigned long value);
+ WebGLGetInfo(unsigned int value);
WebGLGetInfo(PassRefPtr<WebGLBuffer> value);
WebGLGetInfo(PassRefPtr<Float32Array> value);
WebGLGetInfo(PassRefPtr<WebGLFramebuffer> value);
@@ -94,9 +94,9 @@ public:
bool getBool() const;
const Vector<bool>& getBoolArray() const;
float getFloat() const;
- long getLong() const;
+ int getInt() const;
const String& getString() const;
- unsigned long getUnsignedLong() const;
+ unsigned int getUnsignedInt() const;
PassRefPtr<WebGLBuffer> getWebGLBuffer() const;
PassRefPtr<Float32Array> getWebGLFloatArray() const;
PassRefPtr<WebGLFramebuffer> getWebGLFramebuffer() const;
@@ -113,9 +113,9 @@ private:
bool m_bool;
Vector<bool> m_boolArray;
float m_float;
- long m_long;
+ int m_int;
String m_string;
- unsigned long m_unsignedLong;
+ unsigned int m_unsignedInt;
RefPtr<WebGLBuffer> m_webglBuffer;
RefPtr<Float32Array> m_webglFloatArray;
RefPtr<WebGLFramebuffer> m_webglFramebuffer;
diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
index b877646..6dee05e 100644
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -1752,8 +1752,8 @@ WebGLGetInfo WebGLRenderingContext::getBufferParameter(GC3Denum target, GC3Denum
GC3Dint value = 0;
m_context->getBufferParameteriv(target, pname, &value);
if (pname == GraphicsContext3D::BUFFER_SIZE)
- return WebGLGetInfo(static_cast<long>(value));
- return WebGLGetInfo(static_cast<unsigned long>(value));
+ return WebGLGetInfo(value);
+ return WebGLGetInfo(static_cast<unsigned int>(value));
}
PassRefPtr<WebGLContextAttributes> WebGLRenderingContext::getContextAttributes()
@@ -1826,8 +1826,8 @@ WebGLGetInfo WebGLRenderingContext::getFramebufferAttachmentParameter(GC3Denum t
GC3Dint value = 0;
m_context->getFramebufferAttachmentParameteriv(target, attachment, pname, &value);
if (pname == GraphicsContext3D::FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE)
- return WebGLGetInfo(static_cast<unsigned long>(value));
- return WebGLGetInfo(static_cast<long>(value));
+ return WebGLGetInfo(static_cast<unsigned int>(value));
+ return WebGLGetInfo(value);
}
WebGLStateRestorer(this, false);
@@ -1856,13 +1856,13 @@ WebGLGetInfo WebGLRenderingContext::getParameter(GC3Denum pname, ExceptionCode&
WebGLStateRestorer(this, false);
switch (pname) {
case GraphicsContext3D::ACTIVE_TEXTURE:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::ALIASED_LINE_WIDTH_RANGE:
return getWebGLFloatArrayParameter(pname);
case GraphicsContext3D::ALIASED_POINT_SIZE_RANGE:
return getWebGLFloatArrayParameter(pname);
case GraphicsContext3D::ALPHA_BITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::ARRAY_BUFFER_BINDING:
return WebGLGetInfo(PassRefPtr<WebGLBuffer>(m_boundArrayBuffer));
case GraphicsContext3D::BLEND:
@@ -1870,19 +1870,19 @@ WebGLGetInfo WebGLRenderingContext::getParameter(GC3Denum pname, ExceptionCode&
case GraphicsContext3D::BLEND_COLOR:
return getWebGLFloatArrayParameter(pname);
case GraphicsContext3D::BLEND_DST_ALPHA:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::BLEND_DST_RGB:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::BLEND_EQUATION_ALPHA:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::BLEND_EQUATION_RGB:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::BLEND_SRC_ALPHA:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::BLEND_SRC_RGB:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::BLUE_BITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::COLOR_CLEAR_VALUE:
return getWebGLFloatArrayParameter(pname);
case GraphicsContext3D::COLOR_WRITEMASK:
@@ -1893,15 +1893,15 @@ WebGLGetInfo WebGLRenderingContext::getParameter(GC3Denum pname, ExceptionCode&
case GraphicsContext3D::CULL_FACE:
return getBooleanParameter(pname);
case GraphicsContext3D::CULL_FACE_MODE:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::CURRENT_PROGRAM:
return WebGLGetInfo(PassRefPtr<WebGLProgram>(m_currentProgram));
case GraphicsContext3D::DEPTH_BITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::DEPTH_CLEAR_VALUE:
return getFloatParameter(pname);
case GraphicsContext3D::DEPTH_FUNC:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::DEPTH_RANGE:
return getWebGLFloatArrayParameter(pname);
case GraphicsContext3D::DEPTH_TEST:
@@ -1915,43 +1915,43 @@ WebGLGetInfo WebGLRenderingContext::getParameter(GC3Denum pname, ExceptionCode&
case GraphicsContext3D::FRAMEBUFFER_BINDING:
return WebGLGetInfo(PassRefPtr<WebGLFramebuffer>(m_framebufferBinding));
case GraphicsContext3D::FRONT_FACE:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::GENERATE_MIPMAP_HINT:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::GREEN_BITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::LINE_WIDTH:
return getFloatParameter(pname);
case GraphicsContext3D::MAX_COMBINED_TEXTURE_IMAGE_UNITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_CUBE_MAP_TEXTURE_SIZE:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_FRAGMENT_UNIFORM_VECTORS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_RENDERBUFFER_SIZE:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_TEXTURE_IMAGE_UNITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_TEXTURE_SIZE:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_VARYING_VECTORS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_VERTEX_ATTRIBS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_VERTEX_TEXTURE_IMAGE_UNITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_VERTEX_UNIFORM_VECTORS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::MAX_VIEWPORT_DIMS:
return getWebGLIntArrayParameter(pname);
case GraphicsContext3D::NUM_COMPRESSED_TEXTURE_FORMATS:
// WebGL 1.0 specifies that there are no compressed texture formats.
- return WebGLGetInfo(static_cast<long>(0));
+ return WebGLGetInfo(static_cast<int>(0));
case GraphicsContext3D::NUM_SHADER_BINARY_FORMATS:
// FIXME: should we always return 0 for this?
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::PACK_ALIGNMENT:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::POLYGON_OFFSET_FACTOR:
return getFloatParameter(pname);
case GraphicsContext3D::POLYGON_OFFSET_FILL:
@@ -1959,19 +1959,19 @@ WebGLGetInfo WebGLRenderingContext::getParameter(GC3Denum pname, ExceptionCode&
case GraphicsContext3D::POLYGON_OFFSET_UNITS:
return getFloatParameter(pname);
case GraphicsContext3D::RED_BITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::RENDERBUFFER_BINDING:
return WebGLGetInfo(PassRefPtr<WebGLRenderbuffer>(m_renderbufferBinding));
case GraphicsContext3D::RENDERER:
return WebGLGetInfo(m_context->getString(GraphicsContext3D::RENDERER));
case GraphicsContext3D::SAMPLE_BUFFERS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::SAMPLE_COVERAGE_INVERT:
return getBooleanParameter(pname);
case GraphicsContext3D::SAMPLE_COVERAGE_VALUE:
return getFloatParameter(pname);
case GraphicsContext3D::SAMPLES:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::SCISSOR_BOX:
return getWebGLIntArrayParameter(pname);
case GraphicsContext3D::SCISSOR_TEST:
@@ -1979,54 +1979,53 @@ WebGLGetInfo WebGLRenderingContext::getParameter(GC3Denum pname, ExceptionCode&
case GraphicsContext3D::SHADING_LANGUAGE_VERSION:
return WebGLGetInfo("WebGL GLSL ES 1.0 (" + m_context->getString(GraphicsContext3D::SHADING_LANGUAGE_VERSION) + ")");
case GraphicsContext3D::STENCIL_BACK_FAIL:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_BACK_FUNC:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_BACK_PASS_DEPTH_FAIL:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_BACK_PASS_DEPTH_PASS:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_BACK_REF:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::STENCIL_BACK_VALUE_MASK:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_BACK_WRITEMASK:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_BITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::STENCIL_CLEAR_VALUE:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::STENCIL_FAIL:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_FUNC:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_PASS_DEPTH_FAIL:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_PASS_DEPTH_PASS:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_REF:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::STENCIL_TEST:
return getBooleanParameter(pname);
case GraphicsContext3D::STENCIL_VALUE_MASK:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::STENCIL_WRITEMASK:
- return getUnsignedLongParameter(pname);
+ return getUnsignedIntParameter(pname);
case GraphicsContext3D::SUBPIXEL_BITS:
- return getLongParameter(pname);
+ return getIntParameter(pname);
case GraphicsContext3D::TEXTURE_BINDING_2D:
return WebGLGetInfo(PassRefPtr<WebGLTexture>(m_textureUnits[m_activeTextureUnit].m_texture2DBinding));
case GraphicsContext3D::TEXTURE_BINDING_CUBE_MAP:
return WebGLGetInfo(PassRefPtr<WebGLTexture>(m_textureUnits[m_activeTextureUnit].m_textureCubeMapBinding));
case GraphicsContext3D::UNPACK_ALIGNMENT:
- // FIXME: should this be "long" in the spec?
return getIntParameter(pname);
case GraphicsContext3D::UNPACK_FLIP_Y_WEBGL:
return WebGLGetInfo(m_unpackFlipY);
case GraphicsContext3D::UNPACK_PREMULTIPLY_ALPHA_WEBGL:
return WebGLGetInfo(m_unpackPremultiplyAlpha);
case GraphicsContext3D::UNPACK_COLORSPACE_CONVERSION_WEBGL:
- return WebGLGetInfo(static_cast<unsigned long>(m_unpackColorspaceConversion));
+ return WebGLGetInfo(m_unpackColorspaceConversion);
case GraphicsContext3D::VENDOR:
return WebGLGetInfo("Webkit (" + m_context->getString(GraphicsContext3D::VENDOR) + ")");
case GraphicsContext3D::VERSION:
@@ -2035,7 +2034,7 @@ WebGLGetInfo WebGLRenderingContext::getParameter(GC3Denum pname, ExceptionCode&
return getWebGLIntArrayParameter(pname);
case Extensions3D::FRAGMENT_SHADER_DERIVATIVE_HINT_OES: // OES_standard_derivatives
if (m_oesStandardDerivatives)
- return getUnsignedLongParameter(Extensions3D::FRAGMENT_SHADER_DERIVATIVE_HINT_OES);
+ return getUnsignedIntParameter(Extensions3D::FRAGMENT_SHADER_DERIVATIVE_HINT_OES);
m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
return WebGLGetInfo();
default:
@@ -2067,7 +2066,7 @@ WebGLGetInfo WebGLRenderingContext::getProgramParameter(WebGLProgram* program, G
case GraphicsContext3D::ACTIVE_UNIFORMS:
case GraphicsContext3D::ACTIVE_UNIFORM_MAX_LENGTH:
m_context->getProgramiv(objectOrZero(program), pname, &value);
- return WebGLGetInfo(static_cast<long>(value));
+ return WebGLGetInfo(value);
default:
m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
return WebGLGetInfo();
@@ -2102,13 +2101,13 @@ WebGLGetInfo WebGLRenderingContext::getRenderbufferParameter(GC3Denum target, GC
if (m_renderbufferBinding->getInternalFormat() == GraphicsContext3D::DEPTH_STENCIL
&& !m_renderbufferBinding->isValid()) {
ASSERT(!isDepthStencilSupported());
- long value = 0;
+ int value = 0;
switch (pname) {
case GraphicsContext3D::RENDERBUFFER_WIDTH:
- value = static_cast<long>(m_renderbufferBinding->getWidth());
+ value = m_renderbufferBinding->getWidth();
break;
case GraphicsContext3D::RENDERBUFFER_HEIGHT:
- value = static_cast<long>(m_renderbufferBinding->getHeight());
+ value = m_renderbufferBinding->getHeight();
break;
case GraphicsContext3D::RENDERBUFFER_RED_SIZE:
case GraphicsContext3D::RENDERBUFFER_GREEN_SIZE:
@@ -2123,7 +2122,7 @@ WebGLGetInfo WebGLRenderingContext::getRenderbufferParameter(GC3Denum target, GC
value = 8;
break;
case GraphicsContext3D::RENDERBUFFER_INTERNAL_FORMAT:
- return WebGLGetInfo(static_cast<unsigned long>(m_renderbufferBinding->getInternalFormat()));
+ return WebGLGetInfo(m_renderbufferBinding->getInternalFormat());
default:
m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
return WebGLGetInfo();
@@ -2143,9 +2142,9 @@ WebGLGetInfo WebGLRenderingContext::getRenderbufferParameter(GC3Denum target, GC
case GraphicsContext3D::RENDERBUFFER_DEPTH_SIZE:
case GraphicsContext3D::RENDERBUFFER_STENCIL_SIZE:
m_context->getRenderbufferParameteriv(target, pname, &value);
- return WebGLGetInfo(static_cast<long>(value));
+ return WebGLGetInfo(value);
case GraphicsContext3D::RENDERBUFFER_INTERNAL_FORMAT:
- return WebGLGetInfo(static_cast<unsigned long>(m_renderbufferBinding->getInternalFormat()));
+ return WebGLGetInfo(m_renderbufferBinding->getInternalFormat());
default:
m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
return WebGLGetInfo();
@@ -2167,11 +2166,11 @@ WebGLGetInfo WebGLRenderingContext::getShaderParameter(WebGLShader* shader, GC3D
return WebGLGetInfo(static_cast<bool>(value));
case GraphicsContext3D::SHADER_TYPE:
m_context->getShaderiv(objectOrZero(shader), pname, &value);
- return WebGLGetInfo(static_cast<unsigned long>(value));
+ return WebGLGetInfo(static_cast<unsigned int>(value));
case GraphicsContext3D::INFO_LOG_LENGTH:
case GraphicsContext3D::SHADER_SOURCE_LENGTH:
m_context->getShaderiv(objectOrZero(shader), pname, &value);
- return WebGLGetInfo(static_cast<long>(value));
+ return WebGLGetInfo(value);
default:
m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
return WebGLGetInfo();
@@ -2227,7 +2226,7 @@ WebGLGetInfo WebGLRenderingContext::getTexParameter(GC3Denum target, GC3Denum pn
case GraphicsContext3D::TEXTURE_WRAP_S:
case GraphicsContext3D::TEXTURE_WRAP_T:
m_context->getTexParameteriv(target, pname, &value);
- return WebGLGetInfo(static_cast<unsigned long>(value));
+ return WebGLGetInfo(static_cast<unsigned int>(value));
default:
m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
return WebGLGetInfo();
@@ -2349,7 +2348,7 @@ WebGLGetInfo WebGLRenderingContext::getUniform(WebGLProgram* program, const WebG
GC3Dint value[4] = {0};
m_context->getUniformiv(objectOrZero(program), location, value);
if (length == 1)
- return WebGLGetInfo(static_cast<long>(value[0]));
+ return WebGLGetInfo(value[0]);
return WebGLGetInfo(Int32Array::create(value, length));
}
case GraphicsContext3D::BOOL: {
@@ -2416,16 +2415,16 @@ WebGLGetInfo WebGLRenderingContext::getVertexAttrib(GC3Duint index, GC3Denum pna
return WebGLGetInfo(m_vertexAttribState[index].normalized);
case GraphicsContext3D::VERTEX_ATTRIB_ARRAY_SIZE:
if (index >= m_vertexAttribState.size())
- return WebGLGetInfo(static_cast<long>(4));
- return WebGLGetInfo(static_cast<long>(m_vertexAttribState[index].size));
+ return WebGLGetInfo(static_cast<int>(4));
+ return WebGLGetInfo(m_vertexAttribState[index].size);
case GraphicsContext3D::VERTEX_ATTRIB_ARRAY_STRIDE:
if (index >= m_vertexAttribState.size())
- return WebGLGetInfo(static_cast<long>(0));
- return WebGLGetInfo(static_cast<long>(m_vertexAttribState[index].originalStride));
+ return WebGLGetInfo(static_cast<int>(0));
+ return WebGLGetInfo(m_vertexAttribState[index].originalStride);
case GraphicsContext3D::VERTEX_ATTRIB_ARRAY_TYPE:
if (index >= m_vertexAttribState.size())
- return WebGLGetInfo(static_cast<unsigned long>(GraphicsContext3D::FLOAT));
- return WebGLGetInfo(static_cast<unsigned long>(m_vertexAttribState[index].type));
+ return WebGLGetInfo(static_cast<unsigned int>(GraphicsContext3D::FLOAT));
+ return WebGLGetInfo(m_vertexAttribState[index].type);
case GraphicsContext3D::CURRENT_VERTEX_ATTRIB:
if (index >= m_vertexAttribState.size()) {
float value[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
@@ -3831,22 +3830,16 @@ WebGLGetInfo WebGLRenderingContext::getFloatParameter(GC3Denum pname)
WebGLGetInfo WebGLRenderingContext::getIntParameter(GC3Denum pname)
{
- return getLongParameter(pname);
-}
-
-WebGLGetInfo WebGLRenderingContext::getLongParameter(GC3Denum pname)
-{
GC3Dint value = 0;
m_context->getIntegerv(pname, &value);
- return WebGLGetInfo(static_cast<long>(value));
+ return WebGLGetInfo(value);
}
-WebGLGetInfo WebGLRenderingContext::getUnsignedLongParameter(GC3Denum pname)
+WebGLGetInfo WebGLRenderingContext::getUnsignedIntParameter(GC3Denum pname)
{
GC3Dint value = 0;
m_context->getIntegerv(pname, &value);
- GC3Duint uValue = static_cast<GC3Duint>(value);
- return WebGLGetInfo(static_cast<unsigned long>(uValue));
+ return WebGLGetInfo(static_cast<unsigned int>(value));
}
WebGLGetInfo WebGLRenderingContext::getWebGLFloatArrayParameter(GC3Denum pname)
diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.h b/Source/WebCore/html/canvas/WebGLRenderingContext.h
index 01b5438..21075af 100644
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.h
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.h
@@ -461,8 +461,7 @@ public:
WebGLGetInfo getBooleanArrayParameter(GC3Denum pname);
WebGLGetInfo getFloatParameter(GC3Denum pname);
WebGLGetInfo getIntParameter(GC3Denum pname);
- WebGLGetInfo getLongParameter(GC3Denum pname);
- WebGLGetInfo getUnsignedLongParameter(GC3Denum pname);
+ WebGLGetInfo getUnsignedIntParameter(GC3Denum pname);
WebGLGetInfo getWebGLFloatArrayParameter(GC3Denum pname);
WebGLGetInfo getWebGLIntArrayParameter(GC3Denum pname);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list