summaryrefslogtreecommitdiffstats
path: root/cc/tiled_layer.cc
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-13 10:20:27 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-13 10:20:27 +0000
commitea8af90e9f2739a824f24229000cbc4800bcd21b (patch)
treeebad1aa03334584c07a06b4da93f7c509a647fc3 /cc/tiled_layer.cc
parentbf84b9f737130ab4101c47ffb602caa21f9ed4cb (diff)
downloadchromium_src-ea8af90e9f2739a824f24229000cbc4800bcd21b.zip
chromium_src-ea8af90e9f2739a824f24229000cbc4800bcd21b.tar.gz
chromium_src-ea8af90e9f2739a824f24229000cbc4800bcd21b.tar.bz2
cc: Remove LayerTextureUpdater::Texture::updateRect() callback.
This is the first step towards cleaning up and simplifying the resource update system. Eliminates the LayerTextureUpdater::Texture::updateRect() callback by moving some logic to CCResourceProvider. Remaining logic is now contained in LayerTextureUpdater::Texture::update(). The logic itself is not changed, this is only re-factoring. BUG=154472 TEST=manual Review URL: https://chromiumcodereview.appspot.com/11074009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/tiled_layer.cc')
-rw-r--r--cc/tiled_layer.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index f2219e6..4fa7ed4 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -521,10 +521,6 @@ void TiledLayerChromium::updateTileTextures(const IntRect& paintRect, int left,
if (sourceRect.isEmpty())
continue;
- tile->texture()->prepareRect(sourceRect, stats);
- if (occlusion)
- occlusion->overdrawMetrics().didUpload(WebTransformationMatrix(), sourceRect, tile->opaqueRect());
-
const IntPoint anchor = m_tiler->tileRect(tile).location();
// Calculate tile-space rectangle to upload into.
@@ -545,11 +541,10 @@ void TiledLayerChromium::updateTileTextures(const IntRect& paintRect, int left,
if (paintOffset.y() + sourceRect.height() > paintRect.height())
CRASH();
- TextureUploader::Parameters upload = { tile->texture(), sourceRect, destOffset };
- if (tile->partialUpdate)
- queue.appendPartialUpload(upload);
- else
- queue.appendFullUpload(upload);
+ tile->texture()->update(queue, sourceRect, destOffset, tile->partialUpdate, stats);
+ if (occlusion)
+ occlusion->overdrawMetrics().didUpload(WebTransformationMatrix(), sourceRect, tile->opaqueRect());
+
}
}
}