Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: cc/resource_update_controller.cc

Issue 11368043: cc: Avoid using upload term in relation to resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resource_provider_unittest.cc ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_update_controller.cc
diff --git a/cc/resource_update_controller.cc b/cc/resource_update_controller.cc
index 55c52775124e103dda99b57e92bd70161cc86875..5295724ef10111ed1cf152602444c96a383665b9 100644
--- a/cc/resource_update_controller.cc
+++ b/cc/resource_update_controller.cc
@@ -181,7 +181,7 @@ void ResourceUpdateController::updateTexture(ResourceUpdate update)
if (update.bitmap) {
update.bitmap->lockPixels();
- update.texture->upload(
+ update.texture->setPixels(
m_resourceProvider,
static_cast<const uint8_t*>(update.bitmap->getPixels()),
update.content_rect,
« no previous file with comments | « cc/resource_provider_unittest.cc ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698