Completely removed the Extensions3D class (Take 2)

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 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef GraphicsContext3D_h
 #define GraphicsContext3D_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntRect.h"
-#include "platform/graphics/Extensions3D.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.
 #if OS(WIN)
 #undef NO_ERROR
 #endif
 
 class GrContext;
 
 namespace blink {
 class WebGraphicsContext3D;
 class WebGraphicsContext3DProvider;
 }
 
 namespace WebCore {
 class DrawingBuffer;
-class Extensions3D;
 class GraphicsContext3DContextLostCallbackAdapter;
 class GraphicsContext3DErrorMessageCallbackAdapter;
 class Image;
 class ImageBuffer;
 class IntRect;
 class IntSize;
 
 struct ActiveInfo {
     String name;
     GLenum type;
@@ skipping 225 matching lines @@
     // Synthesizes an OpenGL error which will be returned from a
     // later call to getError. This is used to emulate OpenGL ES
     // 2.0 behavior on the desktop and to enforce additional error
     // checking mandated by WebGL.
     //
     // Per the behavior of glGetError, this stores at most one
     // instance of any given error, and returns them from calls to
     // getError in the order they were added.
     void synthesizeGLError(GLenum error);
 
-    // Support for extensions. Returns a non-null object, though not
-    // all methods it contains may necessarily be supported on the
-    // current hardware. Must call Extensions3D::supports() to
-    // determine this.
-    Extensions3D* extensions();
-
     static unsigned getClearBitsByFormat(GLenum);
 
     enum ChannelBits {
         ChannelRed = 1,
         ChannelGreen = 2,
         ChannelBlue = 4,
         ChannelAlpha = 8,
         ChannelDepth = 16,
         ChannelStencil = 32,
         ChannelRGB = ChannelRed | ChannelGreen | ChannelBlue,
@@ skipping 77 matching lines @@
         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);
 
-    // Extensions3D support.
+    // 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*);
 
 private:
-    friend class Extensions3D;
-
     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);
 
-    void paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer*);
     // 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;
-    OwnPtr<Extensions3D> m_extensions;
     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