From 2e53075daf31a5db8b44d2caebb6d8c330366b43 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Mon, 25 Jun 2012 15:40:43 +0000 Subject: [PATCH] Add static qualifier to GraphicsContext3D::extractImageData. https://bugs.webkit.org/show_bug.cgi?id=89866 GraphicsContext3D::extractImageData does not use member variables. Each platform Accelerated-compositing implementation can use this method in order to get pixel data of an Image or ImageBuffer object. Patch by Huang Dongsung on 2012-06-25 Reviewed by Noam Rosenthal. No new tests since there's no change on code behavior. * platform/graphics/GraphicsContext3D.h: (GraphicsContext3D): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121159 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 16 ++++++++++++++++ Source/WebCore/platform/graphics/GraphicsContext3D.h | 14 +++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 23f1514..d45ab46 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,19 @@ +2012-06-25 Huang Dongsung + + Add static qualifier to GraphicsContext3D::extractImageData. + https://bugs.webkit.org/show_bug.cgi?id=89866 + + GraphicsContext3D::extractImageData does not use member variables. + Each platform Accelerated-compositing implementation can use this method in + order to get pixel data of an Image or ImageBuffer object. + + Reviewed by Noam Rosenthal. + + No new tests since there's no change on code behavior. + + * platform/graphics/GraphicsContext3D.h: + (GraphicsContext3D): + 2012-06-25 Pavel Feldman Web Inspector: toggling style should not start property edit first. diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.h b/Source/WebCore/platform/graphics/GraphicsContext3D.h index b6c1b64..dbd9dfe 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext3D.h +++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h @@ -555,7 +555,7 @@ public: // return the suggested GL error indicating the cause of the failure: // INVALID_VALUE if width/height is negative or overflow happens. // INVALID_ENUM if format/type is illegal. - GC3Denum computeImageSizeInBytes(GC3Denum format, + static GC3Denum computeImageSizeInBytes(GC3Denum format, GC3Denum type, GC3Dsizei width, GC3Dsizei height, @@ -567,7 +567,7 @@ public: // packing the pixel data according to the given format and type, // and obeying the flipY, premultiplyAlpha, and ignoreGammaAndColorProfile // flags. Returns true upon success. - bool extractImageData(Image* image, + static bool extractImageData(Image*, GC3Denum format, GC3Denum type, bool flipY, @@ -579,7 +579,7 @@ public: // packing the pixel data according to the given format and type, // and obeying the flipY and premultiplyAlpha flags. Returns true // upon success. - bool extractImageData(ImageData*, + static bool extractImageData(ImageData*, GC3Denum format, GC3Denum type, bool flipY, @@ -591,7 +591,7 @@ public: // 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. - bool extractTextureData(unsigned int width, unsigned int height, + static bool extractTextureData(unsigned int width, unsigned int height, GC3Denum format, GC3Denum type, unsigned int unpackAlignment, bool flipY, bool premultiplyAlpha, @@ -599,7 +599,7 @@ public: Vector& data); // Flips the given image data vertically, in-place. - void flipVertically(void* imageData, + static void flipVertically(void* imageData, unsigned int width, unsigned int height, unsigned int bytesPerPixel, @@ -888,7 +888,7 @@ public: // // No vertical flip of the image data is performed by this // method. - bool getImageData(Image* image, + static bool getImageData(Image*, GC3Denum format, GC3Denum type, bool premultiplyAlpha, @@ -909,7 +909,7 @@ public: // 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. - bool packPixels(const uint8_t* sourceData, + static bool packPixels(const uint8_t* sourceData, SourceDataFormat sourceDataFormat, unsigned int width, unsigned int height, -- 2.7.4