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

Unified Diff: cc/test/tiled_layer_test_common.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/test/tiled_layer_test_common.h ('k') | cc/texture_update_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/tiled_layer_test_common.cc
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index bf528ca0281cfcc1743c04308b9e315824496380..12d50c7393e543eb5cc88d4ba44301f31b487acb 100644
--- a/cc/test/tiled_layer_test_common.cc
+++ b/cc/test/tiled_layer_test_common.cc
@@ -20,21 +20,20 @@ FakeLayerTextureUpdater::Texture::~Texture()
{
}
-void FakeLayerTextureUpdater::Texture::updateRect(CCResourceProvider* resourceProvider, const IntRect&, const IntSize&)
+void FakeLayerTextureUpdater::Texture::update(CCTextureUpdateQueue& queue, const IntRect&, const IntSize&, bool partialUpdate, CCRenderingStats&)
{
- texture()->acquireBackingTexture(resourceProvider);
- m_layer->updateRect();
-}
+ TextureUploader::Parameters upload = { texture(), NULL, NULL, { IntRect(), IntRect(), IntSize() } };
+ if (partialUpdate)
+ queue.appendPartialUpload(upload);
+ else
+ queue.appendFullUpload(upload);
-void FakeLayerTextureUpdater::Texture::prepareRect(const IntRect&, cc::CCRenderingStats&)
-{
- m_layer->prepareRect();
+ m_layer->update();
}
FakeLayerTextureUpdater::FakeLayerTextureUpdater()
: m_prepareCount(0)
, m_updateCount(0)
- , m_prepareRectCount(0)
{
}
@@ -152,7 +151,7 @@ void FakeTextureUploader::markPendingUploadsAsNonBlocking()
void FakeTextureUploader::uploadTexture(cc::CCResourceProvider* resourceProvider, Parameters upload)
{
- upload.texture->updateRect(resourceProvider, upload.sourceRect, upload.destOffset);
+ upload.texture->acquireBackingTexture(resourceProvider);
}
double FakeTextureUploader::estimatedTexturesPerSecond()
« no previous file with comments | « cc/test/tiled_layer_test_common.h ('k') | cc/texture_update_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698