Title: [108882] trunk/Source/WebCore
- Revision
- 108882
- Author
- yael.aha...@nokia.com
- Date
- 2012-02-24 18:41:41 -0800 (Fri, 24 Feb 2012)
Log Message
[Texmap] Add const-ness to TextureMapperShaderManager
https://bugs.webkit.org/show_bug.cgi?id=79545
Reviewed by Noam Rosenthal.
Add const to new methods.
No new tests.
* platform/graphics/texmap/TextureMapperShaderManager.cpp:
(WebCore::TextureMapperShaderProgramSimple::vertexShaderSource):
(WebCore::TextureMapperShaderProgramSimple::fragmentShaderSource):
(WebCore::TextureMapperShaderProgramOpacityAndMask::vertexShaderSource):
(WebCore::TextureMapperShaderProgramOpacityAndMask::fragmentShaderSource):
* platform/graphics/texmap/TextureMapperShaderManager.h:
(WebCore::TextureMapperShaderProgram::matrixVariable):
(WebCore::TextureMapperShaderProgram::sourceMatrixVariable):
(WebCore::TextureMapperShaderProgram::sourceTextureVariable):
(WebCore::TextureMapperShaderProgram::opacityVariable):
(TextureMapperShaderProgram):
(TextureMapperShaderProgramSimple):
(WebCore::TextureMapperShaderProgramOpacityAndMask::maskMatrixVariable):
(WebCore::TextureMapperShaderProgramOpacityAndMask::maskTextureVariable):
(TextureMapperShaderProgramOpacityAndMask):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108881 => 108882)
--- trunk/Source/WebCore/ChangeLog 2012-02-25 02:39:10 UTC (rev 108881)
+++ trunk/Source/WebCore/ChangeLog 2012-02-25 02:41:41 UTC (rev 108882)
@@ -1,3 +1,29 @@
+2012-02-24 Yael Aharon <yael.aha...@nokia.com>
+
+ [Texmap] Add const-ness to TextureMapperShaderManager
+ https://bugs.webkit.org/show_bug.cgi?id=79545
+
+ Reviewed by Noam Rosenthal.
+
+ Add const to new methods.
+ No new tests.
+
+ * platform/graphics/texmap/TextureMapperShaderManager.cpp:
+ (WebCore::TextureMapperShaderProgramSimple::vertexShaderSource):
+ (WebCore::TextureMapperShaderProgramSimple::fragmentShaderSource):
+ (WebCore::TextureMapperShaderProgramOpacityAndMask::vertexShaderSource):
+ (WebCore::TextureMapperShaderProgramOpacityAndMask::fragmentShaderSource):
+ * platform/graphics/texmap/TextureMapperShaderManager.h:
+ (WebCore::TextureMapperShaderProgram::matrixVariable):
+ (WebCore::TextureMapperShaderProgram::sourceMatrixVariable):
+ (WebCore::TextureMapperShaderProgram::sourceTextureVariable):
+ (WebCore::TextureMapperShaderProgram::opacityVariable):
+ (TextureMapperShaderProgram):
+ (TextureMapperShaderProgramSimple):
+ (WebCore::TextureMapperShaderProgramOpacityAndMask::maskMatrixVariable):
+ (WebCore::TextureMapperShaderProgramOpacityAndMask::maskTextureVariable):
+ (TextureMapperShaderProgramOpacityAndMask):
+
2012-02-24 Tom Sepez <tse...@chromium.org>
XSS Auditor targeting legitimate frames as false positives.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.cpp (108881 => 108882)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.cpp 2012-02-25 02:39:10 UTC (rev 108881)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.cpp 2012-02-25 02:41:41 UTC (rev 108882)
@@ -146,12 +146,12 @@
getUniformLocation(m_opacityVariable, "Opacity");
}
-const char* TextureMapperShaderProgramSimple::vertexShaderSource()
+const char* TextureMapperShaderProgramSimple::vertexShaderSource() const
{
return vertexShaderSourceSimple;
}
-const char* TextureMapperShaderProgramSimple::fragmentShaderSource()
+const char* TextureMapperShaderProgramSimple::fragmentShaderSource() const
{
return fragmentShaderSourceSimple;
}
@@ -177,12 +177,12 @@
getUniformLocation(m_opacityVariable, "Opacity");
}
-const char* TextureMapperShaderProgramOpacityAndMask::vertexShaderSource()
+const char* TextureMapperShaderProgramOpacityAndMask::vertexShaderSource() const
{
return vertexShaderSourceOpacityAndMask;
}
-const char* TextureMapperShaderProgramOpacityAndMask::fragmentShaderSource()
+const char* TextureMapperShaderProgramOpacityAndMask::fragmentShaderSource() const
{
return fragmentShaderSourceOpacityAndMask;
}
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h (108881 => 108882)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h 2012-02-25 02:39:10 UTC (rev 108881)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h 2012-02-25 02:41:41 UTC (rev 108882)
@@ -53,16 +53,16 @@
}
virtual void prepare(float opacity, const BitmapTexture*) { }
- GLint matrixVariable() { return m_matrixVariable; }
- GLint sourceMatrixVariable() { return m_sourceMatrixVariable; }
- GLint sourceTextureVariable() { return m_sourceTextureVariable; }
- GLint opacityVariable() { return m_opacityVariable; }
+ GLint matrixVariable() const { return m_matrixVariable; }
+ GLint sourceMatrixVariable() const { return m_sourceMatrixVariable; }
+ GLint sourceTextureVariable() const { return m_sourceTextureVariable; }
+ GLint opacityVariable() const { return m_opacityVariable; }
protected:
void getUniformLocation(GLint& var, const char* name);
void initializeProgram();
- virtual const char* vertexShaderSource() = 0;
- virtual const char* fragmentShaderSource() = 0;
+ virtual const char* vertexShaderSource() const = 0;
+ virtual const char* fragmentShaderSource() const = 0;
GLuint m_id;
GLuint m_vertexAttrib;
@@ -80,8 +80,8 @@
virtual void prepare(float opacity, const BitmapTexture*);
private:
- virtual const char* vertexShaderSource();
- virtual const char* fragmentShaderSource();
+ virtual const char* vertexShaderSource() const;
+ virtual const char* fragmentShaderSource() const;
TextureMapperShaderProgramSimple();
};
@@ -89,13 +89,13 @@
public:
static PassRefPtr<TextureMapperShaderProgramOpacityAndMask> create();
virtual void prepare(float opacity, const BitmapTexture*);
- GLint maskMatrixVariable() { return m_maskMatrixVariable; }
- GLint maskTextureVariable() { return m_maskTextureVariable; }
+ GLint maskMatrixVariable() const { return m_maskMatrixVariable; }
+ GLint maskTextureVariable() const { return m_maskTextureVariable; }
private:
static int m_classID;
- virtual const char* vertexShaderSource();
- virtual const char* fragmentShaderSource();
+ virtual const char* vertexShaderSource() const;
+ virtual const char* fragmentShaderSource() const;
TextureMapperShaderProgramOpacityAndMask();
GLint m_maskMatrixVariable;
GLint m_maskTextureVariable;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
