summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 22:26:57 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 22:26:57 +0000
commit0e61d29bb341dd98acd158ba5d785a2ab95af8ee (patch)
tree3d992c78fac9fac394655f1d9b9316a3778af79b /cc/test
parente4fffd1094d779da7e005b9801ed5a276015c352 (diff)
downloadchromium_src-0e61d29bb341dd98acd158ba5d785a2ab95af8ee.zip
chromium_src-0e61d29bb341dd98acd158ba5d785a2ab95af8ee.tar.gz
chromium_src-0e61d29bb341dd98acd158ba5d785a2ab95af8ee.tar.bz2
cc: Don't add low res tilings for small layers
R=danakj@chromium.org BUG=247465 Review URL: https://chromiumcodereview.appspot.com/16671003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/fake_picture_layer_impl.cc3
-rw-r--r--cc/test/fake_picture_layer_impl.h2
-rw-r--r--cc/test/fake_picture_layer_tiling_client.cc2
-rw-r--r--cc/test/fake_picture_layer_tiling_client.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc
index 0bd16c6..d55d680 100644
--- a/cc/test/fake_picture_layer_impl.cc
+++ b/cc/test/fake_picture_layer_impl.cc
@@ -32,7 +32,8 @@ void FakePictureLayerImpl::AppendQuads(QuadSink* quad_sink,
++append_quads_count_;
}
-gfx::Size FakePictureLayerImpl::CalculateTileSize(gfx::Size content_bounds) {
+gfx::Size FakePictureLayerImpl::CalculateTileSize(
+ gfx::Size content_bounds) const {
if (fixed_tile_size_.IsEmpty()) {
return PictureLayerImpl::CalculateTileSize(content_bounds);
}
diff --git a/cc/test/fake_picture_layer_impl.h b/cc/test/fake_picture_layer_impl.h
index 6ac1126..a0c7829 100644
--- a/cc/test/fake_picture_layer_impl.h
+++ b/cc/test/fake_picture_layer_impl.h
@@ -26,7 +26,7 @@ class FakePictureLayerImpl : public PictureLayerImpl {
OVERRIDE;
virtual void AppendQuads(QuadSink* quad_sink,
AppendQuadsData* append_quads_data) OVERRIDE;
- virtual gfx::Size CalculateTileSize(gfx::Size content_bounds) OVERRIDE;
+ virtual gfx::Size CalculateTileSize(gfx::Size content_bounds) const OVERRIDE;
using PictureLayerImpl::AddTiling;
using PictureLayerImpl::CleanUpTilingsOnActiveLayer;
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
index ebd530a7..39f1190 100644
--- a/cc/test/fake_picture_layer_tiling_client.cc
+++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -56,7 +56,7 @@ void FakePictureLayerTilingClient::SetTileSize(gfx::Size tile_size) {
}
gfx::Size FakePictureLayerTilingClient::CalculateTileSize(
- gfx::Size /* content_bounds */) {
+ gfx::Size /* content_bounds */) const {
return tile_size_;
}
diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h
index 1050705..9b2aa52 100644
--- a/cc/test/fake_picture_layer_tiling_client.h
+++ b/cc/test/fake_picture_layer_tiling_client.h
@@ -25,7 +25,7 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient {
PictureLayerTiling* tiling, gfx::Rect rect) OVERRIDE;
virtual void UpdatePile(Tile* tile) OVERRIDE {}
virtual gfx::Size CalculateTileSize(
- gfx::Size content_bounds) OVERRIDE;
+ gfx::Size content_bounds) const OVERRIDE;
void SetTileSize(gfx::Size tile_size);
gfx::Size TileSize() const { return tile_size_; }