summaryrefslogtreecommitdiffstats
path: root/cc/resource_provider.cc
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 06:26:24 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 06:26:24 +0000
commita3d2445a0edc5958c0c2927b7dcf486fa333531d (patch)
treeba06b4d323b2afe82401869c618635ba583d3a9e /cc/resource_provider.cc
parent3b21be90a676dcc31ba86ecfe174d35718f92856 (diff)
downloadchromium_src-a3d2445a0edc5958c0c2927b7dcf486fa333531d.zip
chromium_src-a3d2445a0edc5958c0c2927b7dcf486fa333531d.tar.gz
chromium_src-a3d2445a0edc5958c0c2927b7dcf486fa333531d.tar.bz2
cc: Avoid using upload term in relation to resources.
Rename ResourceProvider::upload() to ResourceProvider::setPixels() and PrioritizedTexture::upload() to PrioritizedTexture::setPixels(). BUG= TEST=cc_unittests Review URL: https://chromiumcodereview.appspot.com/11368043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_provider.cc')
-rw-r--r--cc/resource_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index dab281a..eb17f18 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -266,7 +266,7 @@ ResourceProvider::ResourceType ResourceProvider::resourceType(ResourceId id)
return resource->type;
}
-void ResourceProvider::upload(ResourceId id, const uint8_t* image, const gfx::Rect& imageRect, const gfx::Rect& sourceRect, const gfx::Vector2d& destOffset)
+void ResourceProvider::setPixels(ResourceId id, const uint8_t* image, const gfx::Rect& imageRect, const gfx::Rect& sourceRect, const gfx::Vector2d& destOffset)
{
DCHECK(Proxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);