Roll DEPS for WebKit 50358:50395. Includes build fix for WebGL (fallout from...

webkit/api/src/GraphicsContext3D.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1935 matching lines @@
                                 format,
                                 GL_UNSIGNED_BYTE,
                                 row);
             }
             delete[] row;
         }
     }
     return 0;
 }
 
-int GraphicsContext3D::texImage2D(unsigned target, unsigned level, HTMLImageElement* image,
+int GraphicsContext3D::texImage2D(unsigned target, unsigned level, Image* image,
                                   bool flipY, bool premultiplyAlpha)
 {
-    CachedImage* cachedImage = image->cachedImage();
-    if (cachedImage == NULL) {
-        ASSERT_NOT_REACHED();
-        return -1;
-    }
-    Image* img = cachedImage->image();
+    ASSERT(image);
+
     int res = -1;
 #if PLATFORM(SKIA)
-    NativeImageSkia* skiaImage = img->nativeImageForCurrentFrame();
+    NativeImageSkia* skiaImage = image->nativeImageForCurrentFrame();
     if (skiaImage == NULL) {
         ASSERT_NOT_REACHED();
         return -1;
     }
     SkBitmap::Config skiaConfig = skiaImage->config();
     // FIXME: must support more image configurations.
     if (skiaConfig != SkBitmap::kARGB_8888_Config) {
         ASSERT_NOT_REACHED();
         return -1;
     }
     SkBitmap& skiaImageRef = *skiaImage;
     SkAutoLockPixels lock(skiaImageRef);
     int width = skiaImage->width();
     int height = skiaImage->height();
     unsigned char* pixels =
         reinterpret_cast<unsigned char*>(skiaImage->getPixels());
     int rowBytes = skiaImage->rowBytes();
     res = texImage2DHelper(target, level,
                            width, height,
                            rowBytes,
                            flipY, premultiplyAlpha,
                            GL_BGRA,
                            false,
                            pixels);
 #elif PLATFORM(CG)
-    CGImageRef cgImage = img->nativeImageForCurrentFrame();
+    CGImageRef cgImage = image->nativeImageForCurrentFrame();
     if (cgImage == NULL) {
         ASSERT_NOT_REACHED();
         return -1;
     }
     int width = CGImageGetWidth(cgImage);
     int height = CGImageGetHeight(cgImage);
     int rowBytes = width * 4;
     CGImageAlphaInfo info = CGImageGetAlphaInfo(cgImage);
     bool skipAlpha = (info == kCGImageAlphaNone ||
                       info == kCGImageAlphaNoneSkipLast ||
@@ skipping 10 matching lines @@
     CGContextRelease(tmpContext);
     res = texImage2DHelper(target, level, width, height, rowBytes,
                            flipY, premultiplyAlpha, GL_RGBA, skipAlpha, imageData);
     delete[] imageData;
 #else
 #error Must port to your platform
 #endif
     return res;
 }
 
-int GraphicsContext3D::texImage2D(unsigned target, unsigned level, HTMLCanvasElement* canvas,
-                                  bool flipY, bool premultiplyAlpha)
-{
-    // FIXME: implement.
-    notImplemented();
-    return -1;
-}
-
 int GraphicsContext3D::texImage2D(unsigned target, unsigned level, HTMLVideoElement* video,
                                   bool flipY, bool premultiplyAlpha)
 {
     // FIXME: implement.
     notImplemented();
     return -1;
 }
 
 GL_SAME_METHOD_3(TexParameterf, texParameterf, unsigned, unsigned, float);
 
@@ skipping 28 matching lines @@
     notImplemented();
     return -1;
 }
 
 int GraphicsContext3D::texSubImage2D(unsigned target,
                                      unsigned level,
                                      unsigned xoffset,
                                      unsigned yoffset,
                                      unsigned width,
                                      unsigned height,
-                                     HTMLImageElement* image,
+                                     Image* image,
                                      bool flipY,
                                      bool premultiplyAlpha)
 {
     // FIXME: implement.
     notImplemented();
     return -1;
 }
 
 int GraphicsContext3D::texSubImage2D(unsigned target,
                                      unsigned level,
                                      unsigned xoffset,
                                      unsigned yoffset,
                                      unsigned width,
                                      unsigned height,
-                                     HTMLCanvasElement* canvas,
-                                     bool flipY,
-                                     bool premultiplyAlpha)
-{
-    // FIXME: implement.
-    notImplemented();
-    return -1;
-}
-
-int GraphicsContext3D::texSubImage2D(unsigned target,
-                                     unsigned level,
-                                     unsigned xoffset,
-                                     unsigned yoffset,
-                                     unsigned width,
-                                     unsigned height,
                                      HTMLVideoElement* video,
                                      bool flipY,
                                      bool premultiplyAlpha)
 {
     // FIXME: implement.
     notImplemented();
     return -1;
 }
 
 GL_SAME_METHOD_2(Uniform1f, uniform1f, long, float)
@@ skipping 122 matching lines @@
 
 void GraphicsContext3D::viewport(long x, long y, unsigned long width, unsigned long height)
 {
     makeContextCurrent();
     m_internal->viewportImpl(x, y, width, height);
 }
 
 }
 
 #endif // ENABLE(3D_CANVAS)