Merge 73424 - 2010-12-06 Alexey Marinichev <amarinichev@chromium.org>...

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 14 matching lines @@
 
 #ifndef WebGLRenderingContext_h
 #define WebGLRenderingContext_h
 
 #include "CanvasRenderingContext.h"
 #include "ExceptionCode.h"
 #include "Float32Array.h"
 #include "GraphicsContext3D.h"
 #include "Int32Array.h"
 #include "PlatformString.h"
+#include "Timer.h"
 #include "Uint8Array.h"
 #include "WebGLGetInfo.h"
 
 #include <wtf/OwnArrayPtr.h>
 
 namespace WebCore {
 
 class WebGLActiveInfo;
 class WebGLBuffer;
 class WebGLContextAttributes;
@@ skipping 123 matching lines @@
     WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation*, ExceptionCode&);
 
     PassRefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&, ExceptionCode&);
 
     WebGLGetInfo getVertexAttrib(unsigned long index, unsigned long pname, ExceptionCode&);
 
     long getVertexAttribOffset(unsigned long index, unsigned long pname);
 
     void hint(unsigned long target, unsigned long mode);
     bool isBuffer(WebGLBuffer*);
-    bool isContextLost() const;
+    bool isContextLost();
     bool isEnabled(unsigned long cap);
     bool isFramebuffer(WebGLFramebuffer*);
     bool isProgram(WebGLProgram*);
     bool isRenderbuffer(WebGLRenderbuffer*);
     bool isShader(WebGLShader*);
     bool isTexture(WebGLTexture*);
     void lineWidth(double);
     void linkProgram(WebGLProgram*, ExceptionCode&);
     void pixelStorei(unsigned long pname, long param);
     void polygonOffset(double factor, double units);
@@ skipping 98 matching lines @@
 
     void reshape(int width, int height);
 
     virtual void paintRenderingResultsToCanvas();
 
     void removeObject(WebGLObject*);
 
   private:
     friend class WebGLObject;
 
-    WebGLRenderingContext(HTMLCanvasElement*, PassRefPtr<GraphicsContext3D>);
+    WebGLRenderingContext(HTMLCanvasElement*, PassRefPtr<GraphicsContext3D>, GraphicsContext3D::Attributes);
     void initializeNewContext();
     void setupFlags();
 
     void addObject(WebGLObject*);
     void detachAndRemoveAllObjects();
     WebGLTexture* findTexture(Platform3DObject);
     WebGLRenderbuffer* findRenderbuffer(Platform3DObject);
     WebGLBuffer* findBuffer(Platform3DObject);
     WebGLShader* findShader(Platform3DObject);
 
@@ skipping 28 matching lines @@
     // Precise but slow index validation -- only done if conservative checks fail
     bool validateIndexArrayPrecise(unsigned long count, unsigned long type, long offset, long& numElementsRequired);
     // If numElements <= 0, we only check if each enabled vertex attribute is bound to a buffer.
     bool validateRenderingState(long numElements);
 
     bool validateWebGLObject(WebGLObject* object);
 
     PassRefPtr<Image> videoFrameToImage(HTMLVideoElement* video);
 
     RefPtr<GraphicsContext3D> m_context;
+
+    class WebGLRenderingContextRestoreTimer : public TimerBase {
+    public:
+        WebGLRenderingContextRestoreTimer(WebGLRenderingContext* context) : m_context(context) { }
+    private:
+        virtual void fired();
+        WebGLRenderingContext* m_context;
+    };
+
+    WebGLRenderingContextRestoreTimer m_restoreTimer;
+
     bool m_needsUpdate;
     bool m_markedCanvasDirty;
     HashSet<RefPtr<WebGLObject> > m_canvasObjects;
 
     // List of bound VBO's. Used to maintain info about sizes for ARRAY_BUFFER and stored values for ELEMENT_ARRAY_BUFFER
     RefPtr<WebGLBuffer> m_boundArrayBuffer;
     RefPtr<WebGLBuffer> m_boundElementArrayBuffer;
 
     // Cached values for vertex attrib range checks
     class VertexAttribState {
@@ skipping 68 matching lines @@
     int m_maxCubeMapTextureSize;
     int m_maxTextureLevel;
     int m_maxCubeMapTextureLevel;
 
     int m_packAlignment;
     int m_unpackAlignment;
     bool m_unpackFlipY;
     bool m_unpackPremultiplyAlpha;
     unsigned long m_unpackColorspaceConversion;
     bool m_contextLost;
+    GraphicsContext3D::Attributes m_attributes;
 
     long m_stencilBits;
     unsigned long m_stencilMask;
     long m_stencilFuncRef; // Note that this is the user specified value, not the internal clamped value.
     unsigned long m_stencilFuncMask;
 
     bool m_isGLES2Compliant;
     bool m_isGLES2NPOTStrict;
     bool m_isErrorGeneratedOnOutOfBoundsAccesses;
     bool m_isResourceSafe;
@@ skipping 104 matching lines @@
     void initVertexAttrib0();
     bool simulateVertexAttrib0(long numVertex);
     void restoreStatesAfterVertexAttrib0Simulation();
 
     friend class WebGLStateRestorer;
 };
 
 } // namespace WebCore
 
 #endif