Changed GL enums from GraphicsContext3D to standard versions (Take 2)

Source/platform/graphics/GraphicsContext3DImagePacking.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2010 Mozilla Corporation. 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
@@ skipping 21 matching lines @@
 #include "platform/graphics/ImageObserver.h"
 
 namespace WebCore {
 
 namespace {
 
 GraphicsContext3D::DataFormat getDataFormat(GC3Denum destinationFormat, GC3Denum destinationType)
 {
     GraphicsContext3D::DataFormat dstFormat = GraphicsContext3D::DataFormatRGBA8;
     switch (destinationType) {
-    case GraphicsContext3D::UNSIGNED_BYTE:
+    case GL_UNSIGNED_BYTE:
         switch (destinationFormat) {
-        case GraphicsContext3D::RGB:
+        case GL_RGB:
             dstFormat = GraphicsContext3D::DataFormatRGB8;
             break;
-        case GraphicsContext3D::RGBA:
+        case GL_RGBA:
             dstFormat = GraphicsContext3D::DataFormatRGBA8;
             break;
-        case GraphicsContext3D::ALPHA:
+        case GL_ALPHA:
             dstFormat = GraphicsContext3D::DataFormatA8;
             break;
-        case GraphicsContext3D::LUMINANCE:
+        case GL_LUMINANCE:
             dstFormat = GraphicsContext3D::DataFormatR8;
             break;
-        case GraphicsContext3D::LUMINANCE_ALPHA:
+        case GL_LUMINANCE_ALPHA:
             dstFormat = GraphicsContext3D::DataFormatRA8;
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         break;
-    case GraphicsContext3D::UNSIGNED_SHORT_4_4_4_4:
+    case GL_UNSIGNED_SHORT_4_4_4_4:
         dstFormat = GraphicsContext3D::DataFormatRGBA4444;
         break;
-    case GraphicsContext3D::UNSIGNED_SHORT_5_5_5_1:
+    case GL_UNSIGNED_SHORT_5_5_5_1:
         dstFormat = GraphicsContext3D::DataFormatRGBA5551;
         break;
-    case GraphicsContext3D::UNSIGNED_SHORT_5_6_5:
+    case GL_UNSIGNED_SHORT_5_6_5:
         dstFormat = GraphicsContext3D::DataFormatRGB565;
         break;
-    case GraphicsContext3D::HALF_FLOAT_OES: // OES_texture_half_float
+    case GL_HALF_FLOAT_OES: // OES_texture_half_float
         switch (destinationFormat) {
-        case GraphicsContext3D::RGB:
+        case GL_RGB:
             dstFormat = GraphicsContext3D::DataFormatRGB16F;
             break;
-        case GraphicsContext3D::RGBA:
+        case GL_RGBA:
             dstFormat = GraphicsContext3D::DataFormatRGBA16F;
             break;
-        case GraphicsContext3D::ALPHA:
+        case GL_ALPHA:
             dstFormat = GraphicsContext3D::DataFormatA16F;
             break;
-        case GraphicsContext3D::LUMINANCE:
+        case GL_LUMINANCE:
             dstFormat = GraphicsContext3D::DataFormatR16F;
             break;
-        case GraphicsContext3D::LUMINANCE_ALPHA:
+        case GL_LUMINANCE_ALPHA:
             dstFormat = GraphicsContext3D::DataFormatRA16F;
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         break;
-    case GraphicsContext3D::FLOAT: // OES_texture_float
+    case GL_FLOAT: // OES_texture_float
         switch (destinationFormat) {
-        case GraphicsContext3D::RGB:
+        case GL_RGB:
             dstFormat = GraphicsContext3D::DataFormatRGB32F;
             break;
-        case GraphicsContext3D::RGBA:
+        case GL_RGBA:
             dstFormat = GraphicsContext3D::DataFormatRGBA32F;
             break;
-        case GraphicsContext3D::ALPHA:
+        case GL_ALPHA:
             dstFormat = GraphicsContext3D::DataFormatA32F;
             break;
-        case GraphicsContext3D::LUMINANCE:
+        case GL_LUMINANCE:
             dstFormat = GraphicsContext3D::DataFormatR32F;
             break;
-        case GraphicsContext3D::LUMINANCE_ALPHA:
+        case GL_LUMINANCE_ALPHA:
             dstFormat = GraphicsContext3D::DataFormatRA32F;
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         break;
     default:
         ASSERT_NOT_REACHED();
     }
     return dstFormat;
@@ skipping 1352 matching lines @@
     unsigned width,
     unsigned height,
     unsigned sourceUnpackAlignment,
     Vector<uint8_t>& data)
 {
     if (!pixels)
         return false;
 
     unsigned packedSize;
     // Output data is tightly packed (alignment == 1).
-    if (computeImageSizeInBytes(format, type, width, height, 1, &packedSize, 0) != GraphicsContext3D::NO_ERROR)
+    if (computeImageSizeInBytes(format, type, width, height, 1, &packedSize, 0) != GL_NO_ERROR)
         return false;
     data.resize(packedSize);
 
     if (!packPixels(reinterpret_cast<const uint8_t*>(pixels), sourceFormat, width, height, sourceUnpackAlignment, format, type, alphaOp, data.data(), flipY))
         return false;
     if (ImageObserver *observer = image->imageObserver())
         observer->didDraw(image);
     return true;
 }
 
 bool GraphicsContext3D::extractImageData(
     const uint8_t* imageData,
     const IntSize& imageDataSize,
     GC3Denum format,
     GC3Denum type,
     bool flipY,
     bool premultiplyAlpha,
     Vector<uint8_t>& data)
 {
     if (!imageData)
         return false;
     int width = imageDataSize.width();
     int height = imageDataSize.height();
 
     unsigned packedSize;
     // Output data is tightly packed (alignment == 1).
-    if (computeImageSizeInBytes(format, type, width, height, 1, &packedSize, 0) != GraphicsContext3D::NO_ERROR)
+    if (computeImageSizeInBytes(format, type, width, height, 1, &packedSize, 0) != GL_NO_ERROR)
         return false;
     data.resize(packedSize);
 
     if (!packPixels(imageData, DataFormatRGBA8, width, height, 0, format, type, premultiplyAlpha ? AlphaDoPremultiply : AlphaDoNothing, data.data(), flipY))
         return false;
 
     return true;
 }
 
 bool GraphicsContext3D::extractTextureData(
@@ skipping 61 matching lines @@
 
     FormatConverter converter(width, height, sourceData, destinationData, srcStride, dstStride);
     converter.convert(sourceDataFormat, dstDataFormat, alphaOp);
     if (!converter.Success())
         return false;
     return true;
 }
 
 } // namespace WebCore