From c753e25a8b4366c44134a8c21b9ed3392bf48608 Mon Sep 17 00:00:00 2001 From: "enne@chromium.org" Date: Fri, 19 Oct 2012 21:22:42 +0000 Subject: Revert "cc: Rename cc classes and members to match filenames" This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cc/shader.h') diff --git a/cc/shader.h b/cc/shader.h index 3934d9f..fa87b68 100644 --- a/cc/shader.h +++ b/cc/shader.h @@ -303,7 +303,7 @@ public: int uTextureLocation() const { return m_uTextureLocation; } int vTextureLocation() const { return m_vTextureLocation; } int alphaLocation() const { return m_alphaLocation; } - int matrixLocation() const { return m_ccMatrixLocation; } + int ccMatrixLocation() const { return m_ccMatrixLocation; } int yuvAdjLocation() const { return m_yuvAdjLocation; } private: -- cgit v1.1