| Index: cc/stubs/GraphicsContext3D.h
|
| diff --git a/cc/stubs/GraphicsContext3D.h b/cc/stubs/GraphicsContext3D.h
|
| index 41404f24af9f02101842160b7f2a152b36d28799..eff588e07a0d2a9ad9ae23d8bffa20df2dec735e 100644
|
| --- a/cc/stubs/GraphicsContext3D.h
|
| +++ b/cc/stubs/GraphicsContext3D.h
|
| @@ -9,17 +9,16 @@
|
| #include "IntSize.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
|
|
| +#ifdef NO_ERROR
|
| +#undef NO_ERROR
|
| +#endif
|
| +
|
| namespace WebCore {
|
|
|
| class GraphicsContext3D {
|
| public:
|
| enum SourceDataFormat { SourceFormatRGBA8, SourceFormatBGRA8 };
|
| - static bool computeFormatAndTypeParameters(unsigned, unsigned, unsigned* componentsPerPixel, unsigned* bytesPerComponent)
|
| - {
|
| - *componentsPerPixel = 4;
|
| - *bytesPerComponent = 1;
|
| - return true;
|
| - }
|
| + static bool computeFormatAndTypeParameters(unsigned, unsigned, unsigned* componentsPerPixel, unsigned* bytesPerComponent);
|
|
|
| enum {
|
| ARRAY_BUFFER = GL_ARRAY_BUFFER,
|
|
|