Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3908)

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_unittest_damage.cc ('k') | cc/trees/layer_tree_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 61a64d63402bb37d7c984c379b9cfa5e2b79d7a1..4625c28963bfbfd51ed0ca8cc0f551e3457d39af 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -162,7 +162,7 @@ static void UpdateClipTreeForBoundsDeltaOnLayer(LayerImpl* layer,
ClipNode* clip_node = clip_tree->Node(layer->clip_tree_index());
if (clip_node) {
DCHECK_EQ(layer->id(), clip_node->owner_id);
- gfx::Size bounds = layer->bounds();
+ gfx::SizeF bounds = gfx::SizeF(layer->bounds());
if (clip_node->data.clip.size() != bounds) {
clip_node->data.clip.set_size(bounds);
clip_tree->set_needs_update(true);
@@ -719,7 +719,7 @@ gfx::SizeF LayerTreeImpl::ScrollableSize() const {
? OuterViewportScrollLayer()
: InnerViewportScrollLayer();
if (!root_scroll_layer || root_scroll_layer->children().empty())
- return gfx::Size();
+ return gfx::SizeF();
gfx::SizeF content_size =
root_scroll_layer->children()[0]->BoundsForScrolling();
« no previous file with comments | « cc/trees/layer_tree_host_unittest_damage.cc ('k') | cc/trees/layer_tree_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698