diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/html/canvas/WebGLGetInfo.cpp | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/html/canvas/WebGLGetInfo.cpp')
-rw-r--r-- | Source/WebCore/html/canvas/WebGLGetInfo.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/WebCore/html/canvas/WebGLGetInfo.cpp b/Source/WebCore/html/canvas/WebGLGetInfo.cpp index 6aff82f..d0c8c65 100644 --- a/Source/WebCore/html/canvas/WebGLGetInfo.cpp +++ b/Source/WebCore/html/canvas/WebGLGetInfo.cpp @@ -26,7 +26,7 @@ #include "config.h" -#if ENABLE(3D_CANVAS) +#if ENABLE(WEBGL) #include "WebGLGetInfo.h" @@ -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 @@ -229,4 +229,4 @@ PassRefPtr<Uint8Array> WebGLGetInfo::getWebGLUnsignedByteArray() const } // namespace WebCore -#endif // ENABLE(3D_CANVAS) +#endif // ENABLE(WEBGL) |