Index: cc/layers/picture_layer_impl.cc |
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
index 8eb8f8825689553594aa1b036f5594a6bd260727..de176c30d5f69069bb070bb5ae12ef7c1478d8ec 100644 |
--- a/cc/layers/picture_layer_impl.cc |
+++ b/cc/layers/picture_layer_impl.cc |
@@ -732,10 +732,7 @@ void PictureLayerImpl::SyncFromActiveLayer(const PictureLayerImpl* other) { |
bool synced_high_res_tiling = false; |
if (CanHaveTilings()) { |
synced_high_res_tiling = tilings_->SyncTilings( |
- *other->tilings_, |
- gfx::ToCeiledSize(bounds()), |
- invalidation_, |
- MinimumContentsScale()); |
+ *other->tilings_, bounds(), invalidation_, MinimumContentsScale()); |
} else { |
RemoveAllTilings(); |
} |
@@ -953,8 +950,7 @@ void PictureLayerImpl::DoPostCommitInitialization() { |
DCHECK(layer_tree_impl()->IsPendingTree()); |
if (!tilings_) |
- tilings_.reset(new PictureLayerTilingSet(this, |
- gfx::ToCeiledSize(bounds()))); |
+ tilings_.reset(new PictureLayerTilingSet(this, bounds())); |
DCHECK(!twin_layer_); |
twin_layer_ = static_cast<PictureLayerImpl*>( |
@@ -1295,7 +1291,7 @@ float PictureLayerImpl::MinimumContentsScale() const { |
// then it will end up having less than one pixel of content in that |
// dimension. Bump the minimum contents scale up in this case to prevent |
// this from happening. |
- float min_dimension = std::min(bounds().width(), bounds().height()); |
+ int min_dimension = std::min(bounds().width(), bounds().height()); |
if (!min_dimension) |
return setting_min; |