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

Unified Diff: WebCore/html/canvas/WebGLRenderingContext.h

Issue 5511013: Merge 73424 - 2010-12-06 Alexey Marinichev <amarinichev@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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 | « no previous file | WebCore/html/canvas/WebGLRenderingContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/html/canvas/WebGLRenderingContext.h
===================================================================
--- WebCore/html/canvas/WebGLRenderingContext.h (revision 73479)
+++ WebCore/html/canvas/WebGLRenderingContext.h (working copy)
@@ -32,6 +32,7 @@
#include "GraphicsContext3D.h"
#include "Int32Array.h"
#include "PlatformString.h"
+#include "Timer.h"
#include "Uint8Array.h"
#include "WebGLGetInfo.h"
@@ -175,7 +176,7 @@
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*);
@@ -294,7 +295,7 @@
private:
friend class WebGLObject;
- WebGLRenderingContext(HTMLCanvasElement*, PassRefPtr<GraphicsContext3D>);
+ WebGLRenderingContext(HTMLCanvasElement*, PassRefPtr<GraphicsContext3D>, GraphicsContext3D::Attributes);
void initializeNewContext();
void setupFlags();
@@ -343,6 +344,17 @@
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;
@@ -431,6 +443,7 @@
bool m_unpackPremultiplyAlpha;
unsigned long m_unpackColorspaceConversion;
bool m_contextLost;
+ GraphicsContext3D::Attributes m_attributes;
long m_stencilBits;
unsigned long m_stencilMask;
« no previous file with comments | « no previous file | WebCore/html/canvas/WebGLRenderingContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698