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/texture.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cc/texture.cc') diff --git a/cc/texture.cc b/cc/texture.cc index 9fd8ebe..3413862 100644 --- a/cc/texture.cc +++ b/cc/texture.cc @@ -8,13 +8,13 @@ namespace cc { -void Texture::setDimensions(const IntSize& size, GLenum format) +void CCTexture::setDimensions(const IntSize& size, GLenum format) { m_size = size; m_format = format; } -size_t Texture::bytes() const +size_t CCTexture::bytes() const { if (m_size.isEmpty()) return 0u; @@ -22,7 +22,7 @@ size_t Texture::bytes() const return memorySizeBytes(m_size, m_format); } -size_t Texture::memorySizeBytes(const IntSize& size, GLenum format) +size_t CCTexture::memorySizeBytes(const IntSize& size, GLenum format) { unsigned int componentsPerPixel = 4; unsigned int bytesPerComponent = 1; -- cgit v1.1