Merge 89635 - 2011-06-23 John Bates <jbates@google.com>

Source/WebCore/platform/graphics/Extensions3D.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 88 matching lines @@
 
         // GL_OES_rgb8_rgba8 names
         RGB8_OES = 0x8051,
         RGBA8_OES = 0x8058,
         
         // GL_OES_vertex_array_object names
         VERTEX_ARRAY_BINDING_OES = 0x85B5,
     };
 
     // GL_ARB_robustness
+    // Note: This method's behavior differs from the GL_ARB_robustness
+    // specification in the following way:
+    // The implementation must not reset the error state during this call.
+    // If getGraphicsResetStatusARB returns an error, it should continue
+    // returning the same error. Restoring the GraphicsContext3D is handled
+    // externally.
     virtual int getGraphicsResetStatusARB() = 0;
     
     // GL_ANGLE_framebuffer_blit
     virtual void blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) = 0;
     
     // GL_ANGLE_framebuffer_multisample
     virtual void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) = 0;
     
     // GL_OES_vertex_array_object
     virtual Platform3DObject createVertexArrayOES() = 0;
     virtual void deleteVertexArrayOES(Platform3DObject) = 0;
     virtual GC3Dboolean isVertexArrayOES(Platform3DObject) = 0;
     virtual void bindVertexArrayOES(Platform3DObject) = 0;
 };
 
 } // namespace WebCore
 
 #endif // Extensions3D_h