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

Side by Side Diff: cc/trees/draw_property_utils.cc

Issue 1314943008: cc: Remove implicit conversions from Rect to RectF in src/cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/draw_property_utils.h" 5 #include "cc/trees/draw_property_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "cc/base/math_util.h" 9 #include "cc/base/math_util.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 return false; 855 return false;
856 if (static_cast<int>(layer->offset_to_transform_parent().y()) != 856 if (static_cast<int>(layer->offset_to_transform_parent().y()) !=
857 layer->offset_to_transform_parent().y()) 857 layer->offset_to_transform_parent().y())
858 return false; 858 return false;
859 return true; 859 return true;
860 } 860 }
861 861
862 gfx::Rect DrawableContentRectOfSurfaceFromPropertyTrees( 862 gfx::Rect DrawableContentRectOfSurfaceFromPropertyTrees(
863 const RenderSurfaceImpl* render_surface, 863 const RenderSurfaceImpl* render_surface,
864 const TransformTree& transform_tree) { 864 const TransformTree& transform_tree) {
865 gfx::Rect drawable_content_rect = 865 gfx::Rect drawable_content_rect = MathUtil::MapEnclosingClippedRect(
866 gfx::ToEnclosingRect(MathUtil::MapClippedRect( 866 DrawTransformOfRenderSurfaceFromPropertyTrees(render_surface,
867 DrawTransformOfRenderSurfaceFromPropertyTrees(render_surface, 867 transform_tree),
868 transform_tree), 868 render_surface->content_rect_from_property_trees());
869 render_surface->content_rect_from_property_trees()));
870 if (render_surface->HasReplica()) { 869 if (render_surface->HasReplica()) {
871 drawable_content_rect.Union(gfx::ToEnclosingRect(MathUtil::MapClippedRect( 870 drawable_content_rect.Union(MathUtil::MapEnclosingClippedRect(
872 DrawTransformOfRenderSurfaceReplicaFromPropertyTrees(render_surface, 871 DrawTransformOfRenderSurfaceReplicaFromPropertyTrees(render_surface,
873 transform_tree), 872 transform_tree),
874 render_surface->content_rect_from_property_trees()))); 873 render_surface->content_rect_from_property_trees()));
875 } 874 }
876 return drawable_content_rect; 875 return drawable_content_rect;
877 } 876 }
878 877
879 gfx::Rect DrawableContentRectFromPropertyTrees( 878 gfx::Rect DrawableContentRectFromPropertyTrees(
880 const LayerImpl* layer, 879 const LayerImpl* layer,
881 const TransformTree& transform_tree) { 880 const TransformTree& transform_tree) {
882 gfx::Rect drawable_content_rect = MathUtil::MapEnclosingClippedRect( 881 gfx::Rect drawable_content_rect = MathUtil::MapEnclosingClippedRect(
883 DrawTransformFromPropertyTrees(layer, transform_tree), 882 DrawTransformFromPropertyTrees(layer, transform_tree),
884 gfx::Rect(layer->bounds())); 883 gfx::Rect(layer->bounds()));
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 const RenderSurfaceImpl* render_surface, 941 const RenderSurfaceImpl* render_surface,
943 const TransformTree& tree) { 942 const TransformTree& tree) {
944 if (!render_surface->HasReplica()) 943 if (!render_surface->HasReplica())
945 return gfx::Transform(); 944 return gfx::Transform();
946 return ScreenSpaceTransformOfRenderSurfaceFromPropertyTrees(render_surface, 945 return ScreenSpaceTransformOfRenderSurfaceFromPropertyTrees(render_surface,
947 tree) * 946 tree) *
948 ReplicaToSurfaceTransform(render_surface, tree); 947 ReplicaToSurfaceTransform(render_surface, tree);
949 } 948 }
950 949
951 } // namespace cc 950 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698