Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/gfx/transform.h

 // 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.
 
 #ifndef UI_GFX_TRANSFORM_H_
 #define UI_GFX_TRANSFORM_H_
 
 #include <iosfwd>
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "third_party/skia/include/utils/SkMatrix44.h"
+#include "third_party/skia/include/core/SkMatrix44.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace gfx {
 
 class BoxF;
 class RectF;
 class Point;
 class Point3F;
 class Vector3dF;
 
 // 4x4 transformation matrix. Transform is cheap and explicitly allows
 // copy/assign.
 class GFX_EXPORT Transform {
  public:
-
-  enum SkipInitialization {
-    kSkipInitialization
-  };
+  enum SkipInitialization { kSkipInitialization };
 
   Transform() : matrix_(SkMatrix44::kIdentity_Constructor) {}
 
   // Skips initializing this matrix to avoid overhead, when we know it will be
   // initialized before use.
   Transform(SkipInitialization)
       : matrix_(SkMatrix44::kUninitialized_Constructor) {}
   Transform(const Transform& rhs) : matrix_(rhs.matrix_) {}
   // Initialize with the concatenation of lhs * rhs.
   Transform(const Transform& lhs, const Transform& rhs)
@@ skipping 212 matching lines @@
     return *this;
   }
 
   // Returns the underlying matrix.
   const SkMatrix44& matrix() const { return matrix_; }
   SkMatrix44& matrix() { return matrix_; }
 
   std::string ToString() const;
 
  private:
-  void TransformPointInternal(const SkMatrix44& xform,
-                              Point* point) const;
+  void TransformPointInternal(const SkMatrix44& xform, Point* point) const;
 
-  void TransformPointInternal(const SkMatrix44& xform,
-                              Point3F* point) const;
+  void TransformPointInternal(const SkMatrix44& xform, Point3F* point) const;
 
   SkMatrix44 matrix_;
 
   // copy/assign are allowed.
 };
 
 // This is declared here for use in gtest-based unit tests but is defined in
 // the gfx_test_support target. Depend on that to use this in your unit test.
 // This should not be used in production code - call ToString() instead.
 void PrintTo(const Transform& transform, ::std::ostream* os);
 
 }  // namespace gfx
 
 #endif  // UI_GFX_TRANSFORM_H_