[Texmap] Consolidate the common parts of TextureMapperGL::drawTexture
authoryael.aharon@nokia.com <yael.aharon@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Feb 2012 17:02:46 +0000 (17:02 +0000)
committeryael.aharon@nokia.com <yael.aharon@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Feb 2012 17:02:46 +0000 (17:02 +0000)
commit175f6ae23bfb6db4aa6751a6a4d2e4eea1e9ccdd
treecb4f72b5df88c9a3b3cc0b54d912c66ef951e50f
parent2fe5ee2b73659baf459b40504df72310d823da02
[Texmap] Consolidate the common parts of TextureMapperGL::drawTexture
https://bugs.webkit.org/show_bug.cgi?id=79143

Reviewed by Noam Rosenthal.

Combine the two drawTexture methods into one, and extract the part that
could not be combined into its own method.
No new tests. Refactoring only.

* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore):
(WebCore::TextureMapperGL::drawTexture):
* platform/graphics/texmap/TextureMapperGL.h:
(WebCore):
(BitmapTextureGL):
(WebCore::BitmapTextureGL::~BitmapTextureGL):
(WebCore::BitmapTextureGL::id):
(WebCore::BitmapTextureGL::relativeSize):
(WebCore::BitmapTextureGL::setTextureMapper):
(WebCore::BitmapTextureGL::BitmapTextureGL):
* platform/graphics/texmap/TextureMapperShaderManager.cpp:
(WebCore::TextureMapperShaderProgramOpacityAndMask::fragmentShaderSource):
(WebCore):
(WebCore::TextureMapperShaderProgramOpacityAndMask::prepare):
* platform/graphics/texmap/TextureMapperShaderManager.h:
(WebCore):
(WebCore::TextureMapperShaderProgram::prepare):
(WebCore::TextureMapperShaderProgram::matrixVariable):
(WebCore::TextureMapperShaderProgram::sourceMatrixVariable):
(WebCore::TextureMapperShaderProgram::sourceTextureVariable):
(WebCore::TextureMapperShaderProgram::opacityVariable):
(TextureMapperShaderProgram):
(TextureMapperShaderProgramSimple):
(TextureMapperShaderProgramOpacityAndMask):
(WebCore::TextureMapperShaderProgramOpacityAndMask::maskMatrixVariable):
(WebCore::TextureMapperShaderProgramOpacityAndMask::maskTextureVariable):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@108810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperGL.h
Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h