summaryrefslogtreecommitdiffstats
path: root/cc/shader.h
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 21:22:42 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 21:22:42 +0000
commitc753e25a8b4366c44134a8c21b9ed3392bf48608 (patch)
treef378c8a762caccf60856a1670ae33dfd638b9453 /cc/shader.h
parent503160f80568f024fa712e280bb1a4e1e6ca1ec3 (diff)
downloadchromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.zip
chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.gz
chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.bz2
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
Diffstat (limited to 'cc/shader.h')
-rw-r--r--cc/shader.h2
1 files changed, 1 insertions, 1 deletions
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: