Handle floating point coordinates from ozone to exosphere

ui/compositor/layer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 515 matching lines @@
 
   const Layer* root_layer = GetRoot(source);
   CHECK_EQ(root_layer, GetRoot(target));
 
   if (source != root_layer)
     source->ConvertPointForAncestor(root_layer, point);
   if (target != root_layer)
     target->ConvertPointFromAncestor(root_layer, point);
 }
 
+// static
+void Layer::ConvertPointToLayerF(const Layer* source,
+                                 const Layer* target,
+                                 gfx::PointF* point) {
+  if (source == target)
+    return;
+
+  const Layer* root_layer = GetRoot(source);
+  CHECK_EQ(root_layer, GetRoot(target));
+
+  if (source != root_layer)
+    source->ConvertPointForAncestorF(root_layer, point);
+  if (target != root_layer)
+    target->ConvertPointFromAncestorF(root_layer, point);
+}

[oshima, 2017/01/20 22:11:55]

new line

 bool Layer::GetTargetTransformRelativeTo(const Layer* ancestor,
                                          gfx::Transform* transform) const {
   const Layer* p = this;
   for (; p && p != ancestor; p = p->parent()) {
     gfx::Transform translation;
     translation.Translate(static_cast<float>(p->bounds().x()),
                           static_cast<float>(p->bounds().y()));
     // Use target transform so that result will be correct once animation is
     // finished.
     if (!p->GetTargetTransform().IsIdentity())
@@ skipping 403 matching lines @@
 
   children_.erase(children_.begin() + child_i);
   children_.insert(children_.begin() + dest_i, child);
 
   child->cc_layer_->RemoveFromParent();
   cc_layer_->InsertChild(child->cc_layer_, dest_i);
 }
 
 bool Layer::ConvertPointForAncestor(const Layer* ancestor,
                                     gfx::Point* point) const {
-  gfx::Transform transform;
-  bool result = GetTargetTransformRelativeTo(ancestor, &transform);
-  auto p = gfx::Point3F(gfx::PointF(*point));
-  transform.TransformPoint(&p);
-  *point = gfx::ToFlooredPoint(p.AsPointF());
+  gfx::PointF point_f(*point);
+  bool result = ConvertPointForAncestorF(ancestor, &point_f);
+  *point = gfx::ToFlooredPoint(point_f);
   return result;
 }
 
 bool Layer::ConvertPointFromAncestor(const Layer* ancestor,
                                      gfx::Point* point) const {
-  gfx::Transform transform;
-  bool result = GetTargetTransformRelativeTo(ancestor, &transform);
-  auto p = gfx::Point3F(gfx::PointF(*point));
-  transform.TransformPointReverse(&p);
-  *point = gfx::ToFlooredPoint(p.AsPointF());
+  gfx::PointF point_f(*point);
+  bool result = ConvertPointFromAncestorF(ancestor, &point_f);
+  *point = gfx::ToFlooredPoint(point_f);
   return result;
 }
 
+bool Layer::ConvertPointForAncestorF(const Layer* ancestor,
+                                     gfx::PointF* point) const {
+  gfx::Transform transform;
+  bool result = GetTargetTransformRelativeTo(ancestor, &transform);
+  auto p = gfx::Point3F(*point);
+  transform.TransformPoint(&p);
+  *point = p.AsPointF();
+  return result;
+}
+
+bool Layer::ConvertPointFromAncestorF(const Layer* ancestor,
+                                      gfx::PointF* point) const {
+  gfx::Transform transform;
+  bool result = GetTargetTransformRelativeTo(ancestor, &transform);
+  auto p = gfx::Point3F(*point);
+  transform.TransformPointReverse(&p);
+  *point = p.AsPointF();
+  return result;
+}
+
 void Layer::SetBoundsFromAnimation(const gfx::Rect& bounds) {
   if (bounds == bounds_)
     return;
 
   base::Closure closure;
   const gfx::Rect old_bounds = bounds_;
   bounds_ = bounds;
 
   RecomputeDrawsContentAndUVRect();
   RecomputePosition();
@@ skipping 179 matching lines @@
   const auto it = std::find_if(mirrors_.begin(), mirrors_.end(),
       [mirror](const std::unique_ptr<LayerMirror>& mirror_ptr) {
         return mirror_ptr.get() == mirror;
       });
 
   DCHECK(it != mirrors_.end());
   mirrors_.erase(it);
 }
 
 }  // namespace ui