diff options
author | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 06:59:09 +0000 |
---|---|---|
committer | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 06:59:09 +0000 |
commit | e22495903bd60a251c8cad8abc5302d22c095c17 (patch) | |
tree | ce02cd8a9c07b4439475a71040ef3e8986544b4d /cc/test/tiled_layer_test_common.cc | |
parent | 2dbad791bf7f51a2f1b9d7a43b4a5880684b1df4 (diff) | |
download | chromium_src-e22495903bd60a251c8cad8abc5302d22c095c17.zip chromium_src-e22495903bd60a251c8cad8abc5302d22c095c17.tar.gz chromium_src-e22495903bd60a251c8cad8abc5302d22c095c17.tar.bz2 |
cc: Remove all but one texture uploader class.
This reduces the number of texture uploader classes from 4 to 1.
- TextureUploader
- ThrottledTextureUploader
- UnthrottledTextureUploader
- LayerTextureSubImage
becomes
- TextureUploader
and it lives behind the CCResourceProvider interface where
the LayerTextureSubImage instance used to be.
This also makes the call stack when performing a texture upload less
awkward. It used to look like this:
CCTextureUpdateController::updateMoreTexturesNow() ->
ThrottledTextureUploader::updateTexture() ->
CCPrioritizedTexture::upload() ->
CCResourceProvider::upload() ->
LayerTextureSubImage::upload() ->
glTexSubImage2D()
but now looks like this:
CCTextureUpdateController::updateMoreTexturesNow() ->
CCPrioritizedTexture::upload() ->
CCResourceProvider::upload() ->
TextureUploader::upload() ->
glTexSubImage2D()
which makes a lot more sense considering that
CCTextureUpdateController::updateMoreTexturesNow() should really be called
CCResourceUpdateController::updateMoreResourcesNow() and
CCPrioritizedTexture::upload() should be CCPrioritizedResource::update().
This is only refactoring and should not change the behavior of the
compositor in any way.
BUG=
TEST=cc_unittests
Review URL: https://chromiumcodereview.appspot.com/11188055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/tiled_layer_test_common.cc')
-rw-r--r-- | cc/test/tiled_layer_test_common.cc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc index 7d6dfc1..7f42177 100644 --- a/cc/test/tiled_layer_test_common.cc +++ b/cc/test/tiled_layer_test_common.cc @@ -144,28 +144,4 @@ cc::IntSize FakeTiledLayerWithScaledBounds::contentBounds() const return m_forcedContentBounds; } -size_t FakeTextureUploader::numBlockingUploads() -{ - return 0; -} - -void FakeTextureUploader::markPendingUploadsAsNonBlocking() -{ -} - -void FakeTextureUploader::uploadTexture(CCResourceProvider* resourceProvider, - CCPrioritizedTexture* texture, - const SkBitmap*, - IntRect, - IntRect, - IntSize) -{ - texture->acquireBackingTexture(resourceProvider); -} - -double FakeTextureUploader::estimatedTexturesPerSecond() -{ - return std::numeric_limits<double>::max(); -} - } // namespace |