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

Unified Diff: cc/unthrottled_texture_uploader.cc

Issue 11074009: cc: Remove LayerTextureUpdater::Texture::updateRect() callback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 2 months 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/tiled_layer_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/unthrottled_texture_uploader.cc
diff --git a/cc/unthrottled_texture_uploader.cc b/cc/unthrottled_texture_uploader.cc
index 82b43373cd7a9528688c73ba500a5d275765538a..6d83e52978ced55980004ae02c1eb549786190e0 100644
--- a/cc/unthrottled_texture_uploader.cc
+++ b/cc/unthrottled_texture_uploader.cc
@@ -6,6 +6,8 @@
#include "UnthrottledTextureUploader.h"
+#include "CCPrioritizedTexture.h"
+
namespace cc {
size_t UnthrottledTextureUploader::numBlockingUploads()
@@ -24,7 +26,18 @@ double UnthrottledTextureUploader::estimatedTexturesPerSecond()
void UnthrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvider, Parameters upload)
{
- upload.texture->updateRect(resourceProvider, upload.sourceRect, upload.destOffset);
+ if (upload.bitmap) {
+ upload.bitmap->lockPixels();
+ upload.texture->upload(
+ resourceProvider,
+ static_cast<const uint8_t*>(upload.bitmap->getPixels()),
+ upload.geometry.contentRect,
+ upload.geometry.sourceRect,
+ upload.geometry.destOffset);
+ upload.bitmap->unlockPixels();
+ }
+
+ ASSERT(!upload.picture);
}
}
« no previous file with comments | « cc/tiled_layer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698