diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 12:56:41 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 12:56:41 +0000 |
| commit | 04d038520c4e62db74764450ab50f9d775665d4d (patch) | |
| tree | 84dfa288a8bce0b4e35440bc510deaa2592980e1 /webkit/api/src/GraphicsContext3D.cpp | |
| parent | 96852373fa012926cbac9053f0caec261776379b (diff) | |
| download | chromium_src-04d038520c4e62db74764450ab50f9d775665d4d.zip chromium_src-04d038520c4e62db74764450ab50f9d775665d4d.tar.gz chromium_src-04d038520c4e62db74764450ab50f9d775665d4d.tar.bz2 | |
Roll DEPS for WebKit 50358:50395. Includes build fix for WebGL (fallout from http://trac.webkit.org/changeset/50394).
BUG=none
TEST=will it blend-er, build?
R=kbr
Review URL: http://codereview.chromium.org/352002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api/src/GraphicsContext3D.cpp')
| -rw-r--r-- | webkit/api/src/GraphicsContext3D.cpp | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/webkit/api/src/GraphicsContext3D.cpp b/webkit/api/src/GraphicsContext3D.cpp index 2d394fd..4877340 100644 --- a/webkit/api/src/GraphicsContext3D.cpp +++ b/webkit/api/src/GraphicsContext3D.cpp @@ -1953,18 +1953,14 @@ static int texImage2DHelper(unsigned target, unsigned level, 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 @@ int GraphicsContext3D::texImage2D(unsigned target, unsigned level, HTMLImageElem 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 @@ int GraphicsContext3D::texImage2D(unsigned target, unsigned level, HTMLImageElem 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,22 +2065,7 @@ int GraphicsContext3D::texSubImage2D(unsigned target, unsigned yoffset, unsigned width, unsigned height, - HTMLImageElement* 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, + Image* image, bool flipY, bool premultiplyAlpha) { |