Removed most calls to GraphicsContext3D from DrawingBuffer

Source/platform/graphics/GraphicsContext3D.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 15 matching lines @@
 #ifndef GraphicsContext3D_h
 #define GraphicsContext3D_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsTypes3D.h"
 #include "platform/graphics/Image.h"
 #include "platform/weborigin/KURL.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
 // FIXME: Find a better way to avoid the name confliction for NO_ERROR.
@@ skipping 47 matching lines @@
         bool antialias;
         bool premultipliedAlpha;
         bool preserveDrawingBuffer;
         bool noExtensions;
         bool shareResources;
         bool preferDiscreteGPU;
         bool failIfMajorPerformanceCaveat;
         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);
 
     // The following three creation methods are obsolete and should not be used by new code. They will be removed soon.
 
     // Callers must make the context current before using it AND check that the context was created successfully
     // via ContextLost before using the context in any way. Once made current on a thread, the context cannot
     // be used on any other thread.
     static PassRefPtr<GraphicsContext3D> create(Attributes);
     static PassRefPtr<GraphicsContext3D> createGraphicsContextFromWebContext(PassOwnPtr<blink::WebGraphicsContext3D>, bool preserveDrawingBuffer = false);
     static PassRefPtr<GraphicsContext3D> createGraphicsContextFromProvider(PassOwnPtr<blink::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer = false);
 
 
     ~GraphicsContext3D();
 
     GrContext* grContext();
     blink::WebGraphicsContext3D* webContext() const { return m_impl; }
 
     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.
-    bool texImage2DResourceSafe(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLint alignment = 4);
-
     //----------------------------------------------------------------------
     // Helpers for texture uploading and pixel readback.
     //
 
     // Computes the components per pixel and bytes per component
     // for the given format and type combination. Returns false if
     // either was an invalid enum.
     static bool computeFormatAndTypeParameters(GLenum format, GLenum type, unsigned* componentsPerPixel, unsigned* bytesPerComponent);
 
     // Computes the image size in bytes. If paddingInBytes is not null, padding
@@ skipping 106 matching lines @@
     void uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z);
     void uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
     void uniformMatrix4fv(GLint location, GLsizei, GLboolean transpose, GLfloat* value);
 
     void useProgram(Platform3DObject);
 
     void vertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
 
     void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
 
-    void markContextChanged();
-    void markLayerComposited();
-    bool layerComposited() const;
-
-    void paintRenderingResultsToCanvas(ImageBuffer*, DrawingBuffer*);
-    PassRefPtr<Uint8ClampedArray> paintRenderingResultsToImageData(DrawingBuffer*, int&, int&);
-
     // Support for buffer creation and deletion
     Platform3DObject createBuffer();
     Platform3DObject createFramebuffer();
     Platform3DObject createProgram();
     Platform3DObject createRenderbuffer();
     Platform3DObject createShader(GLenum);
     Platform3DObject createTexture();
 
     void deleteBuffer(Platform3DObject);
     void deleteFramebuffer(Platform3DObject);
@@ skipping 90 matching lines @@
 
     // Helper function which extracts the user-supplied texture
     // data, applying the flipY and premultiplyAlpha parameters.
     // If the data is not tightly packed according to the passed
     // unpackAlignment, the output data will be tightly packed.
     // Returns true if successful, false if any error occurred.
     static bool extractTextureData(unsigned width, unsigned height, GLenum format, GLenum type, unsigned unpackAlignment, bool flipY, bool premultiplyAlpha, const void* pixels, Vector<uint8_t>& data);
 
     // End GraphicsContext3DImagePacking.cpp functions
 
-    // This is the order of bytes to use when doing a readback.
-    enum ReadbackOrder {
-        ReadbackRGBA,
-        ReadbackSkia
-    };
-
-    // Helper function which does a readback from the currently-bound
-    // framebuffer into a buffer of a certain size with 4-byte pixels.
-    void readBackFramebuffer(unsigned char* pixels, int width, int height, ReadbackOrder, AlphaOp);
-
-    void setPackAlignment(GLint param);
-
     // Extension support.
     bool supportsExtension(const String& name);
     bool ensureExtensionEnabled(const String& name);
     bool isExtensionEnabled(const String& name);
-    bool canUseCopyTextureCHROMIUM(GLenum destFormat, GLenum destType, GLint level);
 
-    void paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer*);
+    static bool canUseCopyTextureCHROMIUM(GLenum destFormat, GLenum destType, GLint level);
 
 private:
     GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3D>, bool preserveDrawingBuffer);
     GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer);
     GraphicsContext3D(blink::WebGraphicsContext3D* webContext);
 
     // Helper for packImageData/extractImageData/extractTextureData which implement packing of pixel
     // data into the specified OpenGL destination format and type.
     // A sourceUnpackAlignment of zero indicates that the source
     // data is tightly packed. Non-zero values may take a slow path.
     // Destination data will have no gaps between rows.
     // Implemented in GraphicsContext3DImagePacking.cpp
     static bool packPixels(const uint8_t* sourceData, DataFormat sourceDataFormat, unsigned width, unsigned height, unsigned sourceUnpackAlignment, unsigned destinationFormat, unsigned destinationType, AlphaOp, void* destinationData, bool flipY);
 
-    // Helper function to flip a bitmap vertically.
-    void flipVertically(uint8_t* data, int width, int height);
-
     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;
     HashSet<String> m_requestableExtensions;
-    bool m_layerComposited;
     bool m_preserveDrawingBuffer;
-    int m_packAlignment;
-
-    // If the width and height of the Canvas's backing store don't
-    // match those that we were given in the most recent call to
-    // reshape(), then we need an intermediate bitmap to read back the
-    // frame buffer into. This seems to happen when CSS styles are
-    // used to resize the Canvas.
-    SkBitmap m_resizingBitmap;
-
     GrContext* m_grContext;
-
-    // Used to flip a bitmap vertically.
-    Vector<uint8_t> m_scanline;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContext3D_h