summaryrefslogtreecommitdiffstats
path: root/WebCore/html/canvas/WebGLGetInfo.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-06-15 19:36:43 +0100
committerBen Murdoch <benm@google.com>2010-06-16 14:52:28 +0100
commit545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch)
treec0c14763654d84d37577dde512c3d3b4699a9e86 /WebCore/html/canvas/WebGLGetInfo.h
parent719298a66237d38ea5c05f1547123ad8aacbc237 (diff)
downloadexternal_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip
external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz
external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'WebCore/html/canvas/WebGLGetInfo.h')
-rw-r--r--WebCore/html/canvas/WebGLGetInfo.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/html/canvas/WebGLGetInfo.h b/WebCore/html/canvas/WebGLGetInfo.h
index 969e05d..b35add8 100644
--- a/WebCore/html/canvas/WebGLGetInfo.h
+++ b/WebCore/html/canvas/WebGLGetInfo.h
@@ -32,7 +32,7 @@
#include "PlatformString.h"
#include "WebGLBuffer.h"
-#include "FloatArray.h"
+#include "Float32Array.h"
#include "WebGLFramebuffer.h"
#include "Int32Array.h"
// FIXME: implement WebGLObjectArray
@@ -77,7 +77,7 @@ public:
WebGLGetInfo(const String& value);
WebGLGetInfo(unsigned long value);
WebGLGetInfo(PassRefPtr<WebGLBuffer> value);
- WebGLGetInfo(PassRefPtr<FloatArray> value);
+ WebGLGetInfo(PassRefPtr<Float32Array> value);
WebGLGetInfo(PassRefPtr<WebGLFramebuffer> value);
WebGLGetInfo(PassRefPtr<Int32Array> value);
// FIXME: implement WebGLObjectArray
@@ -97,7 +97,7 @@ public:
const String& getString() const;
unsigned long getUnsignedLong() const;
PassRefPtr<WebGLBuffer> getWebGLBuffer() const;
- PassRefPtr<FloatArray> getWebGLFloatArray() const;
+ PassRefPtr<Float32Array> getWebGLFloatArray() const;
PassRefPtr<WebGLFramebuffer> getWebGLFramebuffer() const;
PassRefPtr<Int32Array> getWebGLIntArray() const;
// FIXME: implement WebGLObjectArray
@@ -115,7 +115,7 @@ private:
String m_string;
unsigned long m_unsignedLong;
RefPtr<WebGLBuffer> m_webglBuffer;
- RefPtr<FloatArray> m_webglFloatArray;
+ RefPtr<Float32Array> m_webglFloatArray;
RefPtr<WebGLFramebuffer> m_webglFramebuffer;
RefPtr<Int32Array> m_webglIntArray;
// FIXME: implement WebGLObjectArray