Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / canvas / WebGLRenderingContextBase.h

diff --git a/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContextBase.h b/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContextBase.h
index 8de7d27..595f171 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContextBase.h
+++ b/src/third_party/WebKit/Source/core/html/canvas/WebGLRenderingContextBase.h
@@ -104,8 +104,6 @@ class WebGLRenderingContextBase: public CanvasRenderingContext, public ActiveDOM
 public:
     virtual ~WebGLRenderingContextBase();
 
-    virtual bool is3d() const OVERRIDE { return true; }
-    virtual bool isAccelerated() const OVERRIDE { return true; }
     virtual unsigned version() const = 0;
     virtual String contextName() const = 0;
     virtual void registerContextExtensions() = 0;
@@ -316,30 +314,40 @@ public:
 
     void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
 
-    // WEBKIT_lose_context support
+    // WEBGL_lose_context support
     enum LostContextMode {
+        NotLostContext,
+
         // Lost context occurred at the graphics system level.
         RealLostContext,
 
-        // Lost context provoked by WEBKIT_lose_context.
+        // Lost context provoked by WEBGL_lose_context.
+        WebGLLoseContextLostContext,
+
+        // Lost context occurred due to internal implementation reasons.
         SyntheticLostContext,
+    };
+    enum AutoRecoveryMethod {
+        // Don't restore automatically.
+        Manual,
+
+        // Restore when resources are available.
+        WhenAvailable,
 
-        // A synthetic lost context that should attempt to recover automatically
-        AutoRecoverSyntheticLostContext
+        // Restore as soon as possible.
+        Auto
     };
-    void forceLostContext(LostContextMode);
+    void forceLostContext(LostContextMode, AutoRecoveryMethod);
     void forceRestoreContext();
-    void loseContextImpl(LostContextMode);
+    void loseContextImpl(LostContextMode, AutoRecoveryMethod);
 
     blink::WebGraphicsContext3D* webContext() const { return drawingBuffer()->context(); }
     WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); }
-    virtual blink::WebLayer* platformLayer() const OVERRIDE;
     Extensions3DUtil* extensionsUtil();
 
     void reshape(int width, int height);
 
     void markLayerComposited();
-    virtual void paintRenderingResultsToCanvas() OVERRIDE;
     PassRefPtrWillBeRawPtr<ImageData> paintRenderingResultsToImageData();
 
     void removeSharedObject(WebGLSharedObject*);
@@ -388,6 +396,13 @@ protected:
     PassRefPtr<WebGLSharedWebGraphicsContext3D> sharedWebGraphicsContext3D() const;
 #endif
 
+    // CanvasRenderingContext implementation.
+    virtual bool is3d() const OVERRIDE { return true; }
+    virtual bool isAccelerated() const OVERRIDE { return true; }
+    virtual void setIsHidden(bool) OVERRIDE;
+    virtual void paintRenderingResultsToCanvas() OVERRIDE;
+    virtual blink::WebLayer* platformLayer() const OVERRIDE;
+
     void addSharedObject(WebGLSharedObject*);
     void addContextObject(WebGLContextObject*);
     void detachAndRemoveAllObjects();
@@ -430,8 +445,10 @@ protected:
 
     RefPtr<WebGLContextGroup> m_contextGroup;
 
+    LostContextMode m_contextLostMode;
+    AutoRecoveryMethod m_autoRecoveryMethod;
     // Dispatches a context lost event once it is determined that one is needed.
-    // This is used both for synthetic and real context losses. For real ones, it's
+    // This is used for synthetic, WEBGL_lose_context and real context losses. For real ones, it's
     // likely that there's no JavaScript on the stack, but that might be dependent
     // on how exactly the platform discovers that the context was lost. For better
     // portability we always defer the dispatch of the event.
@@ -527,8 +544,6 @@ protected:
     bool m_unpackFlipY;
     bool m_unpackPremultiplyAlpha;
     GLenum m_unpackColorspaceConversion;
-    bool m_contextLost;
-    LostContextMode m_contextLostMode;
     RefPtrWillBeMember<WebGLContextAttributes> m_requestedAttributes;
 
     bool m_layerCleared;
@@ -931,7 +946,9 @@ protected:
     static Vector<WebGLRenderingContextBase*>& forciblyEvictedContexts();
 
     static void activateContext(WebGLRenderingContextBase*);
-    static void deactivateContext(WebGLRenderingContextBase*, bool addToInactiveList);
+    static void deactivateContext(WebGLRenderingContextBase*);
+    static void addToEvictedList(WebGLRenderingContextBase*);
+    static void removeFromEvictedList(WebGLRenderingContextBase*);
     static void willDestroyContext(WebGLRenderingContextBase*);
     static void forciblyLoseOldestContext(const String& reason);
     // Return the least recently used context's position in the active context vector.