| Index: webkit/api/src/GraphicsContext3D.cpp
|
| ===================================================================
|
| --- webkit/api/src/GraphicsContext3D.cpp (revision 30684)
|
| +++ webkit/api/src/GraphicsContext3D.cpp (working copy)
|
| @@ -1953,18 +1953,14 @@
|
| 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;
|
| @@ -1990,7 +1986,7 @@
|
| false,
|
| pixels);
|
| #elif PLATFORM(CG)
|
| - CGImageRef cgImage = img->nativeImageForCurrentFrame();
|
| + CGImageRef cgImage = image->nativeImageForCurrentFrame();
|
| if (cgImage == NULL) {
|
| ASSERT_NOT_REACHED();
|
| return -1;
|
| @@ -2021,14 +2017,6 @@
|
| 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)
|
| {
|
| @@ -2077,7 +2065,7 @@
|
| unsigned yoffset,
|
| unsigned width,
|
| unsigned height,
|
| - HTMLImageElement* image,
|
| + Image* image,
|
| bool flipY,
|
| bool premultiplyAlpha)
|
| {
|
| @@ -2092,21 +2080,6 @@
|
| 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)
|
|
|