Merge 88489 - 2011-06-09 Kenneth Russell <kbr@google.com>

Source/WebCore/html/canvas/WebGLRenderingContext.h

 /*
  * Copyright (C) 2009 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 326 matching lines @@
     bool validateIndexArrayConservative(GC3Denum type, int& numElementsRequired);
 
     // Precise but slow index validation -- only done if conservative checks fail
     bool validateIndexArrayPrecise(GC3Dsizei count, GC3Denum type, GC3Dintptr offset, int& numElementsRequired);
     // If numElements <= 0, we only check if each enabled vertex attribute is bound to a buffer.
     bool validateRenderingState(int numElements);
 
     bool validateWebGLObject(WebGLObject*);
 
 #if ENABLE(VIDEO)
-    PassRefPtr<Image> videoFrameToImage(HTMLVideoElement*);
+    PassRefPtr<Image> videoFrameToImage(HTMLVideoElement*, ExceptionCode&);
 #endif
 
     RefPtr<GraphicsContext3D> m_context;
 
     class WebGLRenderingContextRestoreTimer : public TimerBase {
     public:
         WebGLRenderingContextRestoreTimer(WebGLRenderingContext* context) : m_context(context) { }
     private:
         virtual void fired();
         WebGLRenderingContext* m_context;
@@ skipping 250 matching lines @@
     void initVertexAttrib0();
     bool simulateVertexAttrib0(GC3Dsizei numVertex);
     void restoreStatesAfterVertexAttrib0Simulation();
 
     friend class WebGLStateRestorer;
 };
 
 } // namespace WebCore
 
 #endif