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

1 files changed, 1 insertions, 3 deletions

diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 430c127..9d20557 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -106,8 +106,7 @@ public:
                 NULL,
                 CCProxy::implThread(),
                 m_queue.Pass(),
-                m_resourceProvider.get(),
-                &m_uploader);
+                m_resourceProvider.get());
         updateController->finalize();
         m_queue = make_scoped_ptr(new CCTextureUpdateQueue);
     }
@@ -163,7 +162,6 @@ public:
     scoped_ptr<CCResourceProvider> m_resourceProvider;
     scoped_ptr<CCTextureUpdateQueue> m_queue;
     CCRenderingStats m_stats;
-    FakeTextureUploader m_uploader;
     CCPriorityCalculator m_priorityCalculator;
     scoped_ptr<CCPrioritizedTextureManager> m_textureManager;
     TestCCOcclusionTracker* m_occlusion;