cc: Remove LayerTextureUpdater::Texture::updateRect() callback.

cc/ThrottledTextureUploader.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "ThrottledTextureUploader.h"
 
+#include "CCPrioritizedTexture.h"
 #include "Extensions3DChromium.h"
 #include "TraceEvent.h"
 #include <algorithm>
 #include <public/Platform.h>
 #include <public/WebGraphicsContext3D.h>
 #include <vector>
 
 namespace {
 
 // How many previous uploads to use when predicting future throughput.
@@ skipping 127 matching lines @@
 
 void ThrottledTextureUploader::endQuery()
 {
     m_availableQueries.first()->end();
     m_pendingQueries.append(m_availableQueries.takeFirst());
     m_numBlockingTextureUploads++;
 }
 
 void ThrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvider, Parameters upload)
 {
-    bool isFullUpload = upload.destOffset.isZero() &&
-                        upload.sourceRect.size() == upload.texture->texture()->size();
+    bool isFullUpload = upload.geometry.destOffset.isZero() &&
+                        upload.geometry.sourceRect.size() == upload.texture->size();
 
     if (isFullUpload)
         beginQuery();
 
-    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();
+    }
+
+    // TODO(reveman): Move this logic to CCTextureUpdateController.
+    if (upload.picture) {
+        upload.texture->acceleratedUpdate(
+            resourceProvider,
+            upload.picture,
+            upload.geometry.contentRect,
+            upload.geometry.sourceRect,
+            upload.geometry.destOffset);
+    }
 
     if (isFullUpload)
         endQuery();
 }
 
 void ThrottledTextureUploader::processQueries()
 {
     while (!m_pendingQueries.isEmpty()) {
         if (m_pendingQueries.first()->isPending())
             break;
 
         unsigned usElapsed = m_pendingQueries.first()->value();
         WebKit::Platform::current()->histogramCustomCounts("Renderer4.TextureGpuUploadTimeUS", usElapsed, 0, 100000, 50);
 
         if (!m_pendingQueries.first()->isNonBlocking())
             m_numBlockingTextureUploads--;
 
         // Remove the oldest values from our history and insert the new one
         double texturesPerSecond = 1.0 / (usElapsed * 1e-6);
         m_texturesPerSecondHistory.pop_back();
         m_texturesPerSecondHistory.push_front(texturesPerSecond);
 
         m_availableQueries.append(m_pendingQueries.takeFirst());
     }
 }
 
 }