Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(721)

Unified Diff: cc/stubs/GraphicsContext3D.h

Issue 10915074: Fix up cc stubs and bindings to work in windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/cc.gyp ('k') | cc/stubs/TextStream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « cc/cc.gyp ('k') | cc/stubs/TextStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698