diff options
| author | Chris Craik <ccraik@google.com> | 2011-08-05 14:05:23 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2011-08-05 14:15:25 -0700 |
| commit | b7ca8e8315c6a4514200d2dbb823984267b4f9cc (patch) | |
| tree | 85eca75dd3499ff1276b3dbcd234f7638abf3c37 /Source/WebCore/platform/graphics/android/GLUtils.cpp | |
| parent | 2c05b037dcbc9de2f41781747422c2098c42c16e (diff) | |
| download | external_webkit-b7ca8e8315c6a4514200d2dbb823984267b4f9cc.zip external_webkit-b7ca8e8315c6a4514200d2dbb823984267b4f9cc.tar.gz external_webkit-b7ca8e8315c6a4514200d2dbb823984267b4f9cc.tar.bz2 | |
Force NativeWindow rendering to use EXTERNAL_OES textures
bug:5114637
Allows browser plugin to draw texture correctly
Change-Id: Ibd61b11598d0ca5bcff28ed0c92e6f20073f5ad6
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLUtils.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLUtils.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLUtils.cpp b/Source/WebCore/platform/graphics/android/GLUtils.cpp index d39b05b..5a6a158 100644 --- a/Source/WebCore/platform/graphics/android/GLUtils.cpp +++ b/Source/WebCore/platform/graphics/android/GLUtils.cpp @@ -623,21 +623,6 @@ void GLUtils::createTextureFromEGLImage(GLuint texture, EGLImageKHR image, GLint glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter); } -GLenum GLUtils::getTextureTarget(android::SurfaceTexture* surfaceTexture) -{ -#if DEPRECATED_SURFACE_TEXTURE_MODE - if (surfaceTexture) { - GLenum target = surfaceTexture->getCurrentTextureTarget(); - // TODO: remove this translation when TEXTURE_2D+RGBA surface texture - // support is deprecated. - if (target == GL_TEXTURE_2D) - return 0; - return target; - } -#endif - return GL_TEXTURE_2D; -} - } // namespace WebCore #endif // USE(ACCELERATED_COMPOSITING) |