Index: Source/platform/graphics/GraphicsContext3D.h |
diff --git a/Source/platform/graphics/GraphicsContext3D.h b/Source/platform/graphics/GraphicsContext3D.h |
index 3bd10a10ff18a1ea3cec0b06150cd1f5296a62df..43647278c9d672e9dbcdbccc40ba1bac515562f2 100644 |
--- a/Source/platform/graphics/GraphicsContext3D.h |
+++ b/Source/platform/graphics/GraphicsContext3D.h |
@@ -101,21 +101,6 @@ public: |
KURL topDocumentURL; |
}; |
- class ContextLostCallback { |
- public: |
- virtual void onContextLost() = 0; |
- virtual ~ContextLostCallback() {} |
- }; |
- |
- class ErrorMessageCallback { |
- public: |
- virtual void onErrorMessage(const String& message, GLint id) = 0; |
- virtual ~ErrorMessageCallback() { } |
- }; |
- |
- void setContextLostCallback(PassOwnPtr<ContextLostCallback>); |
- void setErrorMessageCallback(PassOwnPtr<ErrorMessageCallback>); |
- |
// This is the preferred method for creating an instance of this class. When created this way the webContext |
// is not owned by the GraphicsContext3D |
static PassRefPtr<GraphicsContext3D> createContextSupport(blink::WebGraphicsContext3D* webContext); |
@@ -137,8 +122,6 @@ public: |
bool makeContextCurrent(); |
- uint32_t lastFlushID(); |
- |
// Helper to texImage2D with pixel==0 case: pixels are initialized to 0. |
// Return true if no GL error is synthesized. |
// By default, alignment is 4, the OpenGL default setting. |
@@ -403,7 +386,8 @@ public: |
bool supportsExtension(const String& name); |
bool ensureExtensionEnabled(const String& name); |
bool isExtensionEnabled(const String& name); |
- bool canUseCopyTextureCHROMIUM(GLenum destFormat, GLenum destType, GLint level); |
+ |
+ static bool canUseCopyTextureCHROMIUM(GLenum destFormat, GLenum destType, GLint level); |
void paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer*); |
@@ -425,12 +409,8 @@ private: |
void initializeExtensions(); |
- bool preserveDrawingBuffer() const { return m_preserveDrawingBuffer; } |
- |
OwnPtr<blink::WebGraphicsContext3DProvider> m_provider; |
blink::WebGraphicsContext3D* m_impl; |
- OwnPtr<GraphicsContext3DContextLostCallbackAdapter> m_contextLostCallbackAdapter; |
- OwnPtr<GraphicsContext3DErrorMessageCallbackAdapter> m_errorMessageCallbackAdapter; |
OwnPtr<blink::WebGraphicsContext3D> m_ownedWebContext; |
bool m_initializedAvailableExtensions; |
HashSet<String> m_enabledExtensions; |