Use SkMatrix44 for the underlying implementation of ui::Transform

views/view.cc

 // Copyright (c) 2011 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 "views/view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/path.h"
+#include "ui/gfx/point3.h"
 #include "ui/gfx/transform.h"
 #include "views/background.h"
 #include "views/context_menu_controller.h"
 #include "views/drag_controller.h"
 #include "views/layer_property_setter.h"
 #include "views/layout/layout_manager.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget_private.h"
 #include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager.h"
@@ skipping 1674 matching lines @@
       ConvertPointFromWidget(dst, point);
     }
   }
 }
 
 bool View::ConvertPointForAncestor(const View* ancestor,
                                    gfx::Point* point) const {
   ui::Transform trans;
   // TODO(sad): Have some way of caching the transformation results.
   bool result = GetTransformRelativeTo(ancestor, &trans);
-  trans.TransformPoint(point);
+  gfx::Point3f p(*point);
+  trans.TransformPoint(p);
+  *point = p.AsPoint();
   return result;
 }
 
 bool View::ConvertPointFromAncestor(const View* ancestor,
                                     gfx::Point* point) const {
   ui::Transform trans;
   bool result = GetTransformRelativeTo(ancestor, &trans);
-  trans.TransformPointReverse(point);
+  gfx::Point3f p(*point);
+  trans.TransformPointReverse(p);
+  *point = p.AsPoint();
   return result;
 }
 
 // Accelerated painting --------------------------------------------------------
 
 bool View::ShouldPaintToLayer() const {
   return use_acceleration_when_possible &&
       layer_helper_.get() && layer_helper_->ShouldPaintToLayer();
 }
 
@@ skipping 312 matching lines @@
     result.append(GetChildViewAt(i)->PrintViewGraph(false));
 
   if (first)
     result.append("}\n");
 
   return result;
 }
 #endif
 
 }  // namespace views