Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/input/page_scale_animation.cc

 // Copyright 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 "cc/input/page_scale_animation.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "cc/animation/timing_function.h"
-#include "ui/gfx/point_f.h"
-#include "ui/gfx/rect_f.h"
-#include "ui/gfx/vector2d_conversions.h"
+#include "ui/gfx/geometry/point_f.h"
+#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/geometry/vector2d_conversions.h"
 
 namespace {
 
 // This takes a viewport-relative vector and returns a vector whose values are
 // between 0 and 1, representing the percentage position within the viewport.
 gfx::Vector2dF NormalizeFromViewport(const gfx::Vector2dF& denormalized,
                                      const gfx::SizeF& viewport_size) {
   return gfx::ScaleVector2d(denormalized,
                             1.f / viewport_size.width(),
                             1.f / viewport_size.height());
@@ skipping 212 matching lines @@
 
   // Linearly interpolate the magnitude in log scale.
   float diff = target_page_scale_factor_ / start_page_scale_factor_;
   float log_diff = log(diff);
   log_diff *= interp;
   diff = exp(log_diff);
   return start_page_scale_factor_ * diff;
 }
 
 }  // namespace cc