Bug 800657 - Fix WebGL typedefs, WebGLintptr was wrong on 32bit systems, caused index-validation.html regression - r=bz

This commit is contained in:
Benoit Jacob 2012-10-15 12:57:14 -04:00
parent 575ba2c3a4
commit d59e3548af
2 changed files with 11 additions and 13 deletions

View File

@ -61,17 +61,17 @@
#define MINVALUE_GL_MAX_RENDERBUFFER_SIZE 1024 // Different from the spec, which sets it to 1 on page 164
#define MINVALUE_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 8 // Page 164
#define DECL_WEBGL_TYPEDEF(type) typedef type Web##type;
DECL_WEBGL_TYPEDEF(GLenum)
DECL_WEBGL_TYPEDEF(GLbitfield)
DECL_WEBGL_TYPEDEF(GLint)
DECL_WEBGL_TYPEDEF(GLsizei)
DECL_WEBGL_TYPEDEF(GLsizeiptr)
DECL_WEBGL_TYPEDEF(GLintptr)
DECL_WEBGL_TYPEDEF(GLuint)
DECL_WEBGL_TYPEDEF(GLfloat)
DECL_WEBGL_TYPEDEF(GLclampf)
typedef realGLboolean WebGLboolean;
// Manual reflection of WebIDL typedefs
typedef uint32_t WebGLenum;
typedef uint32_t WebGLbitfield;
typedef int32_t WebGLint;
typedef int32_t WebGLsizei;
typedef int64_t WebGLsizeiptr;
typedef int64_t WebGLintptr;
typedef uint32_t WebGLuint;
typedef float WebGLfloat;
typedef float WebGLclampf;
typedef bool WebGLboolean;
class nsIPropertyBag;

View File

@ -554,8 +554,6 @@ using mozilla::dom::indexedDB::IDBWrapperCache;
#include "nsIDOMDataChannel.h"
#endif
#undef None // something included above defines this preprocessor symbol, maybe Xlib headers
#include "WebGLContext.h"
#include "nsICanvasRenderingContextInternal.h"
#include "mozilla/dom/BindingUtils.h"
#include "mozilla/dom/HTMLCollectionBinding.h"